Push.

Author: tobiasraabe

.github/workflows/continuous-integration-workflow.yml renamed to .github/workflows/main.yml

@@ -1,4 +1,4 @@
-name: Continuous Integration Workflow
+name: main
 
 # Automatically cancel a previous run.
 concurrency:
@@ -41,7 +41,7 @@ jobs:
 
       - name: Run unit tests and doctests.
         shell: bash -l {0}
-        run: tox -e pytest -- -m "unit or (not integration and not end_to_end)" --cov=./ --cov-report=xml -n auto
+        run: tox -e pytest -- tests -m "unit or (not integration and not end_to_end)" --cov=./ --cov-report=xml -n auto
 
       - name: Upload coverage report for unit tests and doctests.
         if: runner.os == 'Linux' && matrix.python-version == '3.9'
@@ -50,7 +50,7 @@ jobs:
 
       - name: Run integration tests.
         shell: bash -l {0}
-        run: tox -e pytest -- -m integration --cov=./ --cov-report=xml -n auto
+        run: tox -e pytest -- tests -m integration --cov=./ --cov-report=xml -n auto
 
       - name: Upload coverage reports of integration tests.
         if: runner.os == 'Linux' && matrix.python-version == '3.9'
@@ -59,7 +59,7 @@ jobs:
 
       - name: Run end-to-end tests.
         shell: bash -l {0}
-        run: tox -e pytest -- -m end_to_end --cov=./ --cov-report=xml -n auto
+        run: tox -e pytest -- tests -m end_to_end --cov=./ --cov-report=xml -n auto
 
       - name: Upload coverage reports of end-to-end tests.
         if: runner.os == 'Linux' && matrix.python-version == '3.9'

README.md

@@ -58,8 +58,7 @@ files, you can parallelize via threads.
 $ pytask --parallel-backend threads
 ```
 
-You can also set the options in one of the configuration files (`pytask.ini`, `tox.ini`,
-or `setup.cfg`).
+You can also set the options in a `pyproject.toml`.
 
 ```toml
 # This is the default configuration. Note that, parallelization is turned off.

src/pytask_parallel/config.py

@@ -60,17 +60,6 @@ def _get_first_non_none_value(
     This function allows to prioritize information from many configurations by changing
     the order of the inputs while also providing a default.
 
-    Examples
-    --------
-    >>> _get_first_non_none_value({"a": None}, {"a": 1}, key="a")
-    1
-    >>> _get_first_non_none_value({"a": None}, {"a": None}, key="a", default="default")
-    'default'
-    >>> _get_first_non_none_value({}, {}, key="a", default="default")
-    'default'
-    >>> _get_first_non_none_value({"a": None}, {"a": "b"}, key="a")
-    'b'
-
     """
     callback = (lambda x: x) if callback is None else callback  # noqa: E731
     processed_values = (callback(config.get(key)) for config in configs)

src/pytask_parallel/execute.py

@@ -20,9 +20,9 @@
 @hookimpl
 def pytask_post_parse(config):
     """Register the parallel backend."""
-    if config["parallel_backend"] in ["loky", "processes"]:
+    if config["parallel_backend"] in ("loky", "processes"):
         config["pm"].register(ProcessesNameSpace)
-    elif config["parallel_backend"] in ["threads"]:
+    elif config["parallel_backend"] in ("threads",):
         config["pm"].register(DefaultBackendNameSpace)
 
 

tests/test_config.py

@@ -26,7 +26,9 @@ def test_interplay_between_debugging_and_parallel(tmp_path, pdb, n_workers, expe
 
 
 @pytest.mark.end_to_end
-@pytest.mark.parametrize("config_file", ["pytask.ini", "tox.ini", "setup.cfg"])
+@pytest.mark.parametrize(
+    "config_file", ["pytask.ini", "tox.ini", "setup.cfg", "pyproject.toml"]
+)
 @pytest.mark.parametrize(
     "configuration_option, value, exit_code",
     [
@@ -43,15 +45,26 @@ def test_interplay_between_debugging_and_parallel(tmp_path, pdb, n_workers, expe
     ],
 )
 def test_reading_values_from_config_file(
-    tmp_path, config_file, configuration_option, value, exit_code
+    tmp_path, capsys, config_file, configuration_option, value, exit_code
 ):
-    config = f"""
-    [pytask]
-    {configuration_option} = {value}
-    """
+    if config_file == "pyproject.toml":
+        config = f"""
+        [tool.pytask.ini_options]
+        {configuration_option} = {value!r}
+        """
+    else:
+        config = f"""
+        [pytask]
+        {configuration_option} = {value}
+        """
     tmp_path.joinpath(config_file).write_text(textwrap.dedent(config))
 
     session = main({"paths": tmp_path})
+    captured = capsys.readouterr()
+    if config_file == "pyproject.toml":
+        assert "WARNING" not in captured.out
+    else:
+        assert "WARNING" in captured.out
 
     assert session.exit_code == exit_code
     if value == "auto":

tests/test_execute.py

@@ -171,15 +171,13 @@ def task_2(produces):
 @pytest.mark.parametrize("parallel_backend", PARALLEL_BACKENDS)
 def test_stop_execution_when_max_failures_is_reached(tmp_path, parallel_backend):
     source = """
-    import time
     import pytask
 
-    def task_1(): time.sleep(1)
-    def task_2(): time.sleep(2); raise NotImplementedError
+    def task_1(): pass
+    def task_2(): pass; raise NotImplementedError
 
     @pytask.mark.try_last
-    def task_3():
-        time.sleep(3)
+    def task_3(): ...
     """
     tmp_path.joinpath("task_dummy.py").write_text(textwrap.dedent(source))
 
@@ -192,7 +190,7 @@ def task_3():
         }
     )
 
-    assert session.exit_code == ExitCode.OK
+    assert session.exit_code == ExitCode.FAILED
     assert len(session.tasks) == 3
     assert len(session.execution_reports) == 2
 
@@ -206,25 +204,25 @@ def test_task_priorities(tmp_path, parallel_backend):
 
     @pytask.mark.try_first
     def task_0():
-        time.sleep(1)
+        time.sleep(0.1)
 
     def task_1():
-        time.sleep(1)
+        time.sleep(0.1)
 
     @pytask.mark.try_last
     def task_2():
-        time.sleep(1)
+        time.sleep(0.1)
 
     @pytask.mark.try_first
     def task_3():
-        time.sleep(1)
+        time.sleep(0.1)
 
     def task_4():
-        time.sleep(1)
+        time.sleep(0.1)
 
     @pytask.mark.try_last
     def task_5():
-        time.sleep(1)
+        time.sleep(0.1)
     """
     tmp_path.joinpath("task_dummy.py").write_text(textwrap.dedent(source))