diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f34de0c..feffbc4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,7 +38,7 @@ jobs: auto-update-conda: false python-version: ${{ matrix.python-version }} channels: conda-forge,nodefaults - mamba-version: "*" + miniforge-variant: Mambaforge - name: Install core dependencies. shell: bash -l {0} diff --git a/environment.yml b/environment.yml index 11da13d..5dcba2b 100644 --- a/environment.yml +++ b/environment.yml @@ -12,7 +12,7 @@ dependencies: # Package dependencies - pytask >= 0.3 - - pytask-parallel >= 0.1 + - pytask-parallel >= 0.3 - latex-dependency-scanner >=0.1.1 - pybaum >=0.1.1 diff --git a/tests/test_execute.py b/tests/test_execute.py index ce893bc..1492bd6 100644 --- a/tests/test_execute.py +++ b/tests/test_execute.py @@ -4,9 +4,6 @@ from pathlib import Path import pytest -from conftest import needs_latexmk -from conftest import skip_on_github_actions_with_win -from conftest import TEST_RESOURCES from pytask import cli from pytask import ExitCode from pytask import main @@ -14,6 +11,10 @@ from pytask import Task from pytask_latex.execute import pytask_execute_task_setup +from tests.conftest import needs_latexmk +from tests.conftest import skip_on_github_actions_with_win +from tests.conftest import TEST_RESOURCES + @pytest.mark.unit() def test_pytask_execute_task_setup(monkeypatch): diff --git a/tests/test_latex_dependency_scanner.py b/tests/test_latex_dependency_scanner.py index 6a14990..c0e292f 100644 --- a/tests/test_latex_dependency_scanner.py +++ b/tests/test_latex_dependency_scanner.py @@ -3,11 +3,12 @@ import textwrap import pytest -from conftest import needs_latexmk -from conftest import skip_on_github_actions_with_win from pytask import ExitCode from pytask import main +from tests.conftest import needs_latexmk +from tests.conftest import skip_on_github_actions_with_win + @needs_latexmk @skip_on_github_actions_with_win diff --git a/tests/test_parallel.py b/tests/test_parallel.py index 92bab10..51656b5 100644 --- a/tests/test_parallel.py +++ b/tests/test_parallel.py @@ -6,11 +6,12 @@ import time import pytest -from conftest import needs_latexmk -from conftest import skip_on_github_actions_with_win from pytask import cli from pytask import ExitCode +from tests.conftest import needs_latexmk +from tests.conftest import skip_on_github_actions_with_win + try: import pytask_parallel # noqa: F401 diff --git a/tests/test_parametrize.py b/tests/test_parametrize.py index 6096bad..3673407 100644 --- a/tests/test_parametrize.py +++ b/tests/test_parametrize.py @@ -3,11 +3,12 @@ import textwrap import pytest -from conftest import needs_latexmk -from conftest import skip_on_github_actions_with_win from pytask import ExitCode from pytask import main +from tests.conftest import needs_latexmk +from tests.conftest import skip_on_github_actions_with_win + @needs_latexmk @skip_on_github_actions_with_win diff --git a/tox.ini b/tox.ini index b8d4147..076b1eb 100644 --- a/tox.ini +++ b/tox.ini @@ -9,8 +9,8 @@ basepython = python [testenv:pytest] conda_deps = - pytask >=0.2 - pytask-parallel >=0.1 + pytask >=0.3 + pytask-parallel >=0.3 latex-dependency-scanner pytest pytest-cov