Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(ci): pin importlib_metadata<5.0.0 #4257

Merged
merged 13 commits into from
Oct 6, 2022
Merged

fix(ci): pin importlib_metadata<5.0.0 #4257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c16f583
fix(ci): pin importlib_metadata<5.0.0
majorgreys Oct 3, 2022
0e396e0
Merge branch '1.x' into majorgreys/ci-pin-importlib
Kyle-Verhoog Oct 3, 2022
d2bd83c
Merge branch '1.x' into majorgreys/ci-pin-importlib
mergify[bot] Oct 3, 2022
d206fa4
Merge branch '1.x' into majorgreys/ci-pin-importlib
mergify[bot] Oct 3, 2022
c2f0c08
Merge branch '1.x' into majorgreys/ci-pin-importlib
mergify[bot] Oct 3, 2022
58f1f0b
Merge branch '1.x' into majorgreys/ci-pin-importlib
mergify[bot] Oct 4, 2022
d4583bd
Merge branch '1.x' into majorgreys/ci-pin-importlib
mergify[bot] Oct 4, 2022
9a00bfa
Merge branch '1.x' into majorgreys/ci-pin-importlib
mergify[bot] Oct 4, 2022
785976d
Merge branch '1.x' into majorgreys/ci-pin-importlib
majorgreys Oct 5, 2022
5edda43
use simpler version
majorgreys Oct 5, 2022
6441d7d
update circleci windows orb
majorgreys Oct 5, 2022
1830fc6
remove pin from library and add pin to kombu tests
majorgreys Oct 5, 2022
50d4619
Update .circleci/config.yml
majorgreys Oct 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ vertica_image: &vertica_image sumitchawla/vertica:latest
rabbitmq_image: &rabbitmq_image rabbitmq:3.7-alpine

orbs:
win: circleci/windows@4.1
win: circleci/windows@5.0

machine_executor: &machine_executor
machine:
Expand Down Expand Up @@ -438,7 +438,7 @@ jobs:
name: win/default
shell: bash.exe
steps:
- run: choco install python --version=3.5.4
- run: choco install -y python --version=3.5.4 --side-by-side
- run_tox_scenario:
store_coverage: false
pattern: '^py35-profile'
Expand All @@ -448,7 +448,7 @@ jobs:
name: win/default
shell: bash.exe
steps:
- run: choco install python --version=3.6.8
- run: choco install -y python --version=3.6.8 --side-by-side
- run_tox_scenario:
store_coverage: false
pattern: '^py36-profile'
Expand All @@ -469,7 +469,7 @@ jobs:
name: win/default
shell: bash.exe
steps:
- run: choco install python --version=3.8.10
- run: choco install -y python --version=3.8.10 --side-by-side
- run_tox_scenario:
store_coverage: false
pattern: '^py38-profile'
Expand All @@ -479,7 +479,7 @@ jobs:
name: win/default
shell: bash.exe
steps:
- run: choco install python --version=3.9.12
- run: choco install -y python --version=3.9.12 --side-by-side
- run_tox_scenario:
store_coverage: false
pattern: '^py39-profile'
Expand All @@ -489,7 +489,7 @@ jobs:
name: win/default
shell: bash.exe
steps:
- run: choco install python --version=3.10.4
# circleci/windows@5.0 orb includes python 3.10.6
- run_tox_scenario:
store_coverage: false
pattern: '^py310-profile'
Expand Down
38 changes: 36 additions & 2 deletions riotfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,7 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
],
"redis": "~=2.10.6",
"kombu": "~=4.3.0",
"importlib_metadata": "<5.0", # kombu using deprecated shims removed in importlib-metadata>=5.0
},
),
# Celery 4.2 is now limited to Kombu 4.3
Expand All @@ -426,11 +427,27 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
"celery": "~=4.2.2",
"redis": "~=2.10.6",
"kombu": "~=4.3.0",
"importlib_metadata": "<5.0", # kombu using deprecated shims removed in importlib_metadata 5.0
},
),
# Celery 4.3 wants Kombu >= 4.4 and Redis >= 3.2
# Split into <3.8 and >=3.8 to pin importlib_metadata dependency for kombu
Venv(
pys=select_pys(max_version="3.9"),
pys=select_pys(max_version="3.7"),
pkgs={
"pytest": "~=3.10",
"celery": [
"~=4.3.1",
"~=4.4.7",
"~=4.4", # most recent 4.x
],
"redis": "~=3.5",
"kombu": "~=4.4",
"importlib_metadata": "<5.0", # kombu using deprecated shims removed in importlib_metadata 5.0
},
),
Venv(
pys=select_pys(min_version="3.8", max_version="3.9"),
pkgs={
"pytest": "~=3.10",
"celery": [
Expand All @@ -443,8 +460,25 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
},
),
# Celery 5.x wants Python 3.6+
# Split into <3.8 and >=3.8 to pin importlib_metadata dependency for kombu
Venv(
pys=select_pys(min_version="3.6"),
pys=select_pys(min_version="3.6", max_version="3.7"),
env={
# https://docs.celeryproject.org/en/v5.0.5/userguide/testing.html#enabling
"PYTEST_PLUGINS": "celery.contrib.pytest",
},
pkgs={
"celery": [
"~=5.0.5",
"~=5.0", # most recent 5.x
latest,
],
"redis": "~=3.5",
"importlib_metadata": "<5.0", # kombu using deprecated shims removed in importlib_metadata 5.0
},
),
Venv(
pys=select_pys(min_version="3.8"),
env={
# https://docs.celeryproject.org/en/v5.0.5/userguide/testing.html#enabling
"PYTEST_PLUGINS": "celery.contrib.pytest",
Expand Down
2 changes: 2 additions & 0 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,8 @@ deps =
gevent2012: gevent>=20.12,<20.13
gevent211: gevent>=21.1,<21.2
gevent218: gevent>=21.8,<21.9
# kombu using deprecated shims removed in importlib-metadata 5.0
kombu{40,41,42,43,44,45,46,}: importlib_metadata<5.0; python_version<'3.8'
kombu: kombu
kombu40: kombu>=4.0,<4.1
kombu41: kombu>=4.1,<4.2
Expand Down