Release 0.0.6. (#24)

tobiasraabe · web-flow · commit eff193094e2e · 2020-09-12T10:42:17.000+02:00
diff --git a/.conda/meta.yaml b/.conda/meta.yaml
@@ -13,7 +13,7 @@ build:
   noarch: python
   number: 0
   entry_points:
-    - pytask = _pytask.cli:pytask
+    - pytask = _pytask.cli:cli
 
 requirements:
   host:
@@ -42,8 +42,9 @@ test:
     - tests
   commands:
     - pytask --help
-    - pytask --markers
     - pytask --version
+    - pytask clean
+    - pytask markers
 
     - pytest tests
 
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -20,11 +20,11 @@ repos:
     hooks:
     -   id: reorder-python-imports
 -   repo: https://github.com/psf/black
-    rev: 19.10b0
+    rev: 20.8b1
     hooks:
     -   id: black
 -   repo: https://github.com/asottile/blacken-docs
-    rev: v1.7.0
+    rev: v1.8.0
     hooks:
     -   id: blacken-docs
         additional_dependencies: [black]
@@ -48,11 +48,11 @@ repos:
             Pygments,
         ]
 -   repo: https://github.com/PyCQA/doc8
-    rev: 0.8.1rc3
+    rev: 0.9.0a1
     hooks:
     -   id: doc8
 -   repo: https://github.com/econchick/interrogate
-    rev: 1.2.0
+    rev: 1.3.1
     hooks:
     -   id: interrogate
         args: [-v, --fail-under=40, src, tests]
diff --git a/docs/conf.py b/docs/conf.py
@@ -21,7 +21,7 @@
 author = "Tobias Raabe"
 
 # The full version, including alpha/beta/rc tags
-release = "0.0.5"
+release = "0.0.6"
 
 
 # -- General configuration -------------------------------------------------------------
diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.0.5
+current_version = 0.0.6
 parse = (?P<major>\d+)\.(?P<minor>\d+)(\.(?P<patch>\d+))(\-?((dev)?(?P<dev>\d+))?)
 serialize = 
 	{major}.{minor}.{patch}dev{dev}
diff --git a/setup.py b/setup.py
@@ -15,7 +15,7 @@
 
 setup(
     name="pytask",
-    version="0.0.5",
+    version="0.0.6",
     description=DESCRIPTION,
     long_description=DESCRIPTION + "\n\n" + README,
     long_description_content_type="text/x-rst",
@@ -37,15 +37,6 @@
     ],
     platforms="any",
     entry_points={"console_scripts": ["pytask=_pytask.cli:cli"]},
-    install_requires=[
-        "attrs>=17.4.0",
-        "click",
-        "click-default-group",
-        "networkx",
-        "pluggy",
-        "pony>=0.7.13",
-    ],
-    tests_require=["pexpect", "pytest"],
     packages=find_packages(where="src"),
     package_dir={"": "src"},
 )
diff --git a/src/_pytask/__init__.py b/src/_pytask/__init__.py
@@ -1 +1 @@
-__version__ = "0.0.5"
+__version__ = "0.0.6"
diff --git a/src/_pytask/config.py b/src/_pytask/config.py
@@ -1,3 +1,4 @@
+"""Configure pytask."""
 import configparser
 import itertools
 import os
@@ -32,10 +33,12 @@
     "build/*",
     "dist/*",
 ]
+"""List[str]: List of expressions to ignore folders."""
 
 
 @hookimpl
 def pytask_configure(pm, config_from_cli):
+    """Configure pytask."""
     config = {"pm": pm, "terminal_width": _get_terminal_width()}
 
     # Either the path to the configuration is passed via the CLI or it needs to be
@@ -88,17 +91,19 @@ def pytask_configure(pm, config_from_cli):
 
 @hookimpl
 def pytask_parse_config(config, config_from_cli, config_from_file):
+    """Parse the configuration."""
     config_from_file["ignore"] = parse_value_or_multiline_option(
         config_from_file.get("ignore")
     )
 
     config["ignore"] = (
-        get_first_non_none_value(
-            config_from_cli,
-            config_from_file,
-            key="ignore",
-            default=[],
-            callback=to_list,
+        to_list(
+            get_first_non_none_value(
+                config_from_cli,
+                config_from_file,
+                key="ignore",
+                default=[],
+            )
         )
         + IGNORED_FOLDERS
     )
@@ -117,7 +122,7 @@ def pytask_parse_config(config, config_from_cli, config_from_file):
 
 @hookimpl
 def pytask_post_parse(config):
-    # Sort markers alphabetically.
+    """Sort markers alphabetically."""
     config["markers"] = {k: config["markers"][k] for k in sorted(config["markers"])}
 
 
@@ -144,9 +149,11 @@ def _find_project_root_and_ini(paths: List[Path]):
         path = parent.joinpath(config_name)
 
         if path.exists():
-            config = configparser.ConfigParser()
-            config.read(path)
-            if "pytask" in config.sections():
+            try:
+                _read_config(path)
+            except Exception:
+                pass
+            else:
                 config_path = path
                 break
 
@@ -159,6 +166,7 @@ def _find_project_root_and_ini(paths: List[Path]):
 
 
 def _read_config(path):
+    """Read the configuration from a file with a [pytask] section."""
     config = configparser.ConfigParser()
     config.read(path)
     return dict(config["pytask"])
diff --git a/src/_pytask/mark/expression.py b/src/_pytask/mark/expression.py
@@ -101,7 +101,8 @@ def lex(self, input_: str) -> Iterator[Token]:
                     pos += len(value)
                 else:
                     raise ParseError(
-                        pos + 1, 'unexpected character "{}"'.format(input_[pos]),
+                        pos + 1,
+                        'unexpected character "{}"'.format(input_[pos]),
                     )
         yield Token(TokenType.EOF, "", pos)
 
@@ -205,7 +206,9 @@ def compile_(cls, input_: str) -> "Expression":
         """
         astexpr = expression(Scanner(input_))
         code = compile(
-            astexpr, filename="<pytest match expression>", mode="eval",
+            astexpr,
+            filename="<pytest match expression>",
+            mode="eval",
         )  # type: types.CodeType
         return cls(code)
 
diff --git a/src/_pytask/report.py b/src/_pytask/report.py
@@ -5,7 +5,7 @@
 import attr
 import click
 from _pytask.enums import ColorCode
-from _pytask.shared import remove_internal_traceback_frames_from_exc_info
+from _pytask.traceback import remove_internal_traceback_frames_from_exc_info
 
 
 @attr.s
diff --git a/src/_pytask/resolve_dependencies.py b/src/_pytask/resolve_dependencies.py
@@ -13,7 +13,7 @@
 from _pytask.exceptions import ResolvingDependenciesError
 from _pytask.mark import Mark
 from _pytask.report import ResolvingDependenciesReport
-from _pytask.shared import remove_traceback_from_exc_info
+from _pytask.traceback import remove_traceback_from_exc_info
 from pony import orm
 
 
diff --git a/src/_pytask/shared.py b/src/_pytask/shared.py
@@ -2,13 +2,6 @@
 from collections.abc import Iterable
 from pathlib import Path
 
-import _pytask
-import pluggy
-
-
-_PLUGGY_DIRECTORY = Path(pluggy.__file__).parent
-_PYTASK_DIRECTORY = Path(_pytask.__file__).parent
-
 
 def to_list(scalar_or_iter):
     """Convert scalars and iterables to list.
@@ -85,23 +78,13 @@ def get_first_non_none_value(*configs, key, default=None, callback=None):
     >>> get_first_non_none_value({}, {}, key="a", default="default")
     'default'
 
-    >>> get_first_non_none_value({"a": None}, {"a": "b"}, key="a", callback=to_list)
-    ['b']
+    >>> get_first_non_none_value({"a": None}, {"a": "b"}, key="a")
+    'b'
 
     """
-    return next(
-        (
-            config[key] if callback is None else callback(config[key])
-            for config in configs
-            if config.get(key) is not None
-        ),
-        default,
-    )
-
-
-def remove_traceback_from_exc_info(exc_info):
-    """Remove traceback from exception."""
-    return (*exc_info[:2], None)
+    callback = (lambda x: x) if callback is None else callback  # noqa: E731
+    processed_values = (callback(config.get(key)) for config in configs)
+    return next((value for value in processed_values if value is not None), default)
 
 
 def parse_value_or_multiline_option(value):
@@ -110,48 +93,6 @@ def parse_value_or_multiline_option(value):
     return value
 
 
-def is_internal_traceback_frame(frame):
-    """Returns ``True`` if traceback frame belongs to internal packages.
-
-    Internal packages are ``_pytask`` and ``pluggy``.
-
-    """
-    path = Path(frame.tb_frame.f_code.co_filename)
-    return any(root in path.parents for root in [_PLUGGY_DIRECTORY, _PYTASK_DIRECTORY])
-
-
-def filter_internal_traceback_frames(frame):
-    """Filter internal traceback frames from traceback.
-
-    If the first external frame is visited, return the frame. Else return ``None``.
-
-    """
-    for frame in yield_traceback_frames(frame):
-        if frame is None or not is_internal_traceback_frame(frame):
-            return frame
-
-
-def remove_internal_traceback_frames_from_exc_info(exc_info):
-    """Remove internal traceback frames from exception info.
-
-    If a non-internal traceback frame is found, return the traceback from the first
-    occurrence downwards. Otherwise, return the whole traceback.
-
-    """
-    if exc_info is not None:
-        filtered_traceback = filter_internal_traceback_frames(exc_info[2])
-        if filtered_traceback is not None:
-            exc_info = (*exc_info[:2], filtered_traceback)
-
-    return exc_info
-
-
-def yield_traceback_frames(frame):
-    """Yield traceback frames."""
-    yield frame
-    yield from yield_traceback_frames(frame.tb_next)
-
-
 def convert_truthy_or_falsy_to_bool(x):
     """Convert truthy or falsy value in .ini to Python boolean."""
     if x in [True, "True", "true", "1"]:
diff --git a/src/_pytask/skipping.py b/src/_pytask/skipping.py
@@ -7,7 +7,7 @@
 from _pytask.outcomes import Skipped
 from _pytask.outcomes import SkippedAncestorFailed
 from _pytask.outcomes import SkippedUnchanged
-from _pytask.shared import remove_traceback_from_exc_info
+from _pytask.traceback import remove_traceback_from_exc_info
 
 
 def skip_ancestor_failed(reason: str = "No reason provided.") -> str:
diff --git a/src/_pytask/traceback.py b/src/_pytask/traceback.py
@@ -0,0 +1,55 @@
+"""Process tracebacks."""
+from pathlib import Path
+
+import _pytask
+import pluggy
+
+_PLUGGY_DIRECTORY = Path(pluggy.__file__).parent
+_PYTASK_DIRECTORY = Path(_pytask.__file__).parent
+
+
+def remove_traceback_from_exc_info(exc_info):
+    """Remove traceback from exception."""
+    return (*exc_info[:2], None)
+
+
+def remove_internal_traceback_frames_from_exc_info(exc_info):
+    """Remove internal traceback frames from exception info.
+
+    If a non-internal traceback frame is found, return the traceback from the first
+    occurrence downwards. Otherwise, return the whole traceback.
+
+    """
+    if exc_info is not None:
+        filtered_traceback = _filter_internal_traceback_frames(exc_info[2])
+        if filtered_traceback is not None:
+            exc_info = (*exc_info[:2], filtered_traceback)
+
+    return exc_info
+
+
+def _is_internal_traceback_frame(frame):
+    """Returns ``True`` if traceback frame belongs to internal packages.
+
+    Internal packages are ``_pytask`` and ``pluggy``.
+
+    """
+    path = Path(frame.tb_frame.f_code.co_filename)
+    return any(root in path.parents for root in [_PLUGGY_DIRECTORY, _PYTASK_DIRECTORY])
+
+
+def _filter_internal_traceback_frames(frame):
+    """Filter internal traceback frames from traceback.
+
+    If the first external frame is visited, return the frame. Else return ``None``.
+
+    """
+    for frame in _yield_traceback_frames(frame):
+        if frame is None or not _is_internal_traceback_frame(frame):
+            return frame
+
+
+def _yield_traceback_frames(frame):
+    """Yield traceback frames."""
+    yield frame
+    yield from _yield_traceback_frames(frame.tb_next)
diff --git a/src/pytask/__init__.py b/src/pytask/__init__.py
@@ -3,5 +3,5 @@
 from _pytask.config import hookimpl
 from _pytask.mark import MARK_GEN as mark  # noqa: N811
 
-__all__ = ["cli", "hookimpl", "main", "mark", "pytask"]
-__version__ = "0.0.5"
+__all__ = ["cli", "hookimpl", "main", "mark"]
+__version__ = "0.0.6"
diff --git a/tests/test_mark.py b/tests/test_mark.py
@@ -237,8 +237,14 @@ def task_func(arg):
             "foo or or",
             "at column 8: expected not OR left parenthesis OR identifier; got or",
         ),
-        ("(foo", "at column 5: expected right parenthesis; got end of input",),
-        ("foo bar", "at column 5: expected end of input; got identifier",),
+        (
+            "(foo",
+            "at column 5: expected right parenthesis; got end of input",
+        ),
+        (
+            "foo bar",
+            "at column 5: expected end of input; got identifier",
+        ),
         (
             "or or",
             "at column 1: expected not OR left parenthesis OR identifier; got or",
diff --git a/tests/test_mark_expression.py b/tests/test_mark_expression.py

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-__version__ = "0.0.5"`
	`1`	`+__version__ = "0.0.6"`