From c55bb0a9f0ad0a48cba83cbb28afdb1db886542e Mon Sep 17 00:00:00 2001 From: Alex Moinet Date: Thu, 5 Dec 2024 16:22:35 +0000 Subject: [PATCH 1/4] Add v3.13 to test matrices --- .github/workflows/maze-runner.yml | 2 +- .github/workflows/python-package.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maze-runner.yml b/.github/workflows/maze-runner.yml index 9d89beb0..ac3d3e7c 100644 --- a/.github/workflows/maze-runner.yml +++ b/.github/workflows/maze-runner.yml @@ -9,7 +9,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.5', '3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '3.12'] + python-version: ['3.5', '3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13'] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 06de675a..a955560e 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -9,7 +9,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12'] + python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13'] os: ['ubuntu-latest'] include: - python-version: '3.5' From 097708599acbcf5252dd470372a81643d293930f Mon Sep 17 00:00:00 2001 From: Alex Moinet Date: Thu, 5 Dec 2024 16:34:11 +0000 Subject: [PATCH 2/4] Skip python 3.13 in celery 4 tests --- features/celery.feature | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/features/celery.feature b/features/celery.feature index c78ce0c9..85ca139e 100644 --- a/features/celery.feature +++ b/features/celery.feature @@ -12,7 +12,7 @@ Scenario Outline: Handled exceptions are delivered in Celery And the event "severityReason.type" equals "handledException" And the event "device.runtimeVersions.celery" matches "\.\d+\.\d+" - @not-python-3.11 @not-python-3.12 + @not-python-3.11 @not-python-3.12 @not-python-3.13 Examples: | celery-version | | 4 | @@ -40,7 +40,7 @@ Scenario Outline: Unhandled exceptions are delivered in Celery And the event "metaData.extra_data.args" string is empty And the event "metaData.extra_data.kwargs" string is empty - @not-python-3.11 @not-python-3.12 + @not-python-3.11 @not-python-3.12 @not-python-3.13 Examples: | celery-version | | 4 | @@ -72,7 +72,7 @@ Scenario Outline: Task arguments are added to metadata in Celery And the event "metaData.extra_data.args.1" equals "0" And the event "metaData.extra_data.kwargs" string is empty - @not-python-3.11 @not-python-3.12 + @not-python-3.11 @not-python-3.12 @not-python-3.13 Examples: | celery-version | | 4 | @@ -116,7 +116,7 @@ Scenario Outline: Successful tasks do not report errors in Celery " Then I should receive no errors - @not-python-3.11 @not-python-3.12 + @not-python-3.11 @not-python-3.12 @not-python-3.13 Examples: | celery-version | | 4 | @@ -131,7 +131,7 @@ Scenario Outline: Successful shared tasks do not report errors in Celery " Then I should receive no errors - @not-python-3.11 @not-python-3.12 + @not-python-3.11 @not-python-3.12 @not-python-3.13 Examples: | celery-version | | 4 | From 145b796ad739509abc29326298b183243005ab84 Mon Sep 17 00:00:00 2001 From: Alex Moinet Date: Thu, 12 Dec 2024 00:06:58 +0000 Subject: [PATCH 3/4] Update tox.ini for 3.13 tests --- tox.ini | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tox.ini b/tox.ini index 325d6b3d..f1ab306d 100644 --- a/tox.ini +++ b/tox.ini @@ -1,15 +1,15 @@ [tox] envlist= - py{35,36,37,38,39,310,311,312}-{test,requests,flask,tornado,wsgi,bottle} - py{36,37,38,39,310,311,312}-asgi + py{35,36,37,38,39,310,311,312,313}-{test,requests,flask,tornado,wsgi,bottle} + py{36,37,38,39,310,311,312,313}-asgi py{35,36,37}-django{18,19,110,111} py{35,36,37,38,39}-django20 py{35,36,37,38,39,310}-django{21,22} - py{36,37,38,39,310,311,312}-django3 - py{38,39,310,311,312}-django4 - py{38,39,310,311,312}-{asynctest,threadtest} - py{37,38,39,310,311,312}-exceptiongroup - py{35,312}-{lint} + py{36,37,38,39,310,311,312,313}-django3 + py{38,39,310,311,312,313}-django4 + py{38,39,310,311,312,313}-{asynctest,threadtest} + py{37,38,39,310,311,312,313}-exceptiongroup + py{35,312,313}-{lint} [pytest] testpaths = tests @@ -32,6 +32,7 @@ basepython = py310: python3.10 py311: python3.11 py312: python3.12 + py313: python3.13 whitelist_externals= {toxinidir}/scripts/lint.sh deps= From f5e02367778a7e74d1cf47e2320d5f435644b805 Mon Sep 17 00:00:00 2001 From: Alex Moinet Date: Thu, 12 Dec 2024 10:09:34 +0000 Subject: [PATCH 4/4] Push lint to the latest version and stop using yanked packages --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index f1ab306d..4de4bbd6 100644 --- a/tox.ini +++ b/tox.ini @@ -9,7 +9,7 @@ envlist= py{38,39,310,311,312,313}-django4 py{38,39,310,311,312,313}-{asynctest,threadtest} py{37,38,39,310,311,312,313}-exceptiongroup - py{35,312,313}-{lint} + py{35,313}-{lint} [pytest] testpaths = tests @@ -65,7 +65,7 @@ deps= exceptiongroup: exceptiongroup lint: flake8 lint: mypy - lint: types-pkg_resources + lint: types-setuptools lint: types-requests lint: types-Flask lint: types-contextvars