Skip to content

Commit

Permalink
Merge pull request #17 from bitranox/development
Browse files Browse the repository at this point in the history
v2.0.4
  • Loading branch information
bitranox authored Nov 15, 2020
2 parents 940a862 + 12a55b8 commit bf391f0
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .docs/README_template.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ igittigitt
==========


Version v2.0.3 as of 2020-10-09 see `Changelog`_
Version v2.0.4 as of 2020-11-15 see `Changelog`_


.. include:: ./badges.rst
Expand Down
5 changes: 5 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ TODO:
- add nested .gitignore files
- documentation

v2.0.4
--------
2020-11-15: patch release
- Issue 16, support following symlinks

v2.0.3
--------
2020-10-09: service release
Expand Down
7 changes: 6 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ igittigitt
==========


Version v2.0.3 as of 2020-10-09 see `Changelog`_
Version v2.0.4 as of 2020-11-15 see `Changelog`_

|travis_build| |license| |jupyter| |pypi| |black|

Expand Down Expand Up @@ -397,6 +397,11 @@ TODO:
- add nested .gitignore files
- documentation

v2.0.4
--------
2020-11-15: patch release
- Issue 16, support following symlinks

v2.0.3
--------
2020-10-09: service release
Expand Down
4 changes: 2 additions & 2 deletions igittigitt/__init__conf__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "igittigitt"
title = "A spec-compliant gitignore parser for Python"
version = "v2.0.3"
version = "v2.0.4"
url = "https://github.com/bitranox/igittigitt"
author = "Robert Nowotny"
author_email = "[email protected]"
Expand All @@ -15,7 +15,7 @@ def print_info() -> None:
A spec-compliant gitignore parser for Python
Version : v2.0.3
Version : v2.0.4
Url : https://github.com/bitranox/igittigitt
Author : Robert Nowotny
Email : [email protected]"""
Expand Down
10 changes: 10 additions & 0 deletions igittigitt/igittigitt.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# STDLIB
import glob
import os # noqa
import pathlib
import sys
Expand Down Expand Up @@ -159,9 +160,18 @@ def parse_rule_files(
path_base_dir = pathlib.Path(base_dir).resolve()
# we need to sort to get the right order.
# we ignore git files in ignored directories !

"""
# issue 16 - pathlib.glob does not follow symlinks
rule_files = sorted(
list(path_base_dir.glob("".join(["**/", filename.strip()])))
)
"""
rule_files = sorted(
list(glob.glob(f"{path_base_dir}/**/{filename.strip()}", recursive=True))
)

for rule_file in rule_files:
if not self.match(rule_file):
self._parse_rule_file(rule_file)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def get_line_data(line: str) -> str:

setup_kwargs: Dict[str, Any] = dict()
setup_kwargs["name"] = "igittigitt"
setup_kwargs["version"] = "v2.0.3"
setup_kwargs["version"] = "v2.0.4"
setup_kwargs["url"] = "https://github.com/bitranox/igittigitt"
setup_kwargs["packages"] = find_packages()
setup_kwargs["package_data"] = {"igittigitt": ["py.typed", "*.pyi", "__init__.pyi"]}
Expand Down

0 comments on commit bf391f0

Please sign in to comment.