From 5f7bc6f4b22fa2936d244c69afab5fe5373656fb Mon Sep 17 00:00:00 2001 From: Tobias Raabe Date: Fri, 28 Oct 2022 01:37:38 +0200 Subject: [PATCH 1/9] Update main.yml --- .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 87838c0c8..12b19f135 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,7 +24,7 @@ jobs: fail-fast: false matrix: os: ['ubuntu-latest', 'macos-latest', 'windows-latest'] - python-version: ['3.7', '3.8', '3.9', '3.10'] + python-version: ['3.7', '3.8', '3.9', '3.10', '3.11'] steps: - uses: actions/checkout@v2 From aa197de88bb726360513a67ae60b6b1a3ddd10a3 Mon Sep 17 00:00:00 2001 From: Tobias Raabe Date: Fri, 28 Oct 2022 10:09:27 +0200 Subject: [PATCH 2/9] Use mamba and conda-forge. --- .github/workflows/main.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 12b19f135..f381c2ca2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,6 +4,9 @@ name: main concurrency: group: ${{ github.head_ref || github.run_id }} cancel-in-progress: true + +env: + CONDA_EXE: mamba on: push: @@ -30,12 +33,14 @@ jobs: - uses: actions/checkout@v2 - uses: conda-incubator/setup-miniconda@v2 with: - auto-update-conda: true + auto-update-conda: false python-version: ${{ matrix.python-version }} + channels: conda-forge,nodefaults + mamba-version: "*" - name: Install core dependencies. shell: bash -l {0} - run: conda install -c conda-forge tox-conda coverage + run: mamba install -c conda-forge tox-conda coverage # Unit, integration, and end-to-end tests. @@ -76,11 +81,13 @@ jobs: - uses: actions/checkout@v2 - uses: conda-incubator/setup-miniconda@v2 with: - auto-update-conda: true + auto-update-conda: false + channels: conda-forge,nodefaults + mamba-version: "*" - name: Install core dependencies. shell: bash -l {0} - run: conda install -c conda-forge tox-conda + run: mamba install -c conda-forge tox-conda - name: Build docs shell: bash -l {0} From 06fcbc4fc270eee8f936c8b598df4018526268d1 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 28 Oct 2022 08:09:58 +0000 Subject: [PATCH 3/9] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .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 f381c2ca2..60b737539 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,7 +4,7 @@ name: main concurrency: group: ${{ github.head_ref || github.run_id }} cancel-in-progress: true - + env: CONDA_EXE: mamba From 246868a5b01724142acaa925cff79478caec7997 Mon Sep 17 00:00:00 2001 From: Tobias Raabe Date: Sat, 12 Nov 2022 21:13:03 +0100 Subject: [PATCH 4/9] Unpin coverage. --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index ca7732274..1617e69f8 100644 --- a/tox.ini +++ b/tox.ini @@ -13,7 +13,7 @@ conda_deps = pytest pytest-cov pytest-xdist - coverage <=6.4.0 + coverage # Package dependencies attrs From c4132848041d99fe8925ec8932c5c33d9dbf5775 Mon Sep 17 00:00:00 2001 From: Tobias Raabe Date: Sat, 12 Nov 2022 21:15:40 +0100 Subject: [PATCH 5/9] Remove doc8 config. --- tox.ini | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tox.ini b/tox.ini index 1617e69f8..5296a42c3 100644 --- a/tox.ini +++ b/tox.ini @@ -42,12 +42,6 @@ commands = sphinx-build -T -b html -d {envtmpdir}/doctrees . {envtmpdir}/html - sphinx-build -T -b linkcheck -d {envtmpdir}/doctrees . {envtmpdir}/linkcheck -[doc8] -ignore = D002, D004 -ignore-path = - docs/build -max-line-length = 88 - [flake8] docstring-convention = numpy exclude = From 4c426fb7ab2cc9f714ec150537ceb0c6174bdb7a Mon Sep 17 00:00:00 2001 From: Tobias Raabe Date: Sat, 12 Nov 2022 21:47:09 +0100 Subject: [PATCH 6/9] xfail tests. --- tests/test_debugging.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/test_debugging.py b/tests/test_debugging.py index 65f41ae6a..c0a505665 100644 --- a/tests/test_debugging.py +++ b/tests/test_debugging.py @@ -172,6 +172,7 @@ def task_example(): @pytest.mark.end_to_end +@pytest.mark.xfail(reason="#312") @pytest.mark.skipif(not IS_PEXPECT_INSTALLED, reason="pexpect is not installed.") @pytest.mark.skipif(sys.platform == "win32", reason="pexpect cannot spawn on Windows.") def test_pdb_interaction_capturing_simple(tmp_path): @@ -283,6 +284,7 @@ def task_2(): @pytest.mark.end_to_end +@pytest.mark.xfail(reason="#312") @pytest.mark.skipif(not IS_PEXPECT_INSTALLED, reason="pexpect is not installed.") @pytest.mark.skipif(sys.platform == "win32", reason="pexpect cannot spawn on Windows.") def test_pdb_interaction_capturing_twice(tmp_path): From fb19de412720714c193b542b12fa15634d79e41e Mon Sep 17 00:00:00 2001 From: Tobias Raabe Date: Sat, 12 Nov 2022 22:04:19 +0100 Subject: [PATCH 7/9] Back to conda. --- .github/workflows/main.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bc7a96d6f..967280acf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,9 +5,6 @@ concurrency: group: ${{ github.head_ref || github.run_id }} cancel-in-progress: true -env: - CONDA_EXE: mamba - on: push: branches: @@ -35,12 +32,10 @@ jobs: with: auto-update-conda: false python-version: ${{ matrix.python-version }} - channels: conda-forge,nodefaults - mamba-version: "*" - name: Install core dependencies. shell: bash -l {0} - run: mamba install -c conda-forge tox-conda coverage + run: conda install -c conda-forge tox-conda coverage # Unit, integration, and end-to-end tests. From 7ab82f16d92862776f01ef0a68240f5f9cb58235 Mon Sep 17 00:00:00 2001 From: Tobias Raabe Date: Sat, 12 Nov 2022 22:06:01 +0100 Subject: [PATCH 8/9] Remove python version for better local experience. --- .pre-commit-config.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ddebfe6d9..0af449743 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -77,7 +77,6 @@ repos: hooks: - id: refurb args: [--ignore, FURB126] - language_version: python3.10 - repo: https://github.com/executablebooks/mdformat rev: 0.7.16 hooks: From 17e7776edc2979f2329f75179567a0a553bfc275 Mon Sep 17 00:00:00 2001 From: Tobias Raabe Date: Sat, 12 Nov 2022 22:10:29 +0100 Subject: [PATCH 9/9] Again. --- .github/workflows/main.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 967280acf..bc7a96d6f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,6 +5,9 @@ concurrency: group: ${{ github.head_ref || github.run_id }} cancel-in-progress: true +env: + CONDA_EXE: mamba + on: push: branches: @@ -32,10 +35,12 @@ jobs: with: auto-update-conda: false python-version: ${{ matrix.python-version }} + channels: conda-forge,nodefaults + mamba-version: "*" - name: Install core dependencies. shell: bash -l {0} - run: conda install -c conda-forge tox-conda coverage + run: mamba install -c conda-forge tox-conda coverage # Unit, integration, and end-to-end tests.