From bcc5fc329dcc38eb511c46361c38c7e57255a75e Mon Sep 17 00:00:00 2001 From: Jacob Walls Date: Mon, 8 Jul 2024 08:49:27 -0400 Subject: [PATCH 1/3] Test astroid 3.13 support --- pyproject.toml | 5 ++--- requirements_test_min.txt | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index b5e430c7ac..b6b8c4cbc2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -39,9 +39,8 @@ dependencies = [ "dill>=0.3.7;python_version>='3.12'", "platformdirs>=2.2.0", # Also upgrade requirements_test_min.txt. - # Pinned to dev of second minor update to allow editable installs and fix primer issues, - # see https://github.com/pylint-dev/astroid/issues/1341 - "astroid>=3.2.2,<=3.3.0-dev0", + # Test 3.13 upgrade + "astroid @ git+https://github.com/pylint-dev/astroid.git@bdb75681adf0ee7e129f976baa4e4ed89aa61041", "isort>=4.2.5,<6,!=5.13.0", "mccabe>=0.6,<0.8", "tomli>=1.1.0;python_version<'3.11'", diff --git a/requirements_test_min.txt b/requirements_test_min.txt index e93ef7eb13..9ed31cda9e 100644 --- a/requirements_test_min.txt +++ b/requirements_test_min.txt @@ -1,6 +1,7 @@ .[testutils,spelling] # astroid dependency is also defined in pyproject.toml -astroid==3.2.2 # Pinned to a specific version for tests +# test 3.13 upgrade +astroid @ git+https://github.com/pylint-dev/astroid.git@bdb75681adf0ee7e129f976baa4e4ed89aa61041 typing-extensions~=4.12 py~=1.11.0 pytest~=8.2 From 1baa159e9ed02d7d4a7513aa7e9b2f4cdd5589f8 Mon Sep 17 00:00:00 2001 From: Jacob Walls Date: Mon, 8 Jul 2024 09:19:44 -0400 Subject: [PATCH 2/3] Temporary commit to run tests on 3.13-dev --- .github/workflows/tests.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 36d1ea1aa8..12a7169b61 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -31,7 +31,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.8, 3.9, "3.10", "3.11", "3.12"] + python-version: [3.8, 3.9, "3.10", "3.11", "3.12", "3.13-dev"] outputs: python-key: ${{ steps.generate-python-key.outputs.key }} steps: @@ -175,7 +175,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.8, 3.9, "3.10", "3.11", "3.12"] + python-version: [3.8, 3.9, "3.10", "3.11", "3.12", "3.13-dev"] steps: - name: Set temp directory run: echo "TEMP=$env:USERPROFILE\AppData\Local\Temp" >> $env:GITHUB_ENV From 1a4e7dd5049f8ff1dd207c26ffac74b4cd62e11b Mon Sep 17 00:00:00 2001 From: Jacob Walls Date: Mon, 8 Jul 2024 09:43:26 -0400 Subject: [PATCH 3/3] Temporarily remove pytest-profiling --- requirements_test.txt | 1 - tox.ini | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements_test.txt b/requirements_test.txt index a4a0eba040..bb4dc27a50 100644 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -3,7 +3,6 @@ coverage~=7.5 tbump~=6.11.0 contributors-txt>=1.0.0 pytest-cov~=5.0 -pytest-profiling~=1.7 pytest-xdist~=3.6 six # Type packages for mypy diff --git a/tox.ini b/tox.ini index b3e429cc8c..0d3126e776 100644 --- a/tox.ini +++ b/tox.ini @@ -87,7 +87,7 @@ commands = [testenv:profile_against_external] setenv = - PYTEST_PROFILE_EXTERNAL = 1 + PYTEST_PROFILE_EXTERNAL = 0 deps = -r {toxinidir}/requirements_test.txt gprof2dot