From e6db09cccf0dc39958f95eb80000a6802b8d9754 Mon Sep 17 00:00:00 2001 From: Ivana Kellyer Date: Wed, 8 Jan 2025 19:36:16 +0100 Subject: [PATCH] fix py versions --- .github/workflows/test-integrations-aws.yml | 2 +- .github/workflows/test-integrations-cloud.yml | 2 +- .github/workflows/test-integrations-dbs.yml | 2 +- .../workflows/test-integrations-graphql.yml | 2 +- .github/workflows/test-integrations-misc.yml | 2 +- .../workflows/test-integrations-network.yml | 2 +- .github/workflows/test-integrations-tasks.yml | 2 +- .github/workflows/test-integrations-web-1.yml | 2 +- .github/workflows/test-integrations-web-2.yml | 2 +- scripts/populate_tox/populate_tox.py | 6 + tox.ini | 106 +++++++++--------- 11 files changed, 67 insertions(+), 63 deletions(-) diff --git a/.github/workflows/test-integrations-aws.yml b/.github/workflows/test-integrations-aws.yml index 10a121668d..7703080049 100644 --- a/.github/workflows/test-integrations-aws.yml +++ b/.github/workflows/test-integrations-aws.yml @@ -61,7 +61,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.5","3.8"] + python-version: ["3.6","3.8"] # python3.6 reached EOL and is no longer being supported on # new versions of hosted runners on Github Actions # ubuntu-20.04 is the last version that supported python3.6 diff --git a/.github/workflows/test-integrations-cloud.yml b/.github/workflows/test-integrations-cloud.yml index 608f234720..2877394963 100644 --- a/.github/workflows/test-integrations-cloud.yml +++ b/.github/workflows/test-integrations-cloud.yml @@ -29,7 +29,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["2.7","3.6","3.7","3.8","3.11","3.12","3.13"] + python-version: ["3.6","3.7","3.8","3.11","3.12","3.13"] # python3.6 reached EOL and is no longer being supported on # new versions of hosted runners on Github Actions # ubuntu-20.04 is the last version that supported python3.6 diff --git a/.github/workflows/test-integrations-dbs.yml b/.github/workflows/test-integrations-dbs.yml index 9ec21eed48..52961db361 100644 --- a/.github/workflows/test-integrations-dbs.yml +++ b/.github/workflows/test-integrations-dbs.yml @@ -29,7 +29,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["2.7","3.5","3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"] + python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"] # python3.6 reached EOL and is no longer being supported on # new versions of hosted runners on Github Actions # ubuntu-20.04 is the last version that supported python3.6 diff --git a/.github/workflows/test-integrations-graphql.yml b/.github/workflows/test-integrations-graphql.yml index 49d03462dc..8b21ade4fd 100644 --- a/.github/workflows/test-integrations-graphql.yml +++ b/.github/workflows/test-integrations-graphql.yml @@ -29,7 +29,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["2.7","3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"] + python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"] # python3.6 reached EOL and is no longer being supported on # new versions of hosted runners on Github Actions # ubuntu-20.04 is the last version that supported python3.6 diff --git a/.github/workflows/test-integrations-misc.yml b/.github/workflows/test-integrations-misc.yml index fcdf01e20f..d772faef7d 100644 --- a/.github/workflows/test-integrations-misc.yml +++ b/.github/workflows/test-integrations-misc.yml @@ -29,7 +29,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.4","3.5","3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"] + python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"] # python3.6 reached EOL and is no longer being supported on # new versions of hosted runners on Github Actions # ubuntu-20.04 is the last version that supported python3.6 diff --git a/.github/workflows/test-integrations-network.yml b/.github/workflows/test-integrations-network.yml index 629a3c18ab..c575cfd4ae 100644 --- a/.github/workflows/test-integrations-network.yml +++ b/.github/workflows/test-integrations-network.yml @@ -29,7 +29,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["2.7","3.5","3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"] + python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"] # python3.6 reached EOL and is no longer being supported on # new versions of hosted runners on Github Actions # ubuntu-20.04 is the last version that supported python3.6 diff --git a/.github/workflows/test-integrations-tasks.yml b/.github/workflows/test-integrations-tasks.yml index 9978ba8127..e8b23ee495 100644 --- a/.github/workflows/test-integrations-tasks.yml +++ b/.github/workflows/test-integrations-tasks.yml @@ -29,7 +29,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["2.7","3.5","3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"] + python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"] # python3.6 reached EOL and is no longer being supported on # new versions of hosted runners on Github Actions # ubuntu-20.04 is the last version that supported python3.6 diff --git a/.github/workflows/test-integrations-web-1.yml b/.github/workflows/test-integrations-web-1.yml index 7db2977846..7289ff7c99 100644 --- a/.github/workflows/test-integrations-web-1.yml +++ b/.github/workflows/test-integrations-web-1.yml @@ -29,7 +29,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["2.6","2.7","3.5","3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"] + python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"] # python3.6 reached EOL and is no longer being supported on # new versions of hosted runners on Github Actions # ubuntu-20.04 is the last version that supported python3.6 diff --git a/.github/workflows/test-integrations-web-2.yml b/.github/workflows/test-integrations-web-2.yml index ae88402721..c268ef62ce 100644 --- a/.github/workflows/test-integrations-web-2.yml +++ b/.github/workflows/test-integrations-web-2.yml @@ -29,7 +29,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["2.5","2.7","3.5","3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"] + python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"] # python3.6 reached EOL and is no longer being supported on # new versions of hosted runners on Github Actions # ubuntu-20.04 is the last version that supported python3.6 diff --git a/scripts/populate_tox/populate_tox.py b/scripts/populate_tox/populate_tox.py index 180b003d31..d6c52448fe 100644 --- a/scripts/populate_tox/populate_tox.py +++ b/scripts/populate_tox/populate_tox.py @@ -245,6 +245,12 @@ def pick_releases_to_test(releases: list[Version]) -> list[Version]: def pick_python_versions_to_test(python_versions: list[Version]) -> list[Version]: + python_versions = [ + version + for version in python_versions + if version >= LOWEST_SUPPORTED_PYTHON_VERSION + ] + if not python_versions: return [] diff --git a/tox.ini b/tox.ini index e98c2cab8d..6294f3546c 100644 --- a/tox.ini +++ b/tox.ini @@ -64,49 +64,49 @@ envlist = {py3.8,py3.13}-huggingface_hub-v0.27.1 # ~~~ AWS ~~~ - {py3.5,py3.8}-aws_lambda-v2.0.1 - {py3.5,py3.8}-aws_lambda-v2.1.3 + {py3.6,py3.8}-aws_lambda-v2.0.1 + {py3.6,py3.8}-aws_lambda-v2.1.3 # ~~~ Cloud ~~~ - {py2.7,py3.7}-boto3-v1.11.9 - {py2.7,py3.8}-boto3-v1.17.112 + {py3.6,py3.7}-boto3-v1.11.9 + {py3.6,py3.8}-boto3-v1.17.112 {py3.7,py3.11}-boto3-v1.24.96 {py3.8,py3.13}-boto3-v1.35.94 - {py2.7,py3.8}-chalice-v1.13.1 - {py2.7,py3.8}-chalice-v1.19.0 + {py3.6,py3.8}-chalice-v1.13.1 + {py3.6,py3.8}-chalice-v1.19.0 {py3.6,py3.8}-chalice-v1.25.0 {py3.8,py3.12}-chalice-v1.31.3 # ~~~ DBs ~~~ - {py3.5,py3.7}-asyncpg-v0.20.1 - {py3.5,py3.9}-asyncpg-v0.23.0 + {py3.6,py3.7}-asyncpg-v0.20.1 + {py3.6,py3.9}-asyncpg-v0.23.0 {py3.6,py3.10}-asyncpg-v0.26.0 {py3.8,py3.12}-asyncpg-v0.30.0 - {py2.7,py3.9}-clickhouse-driver-v0.1.5 + {py3.6,py3.9}-clickhouse-driver-v0.1.5 {py3.7,py3.12}-clickhouse-driver-v0.2.9 - {py2.7,py3.9}-pymongo-v3.11.4 + {py3.6,py3.9}-pymongo-v3.11.4 {py3.6,py3.10}-pymongo-v4.1.1 {py3.7,py3.12}-pymongo-v4.5.0 {py3.8,py3.13}-pymongo-v4.10.1 - {py2.7,py3.8}-redis-v3.4.1 + {py3.6,py3.8}-redis-v3.4.1 {py3.6,py3.10}-redis-v4.2.2 {py3.7,py3.11}-redis-v4.6.0 {py3.8,py3.12}-redis-v5.2.1 - {py2.7,py3.8}-redis-py-cluster-legacy-v2.1.3 + {py3.6,py3.8}-redis-py-cluster-legacy-v2.1.3 - {py2.7,py3.9}-sqlalchemy-v1.3.24 - {py2.7,py3.9}-sqlalchemy-v1.4.9 - {py2.7,py3.12}-sqlalchemy-v1.4.54 + {py3.6,py3.9}-sqlalchemy-v1.3.24 + {py3.6,py3.9}-sqlalchemy-v1.4.9 + {py3.6,py3.12}-sqlalchemy-v1.4.54 {py3.7,py3.13}-sqlalchemy-v2.0.36 # ~~~ Flags ~~~ - {py2.7,py3.7}-launchdarkly-v6.12.2 - {py3.5,py3.10}-launchdarkly-v7.5.1 + {py3.6,py3.7}-launchdarkly-v6.12.2 + {py3.6,py3.10}-launchdarkly-v7.5.1 {py3.8,py3.12}-launchdarkly-v9.1.0 {py3.8,py3.13}-launchdarkly-v9.9.0 @@ -115,7 +115,7 @@ envlist = {py3.8,py3.13}-openfeature-v0.4.2 {py3.8,py3.13}-openfeature-v0.7.4 - {py3.5,py3.8}-unleash-v3.5.1 + {py3.6,py3.8}-unleash-v3.5.1 {py3.6,py3.9}-unleash-v5.0.1 {py3.7,py3.11}-unleash-v5.7.1 {py3.8,py3.13}-unleash-v6.0.1 @@ -126,12 +126,12 @@ envlist = {py3.8,py3.11}-ariadne-v0.20.1 {py3.8,py3.12}-ariadne-v0.24.0 - {py2.7,py3.8}-gql-v0.3.0 - {py2.7,py3.8}-gql-v2.0.0 + {py3.6,py3.8}-gql-v0.3.0 + {py3.6,py3.8}-gql-v2.0.0 {py3.6,py3.10}-gql-v3.2.0 {py3.7,py3.12}-gql-v3.5.0 - {py2.7,py3.7}-graphene-v2.1.9 + {py3.6,py3.7}-graphene-v2.1.9 {py3.6,py3.10}-graphene-v3.1.1 {py3.6,py3.10}-graphene-v3.3 {py3.8,py3.13}-graphene-v3.4.3 @@ -142,8 +142,8 @@ envlist = {py3.9,py3.13}-strawberry-v0.256.1 # ~~~ Network ~~~ - {py2.7,py3.8}-grpc-v1.27.2 - {py3.5,py3.10}-grpc-v1.41.1 + {py3.6,py3.8}-grpc-v1.27.2 + {py3.6,py3.10}-grpc-v1.41.1 {py3.7,py3.11}-grpc-v1.55.3 {py3.8,py3.13}-grpc-v1.69.0 @@ -152,8 +152,8 @@ envlist = {py3.7,py3.11}-httpx-v0.23.3 {py3.8,py3.12}-httpx-v0.28.1 - {py2.7,py3.8}-requests-v2.23.0 - {py2.7,py3.9}-requests-v2.26.0 + {py3.6,py3.8}-requests-v2.23.0 + {py3.6,py3.9}-requests-v2.26.0 {py3.7,py3.11}-requests-v2.29.0 {py3.8,py3.12}-requests-v2.32.3 @@ -163,47 +163,46 @@ envlist = {py3.7,py3.11}-arq-v0.24.0 {py3.8,py3.12}-arq-v0.26.3 - {py2.7,py3.7}-beam-v2.18.0 + {py3.6,py3.7}-beam-v2.18.0 {py3.6,py3.8}-beam-v2.32.0 {py3.7,py3.10}-beam-v2.46.0 {py3.9,py3.12}-beam-v2.61.0 - {py2.7,py3.7}-celery-v4.3.1 + {py3.6,py3.7}-celery-v4.3.1 {py3.6,py3.8}-celery-v5.0.6 {py3.7,py3.10}-celery-v5.2.7 {py3.8,py3.12}-celery-v5.4.0 - {py3.5,py3.7}-dramatiq-v1.8.1 - {py3.5,py3.9}-dramatiq-v1.11.0 + {py3.6,py3.7}-dramatiq-v1.8.1 + {py3.6,py3.9}-dramatiq-v1.11.0 {py3.7,py3.11}-dramatiq-v1.14.2 {py3.8,py3.13}-dramatiq-v1.17.1 - {py2.7,py3.7}-huey-v2.2.0 - {py2.7,py3.7}-huey-v2.3.2 - {py2.7,py3.11}-huey-v2.4.5 - {py2.7,py3.12}-huey-v2.5.2 + {py3.6,py3.7}-huey-v2.2.0 + {py3.6,py3.7}-huey-v2.3.2 + {py3.6,py3.11}-huey-v2.4.5 + {py3.6,py3.12}-huey-v2.5.2 {py3.6,py3.9}-ray-v1.13.0 {py3.8,py3.11}-ray-v2.20.0 {py3.9,py3.12}-ray-v2.40.0 - {py2.7,py3.8}-rq-v1.2.2 - {py3.5,py3.8}-rq-v1.7.0 - {py3.5,py3.9}-rq-v1.12.0 + {py3.6,py3.8}-rq-v1.2.2 + {py3.6,py3.8}-rq-v1.7.0 + {py3.6,py3.9}-rq-v1.12.0 {py3.8,py3.12}-rq-v2.1.0 - {py2.7,py3.7}-spark-v2.4.8 + {py3.6,py3.7}-spark-v2.4.8 {py3.6,py3.9}-spark-v3.1.3 {py3.7,py3.10}-spark-v3.3.4 {py3.8,py3.11}-spark-v3.5.4 # ~~~ Web 1 ~~~ - {py2.7,py3.7}-django-v1.11.29 + {py3.6,py3.7}-django-v1.11.29 {py3.6,py3.9}-django-v3.1.14 {py3.8,py3.11}-django-v4.1.9 {py3.10,py3.13}-django-v5.1.4 - {py2.6,py3.5}-flask-v0.12.5 {py3.6,py3.13}-flask-v2.0.3 {py3.7,py3.13}-flask-v2.2.5 {py3.9,py3.13}-flask-v3.1.0 @@ -219,16 +218,16 @@ envlist = {py3.8,py3.12}-fastapi-v0.115.6 # ~~~ Web 2 ~~~ - {py3.5,py3.7}-aiohttp-v3.6.3 + {py3.6,py3.7}-aiohttp-v3.6.3 {py3.6,py3.10}-aiohttp-v3.8.6 {py3.8,py3.13}-aiohttp-v3.10.9 {py3.9,py3.13}-aiohttp-v3.11.11 - {py2.5,py3.7}-bottle-v0.12.25 - {py2.7,py3.9}-bottle-v0.13.2 + {py3.6,py3.7}-bottle-v0.12.25 + {py3.6,py3.9}-bottle-v0.13.2 - {py3.5,py3.9}-falcon-v3.0.1 - {py3.5,py3.12}-falcon-v3.1.3 + {py3.6,py3.9}-falcon-v3.0.1 + {py3.6,py3.12}-falcon-v3.1.3 {py3.8,py3.13}-falcon-v4.0.2 {py3.8,py3.11}-litestar-v2.0.1 @@ -236,7 +235,7 @@ envlist = {py3.8,py3.12}-litestar-v2.8.3 {py3.8,py3.12}-litestar-v2.13.0 - {py2.7,py3.9}-pyramid-v1.10.8 + {py3.6,py3.9}-pyramid-v1.10.8 {py3.6,py3.11}-pyramid-v2.0.2 {py3.7,py3.8}-quart-v0.11.5 @@ -254,21 +253,21 @@ envlist = {py3.7,py3.11}-starlite-v1.32.0 {py3.8,py3.12}-starlite-v1.51.16 - {py3.5,py3.8}-tornado-v6.0.4 - {py3.5,py3.9}-tornado-v6.1 + {py3.6,py3.8}-tornado-v6.0.4 + {py3.6,py3.9}-tornado-v6.1 {py3.7,py3.10}-tornado-v6.2 {py3.8,py3.11}-tornado-v6.4.2 # ~~~ Misc ~~~ - {py3.5,py3.8}-loguru-v0.4.1 - {py3.5,py3.8}-loguru-v0.5.3 - {py3.5,py3.10}-loguru-v0.6.0 - {py3.5,py3.13}-loguru-v0.7.3 + {py3.6,py3.8}-loguru-v0.4.1 + {py3.6,py3.8}-loguru-v0.5.3 + {py3.6,py3.10}-loguru-v0.6.0 + {py3.6,py3.13}-loguru-v0.7.3 - {py3.5,py3.9}-pure_eval-v0.1.1 + {py3.6,py3.9}-pure_eval-v0.1.1 {py3.7,py3.13}-pure_eval-v0.2.3 - {py3.4,py3.7}-trytond-v5.0.63 + {py3.6,py3.7}-trytond-v5.0.63 {py3.6,py3.8}-trytond-v5.8.16 {py3.7,py3.10}-trytond-v6.6.9 {py3.8,py3.12}-trytond-v7.4.3 @@ -536,7 +535,6 @@ deps = django: six django: werkzeug - flask-v0.12.5: flask==0.12.5 flask-v2.0.3: flask==2.0.3 flask-v2.2.5: flask==2.2.5 flask-v3.1.0: flask==3.1.0