Skip to content

Commit

Permalink
chore(ci): hot fix for CI [backport 2.10] (#9637)
Browse files Browse the repository at this point in the history
Backport 48df6fa from #9629 to 2.10.


- fix CircleCI workflow
- fix `django` and `celery` test suite

For celery, one venv is currently skipped as there is no possible
solution due to a pip bug

Does not fix `profile` and `tornado` suites.

## 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] Risks are described (performance impact, potential for breakage,
maintainability)
- [x] Change is maintainable (easy to change, telemetry, documentation)
- [x] [Library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
are followed or label `changelog/no-changelog` is set
- [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))
- [x] If this PR changes the public interface, I've notified
`@DataDog/apm-tees`.

## Reviewer Checklist

- [x] Title is accurate
- [x] All changes are related to the pull request's stated goal
- [x] Description motivates each change
- [x] Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes
- [x] Testing strategy adequately addresses listed risks
- [x] Change is maintainable (easy to change, telemetry, documentation)
- [x] Release note makes sense to a user of the library
- [x] Author has 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)

Co-authored-by: Christophe Papazian <[email protected]>
  • Loading branch information
romainkomorndatadog and christophe-papazian authored Jun 26, 2024
1 parent 0ea5fd2 commit e7796c2
Show file tree
Hide file tree
Showing 13 changed files with 236 additions and 286 deletions.
13 changes: 9 additions & 4 deletions .circleci/config.templ.yml
Original file line number Diff line number Diff line change
Expand Up @@ -486,11 +486,16 @@ jobs:

appsec_iast_packages:
<<: *machine_executor
parallelism: 10
parallelism: 5
steps:
- run_test:
pattern: 'appsec_iast_packages'
snapshot: true
- when:
condition:
matches: { pattern: "main", value: << pipeline.git.branch >> }
steps:
- run_test:
pattern: 'appsec_iast_packages'
snapshot: true
- run: echo "This test is skipped outside of main branch"

appsec_integrations:
<<: *machine_executor
Expand Down
33 changes: 0 additions & 33 deletions .riot/requirements/10d81a7.txt

This file was deleted.

53 changes: 0 additions & 53 deletions .riot/requirements/126a701.txt

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
# This file is autogenerated by pip-compile with Python 3.7
# by the following command:
#
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/11d2116.in
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/1cb9194.in
#
amqp==2.6.1
atomicwrites==1.4.1
attrs==23.2.0
billiard==3.6.4.0
celery==4.4.7
coverage[toml]==7.2.7
exceptiongroup==1.2.0
exceptiongroup==1.2.1
hypothesis==6.45.0
importlib-metadata==4.13.0
kombu==4.6.11
Expand Down
52 changes: 52 additions & 0 deletions .riot/requirements/1e147db.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
#
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile --no-annotate .riot/requirements/1e147db.in
#
amqp==5.2.0
attrs==23.2.0
billiard==4.2.0
celery==5.4.0
certifi==2024.6.2
charset-normalizer==3.3.2
click==8.1.7
click-didyoumean==0.3.1
click-plugins==1.1.1
click-repl==0.3.0
coverage[toml]==7.5.4
django==2.2.1
exceptiongroup==1.2.1
gevent==24.2.1
greenlet==3.0.3
hypothesis==6.45.0
idna==3.7
iniconfig==2.0.0
kombu==5.3.7
mock==5.1.0
opentracing==2.4.0
packaging==24.1
pluggy==1.5.0
prompt-toolkit==3.0.47
pytest==8.2.2
pytest-cov==5.0.0
pytest-mock==3.14.0
pytest-randomly==3.15.0
python-dateutil==2.9.0.post0
pytz==2024.1
requests==2.32.3
six==1.16.0
sortedcontainers==2.4.0
sqlalchemy==1.2.19
sqlparse==0.5.0
tomli==2.0.1
typing-extensions==4.12.2
tzdata==2024.1
urllib3==2.2.2
vine==5.1.0
wcwidth==0.2.13
zope-event==5.0
zope-interface==6.4.post2

# The following packages are considered to be unsafe in a requirements file:
# setuptools
33 changes: 0 additions & 33 deletions .riot/requirements/2ca9efa.txt

This file was deleted.

51 changes: 0 additions & 51 deletions .riot/requirements/54aeb0a.txt

This file was deleted.

54 changes: 54 additions & 0 deletions .riot/requirements/97ea583.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
#
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# pip-compile --no-annotate .riot/requirements/97ea583.in
#
amqp==5.2.0
attrs==23.2.0
billiard==4.2.0
celery==5.4.0
certifi==2024.6.2
charset-normalizer==3.3.2
click==8.1.7
click-didyoumean==0.3.1
click-plugins==1.1.1
click-repl==0.3.0
coverage[toml]==7.5.4
django==2.2.1
exceptiongroup==1.2.1
gevent==24.2.1
greenlet==3.0.3
hypothesis==6.45.0
idna==3.7
importlib-metadata==7.2.1
iniconfig==2.0.0
kombu==5.3.7
mock==5.1.0
opentracing==2.4.0
packaging==24.1
pluggy==1.5.0
prompt-toolkit==3.0.47
pytest==8.2.2
pytest-cov==5.0.0
pytest-mock==3.14.0
pytest-randomly==3.15.0
python-dateutil==2.9.0.post0
pytz==2024.1
requests==2.32.3
six==1.16.0
sortedcontainers==2.4.0
sqlalchemy==1.2.19
sqlparse==0.5.0
tomli==2.0.1
typing-extensions==4.12.2
tzdata==2024.1
urllib3==2.2.2
vine==5.1.0
wcwidth==0.2.13
zipp==3.19.2
zope-event==5.0
zope-interface==6.4.post2

# The following packages are considered to be unsafe in a requirements file:
# setuptools
50 changes: 50 additions & 0 deletions .riot/requirements/b416620.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
#
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile --no-annotate .riot/requirements/b416620.in
#
amqp==5.2.0
attrs==23.2.0
billiard==4.2.0
celery==5.4.0
certifi==2024.6.2
charset-normalizer==3.3.2
click==8.1.7
click-didyoumean==0.3.1
click-plugins==1.1.1
click-repl==0.3.0
coverage[toml]==7.5.4
django==2.2.1
gevent==24.2.1
greenlet==3.0.3
hypothesis==6.45.0
idna==3.7
iniconfig==2.0.0
kombu==5.3.7
mock==5.1.0
opentracing==2.4.0
packaging==24.1
pluggy==1.5.0
prompt-toolkit==3.0.47
pytest==8.2.2
pytest-cov==5.0.0
pytest-mock==3.14.0
pytest-randomly==3.15.0
python-dateutil==2.9.0.post0
pytz==2024.1
requests==2.32.3
six==1.16.0
sortedcontainers==2.4.0
sqlalchemy==1.2.19
sqlparse==0.5.0
typing-extensions==4.12.2
tzdata==2024.1
urllib3==2.2.2
vine==5.1.0
wcwidth==0.2.13
zope-event==5.0
zope-interface==6.4.post2

# The following packages are considered to be unsafe in a requirements file:
# setuptools
Loading

0 comments on commit e7796c2

Please sign in to comment.