Skip to content

Commit

Permalink
fix(ci): add exceptiongroup as test dependency (#6302)
Browse files Browse the repository at this point in the history
This PR fixes issues on the 1.x pipeline as a follow up for #6253 since
`exceptiongroup` will cause an import error when testing latest on the
nightly 1.x branch. The fix is to add `exceptiongroup:latest` as an
explicit riot test venv dependency, compared to only adding
`exceptiongroup==1.1.2` on the riot lockfiles from #6253.

## Checklist

- [x] Change(s) are motivated and described in the PR description.
- [x] Testing strategy is described if automated tests are not included
in the PR.
- [x] Risk is outlined (performance impact, potential for breakage,
maintainability, etc).
- [x] Change is maintainable (easy to change, telemetry, documentation).
- [x] [Library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
are followed. If no release note is required, add label
`changelog/no-changelog`.
- [x] Documentation is included (in-code, generated user docs, [public
corp docs](https://github.com/DataDog/documentation/)).
- [x] Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))

## Reviewer Checklist

- [x] Title is accurate.
- [x] No unnecessary changes are introduced.
- [x] Description motivates each change.
- [x] Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes unless absolutely necessary.
- [x] Testing strategy adequately addresses listed risk(s).
- [x] Change is maintainable (easy to change, telemetry, documentation).
- [x] Release note makes sense to a user of the library.
- [x] Reviewer has explicitly acknowledged and discussed the performance
implications of this PR as reported in the benchmarks PR comment.
- [x] Backport labels are set in a manner that is consistent with the
[release branch maintenance
policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)
  • Loading branch information
Yun-Kim authored Jul 7, 2023
1 parent 7e897f2 commit 6c22020
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 23 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,31 @@
# This file is autogenerated by pip-compile with Python 3.7
# by the following command:
#
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/b7ac594.in
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/134a271.in
#
amqp==2.6.1
atomicwrites==1.4.1
attrs==22.2.0
attrs==23.1.0
billiard==3.6.4.0
celery==4.4.7
coverage==7.2.2
coverage==7.2.7
exceptiongroup==1.1.2
hypothesis==6.45.0
importlib-metadata==4.13.0
kombu==4.6.11
mock==5.0.1
mock==5.0.2
more-itertools==8.10.0
opentracing==2.4.0
pluggy==1.0.0
pluggy==1.2.0
py==1.11.0
pytest==3.10.1
pytest-cov==2.3.0
pytest-mock==2.0.0
pytz==2022.7.1
pytz==2023.3
redis==3.5.3
six==1.16.0
sortedcontainers==2.4.0
typing-extensions==4.7.0
typing-extensions==4.7.1
vine==1.3.0
zipp==3.15.0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/8f570cd.in
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/1d1d033.in
#
atomicwrites==1.4.1
attrs==23.1.0
blinker==1.6.2
click==8.1.3
coverage==7.2.5
click==8.1.4
coverage==7.2.7
exceptiongroup==1.1.2
flask==0.12.5
flask-cache==0.13.1
Expand All @@ -19,7 +19,7 @@ markupsafe==1.1.1
mock==5.0.2
more-itertools==8.10.0
opentracing==2.4.0
pluggy==1.0.0
pluggy==1.2.0
py==1.11.0
pytest==3.10.1
pytest-cov==2.1.0
Expand Down
12 changes: 6 additions & 6 deletions .riot/requirements/1d67674.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@
# This file is autogenerated by pip-compile with Python 3.7
# by the following command:
#
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/1d67674.in
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/1d67674.in
#
atomicwrites==1.4.1
attrs==23.1.0
blinker==1.6.2
click==8.1.3
coverage==7.2.5
click==8.1.4
coverage==7.2.7
flask==0.12.5
flask-cache==0.13.1
hypothesis==6.45.0
importlib-metadata==6.6.0
importlib-metadata==6.7.0
itsdangerous==1.1.0
jinja2==2.11.3
markupsafe==1.1.1
mock==5.0.2
more-itertools==8.10.0
opentracing==2.4.0
pluggy==1.0.0
pluggy==1.2.0
py==1.11.0
pytest==3.10.1
pytest-cov==2.1.0
Expand All @@ -28,7 +28,7 @@ python-memcached==1.59
redis==2.10.6
six==1.16.0
sortedcontainers==2.4.0
typing-extensions==4.7.0
typing-extensions==4.7.1
werkzeug==0.16.1
zipp==3.15.0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/11ee002.in
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/30d8755.in
#
atomicwrites==1.4.1
attrs==23.1.0
blinker==1.6.2
click==8.1.3
coverage==7.2.5
click==8.1.4
coverage==7.2.7
exceptiongroup==1.1.2
flask==0.12.5
flask-cache==0.13.1
Expand All @@ -19,7 +19,7 @@ markupsafe==1.1.1
mock==5.0.2
more-itertools==8.10.0
opentracing==2.4.0
pluggy==1.0.0
pluggy==1.2.0
py==1.11.0
pytest==3.10.1
pytest-cov==2.1.0
Expand Down
11 changes: 9 additions & 2 deletions riotfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,6 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
# Split into <3.8 and >=3.8 to pin importlib_metadata dependency for kombu
Venv(
# celery dropped support for Python 2.7/3.5 in 5.0
pys=select_pys(max_version="3.7"),
pkgs={
"pytest": "~=3.10",
"celery": [
Expand All @@ -662,6 +661,11 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
"pytest-cov": "==2.3.0",
"pytest-mock": "==2.0.0",
},
venvs=[
Venv(pys=select_pys(max_version="3.6")),
# exceptiongroup latest specified to avoid riot bug: https://github.com/DataDog/riot/issues/211
Venv(pys="3.7", pkgs={"exceptiongroup": latest}),
],
),
Venv(
# celery added support for Python 3.9 in 4.x
Expand Down Expand Up @@ -1155,7 +1159,6 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
},
venvs=[
Venv(
pys=select_pys(max_version="3.9"),
pkgs={
"flask": "~=0.12.0",
"Werkzeug": ["<1.0"],
Expand All @@ -1173,6 +1176,10 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
# DEV: Breaking change made in 2.1.0 release
"markupsafe": "<2.0",
},
venvs=[
Venv(pys=select_pys(max_version="3.7")),
Venv(pys=select_pys(min_version="3.8", max_version="3.9"), pkgs={"exceptiongroup": latest}),
],
),
Venv(
# flask-caching dropped support for Python 3.5 in 1.8
Expand Down

0 comments on commit 6c22020

Please sign in to comment.