From da4c1f672e83062e6a8cacfa3827493f7c9be924 Mon Sep 17 00:00:00 2001 From: Tobias Raabe Date: Mon, 23 Jan 2023 09:45:09 +0100 Subject: [PATCH 1/5] Use mambaforge for CI. Committed via https://github.com/asottile/all-repos --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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} From 520715852b37fee0cff32cc44202f8c591dc367a Mon Sep 17 00:00:00 2001 From: Tobias Raabe Date: Mon, 23 Jan 2023 11:17:25 +0100 Subject: [PATCH 2/5] Fix tests. --- tests/test_execute.py | 6 +++--- tests/test_latex_dependency_scanner.py | 4 ++-- tests/test_parallel.py | 4 ++-- tests/test_parametrize.py | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/test_execute.py b/tests/test_execute.py index ce893bc..427dc51 100644 --- a/tests/test_execute.py +++ b/tests/test_execute.py @@ -4,9 +4,9 @@ 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 tests.conftest import needs_latexmk +from tests.conftest import skip_on_github_actions_with_win +from tests.conftest import TEST_RESOURCES from pytask import cli from pytask import ExitCode from pytask import main diff --git a/tests/test_latex_dependency_scanner.py b/tests/test_latex_dependency_scanner.py index 6a14990..7fc72cf 100644 --- a/tests/test_latex_dependency_scanner.py +++ b/tests/test_latex_dependency_scanner.py @@ -3,8 +3,8 @@ import textwrap import pytest -from conftest import needs_latexmk -from conftest import skip_on_github_actions_with_win +from tests.conftest import needs_latexmk +from tests.conftest import skip_on_github_actions_with_win from pytask import ExitCode from pytask import main diff --git a/tests/test_parallel.py b/tests/test_parallel.py index 92bab10..f65a5c3 100644 --- a/tests/test_parallel.py +++ b/tests/test_parallel.py @@ -6,8 +6,8 @@ import time import pytest -from conftest import needs_latexmk -from conftest import skip_on_github_actions_with_win +from tests.conftest import needs_latexmk +from tests.conftest import skip_on_github_actions_with_win from pytask import cli from pytask import ExitCode diff --git a/tests/test_parametrize.py b/tests/test_parametrize.py index 6096bad..4bf31b1 100644 --- a/tests/test_parametrize.py +++ b/tests/test_parametrize.py @@ -3,8 +3,8 @@ import textwrap import pytest -from conftest import needs_latexmk -from conftest import skip_on_github_actions_with_win +from tests.conftest import needs_latexmk +from tests.conftest import skip_on_github_actions_with_win from pytask import ExitCode from pytask import main From 60fa3657a1a9cd0e6409a41cb299bd657a37bafe Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 23 Jan 2023 10:18:30 +0000 Subject: [PATCH 3/5] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- tests/test_execute.py | 7 ++++--- tests/test_latex_dependency_scanner.py | 5 +++-- tests/test_parallel.py | 5 +++-- tests/test_parametrize.py | 5 +++-- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/tests/test_execute.py b/tests/test_execute.py index 427dc51..1492bd6 100644 --- a/tests/test_execute.py +++ b/tests/test_execute.py @@ -4,9 +4,6 @@ from pathlib import Path import pytest -from tests.conftest import needs_latexmk -from tests.conftest import skip_on_github_actions_with_win -from tests.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 7fc72cf..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 tests.conftest import needs_latexmk -from tests.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 f65a5c3..51656b5 100644 --- a/tests/test_parallel.py +++ b/tests/test_parallel.py @@ -6,11 +6,12 @@ import time import pytest -from tests.conftest import needs_latexmk -from tests.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 4bf31b1..3673407 100644 --- a/tests/test_parametrize.py +++ b/tests/test_parametrize.py @@ -3,11 +3,12 @@ import textwrap import pytest -from tests.conftest import needs_latexmk -from tests.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 From 4b78c748215e4b283e8bf40ec287a6676245af57 Mon Sep 17 00:00:00 2001 From: Tobias Raabe Date: Mon, 23 Jan 2023 17:11:25 +0100 Subject: [PATCH 4/5] Update tox.ini --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From de8ab7b89afd4688372f30c1d82a3e5851860bd2 Mon Sep 17 00:00:00 2001 From: Tobias Raabe Date: Mon, 23 Jan 2023 17:12:08 +0100 Subject: [PATCH 5/5] Update environment.yml --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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