Skip to content

Commit

Permalink
Merge branch '2.19' into backport-11843-to-2.19
Browse files Browse the repository at this point in the history
  • Loading branch information
mabdinur authored Jan 16, 2025
2 parents 53bb2a7 + e16d68c commit 8e5bf1d
Show file tree
Hide file tree
Showing 247 changed files with 2,983 additions and 2,634 deletions.
117 changes: 0 additions & 117 deletions .github/workflows/test_frameworks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,68 +111,6 @@ jobs:
if: needs.needs-run.outputs.outcome == 'success'
run: cat debugger-expl.txt

sanic-testsuite:
strategy:
matrix:
include:
# TODO: profiling fails with a timeout error
#- suffix: Profiling
# profiling: 1
# iast: 0
# appsec: 0
- suffix: IAST
profiling: 0
iast: 1
appsec: 0
- suffix: APPSEC
profiling: 0
iast: 0
appsec: 1
- suffix: Tracer only
profiling: 0
iast: 0
appsec: 0
name: Sanic 24.6 (with ${{ matrix.suffix }})
runs-on: ubuntu-20.04
needs: needs-run
timeout-minutes: 15
env:
DD_PROFILING_ENABLED: ${{ matrix.profiling }}
DD_IAST_ENABLED: ${{ matrix.iast }}
DD_APPSEC_ENABLED: ${{ matrix.appsec }}
DD_TESTING_RAISE: true
CMAKE_BUILD_PARALLEL_LEVEL: 12
DD_DEBUGGER_EXPL_OUTPUT_FILE: debugger-expl.txt
defaults:
run:
working-directory: sanic
steps:
- uses: actions/checkout@v4
if: needs.needs-run.outputs.outcome == 'success'
with:
persist-credentials: false
path: ddtrace
- uses: actions/checkout@v4
if: needs.needs-run.outputs.outcome == 'success'
with:
persist-credentials: false
repository: sanic-org/sanic
ref: v24.6.0
path: sanic
- uses: actions/setup-python@v5
if: needs.needs-run.outputs.outcome == 'success'
with:
python-version: "3.11"
- name: Install sanic and dependencies required to run tests
if: needs.needs-run.outputs.outcome == 'success'
run: pip3 install '.[test]' aioquic
- name: Install ddtrace
if: needs.needs-run.outputs.outcome == 'success'
run: pip3 install ../ddtrace
- name: Run tests
if: needs.needs-run.outputs.outcome == 'success'
run: ddtrace-run pytest -k "not test_reloader and not test_reload_listeners and not test_no_exceptions_when_cancel_pending_request and not test_add_signal and not test_ode_removes and not test_skip_touchup and not test_dispatch_signal_triggers and not test_keep_alive_connection_context and not test_redirect_with_params and not test_keep_alive_client_timeout and not test_logger_vhosts and not test_ssl_in_multiprocess_mode"

django-testsuite:
strategy:
matrix:
Expand Down Expand Up @@ -963,58 +901,3 @@ jobs:
- name: Debugger exploration results
if: needs.needs-run.outputs.outcome == 'success'
run: cat debugger-expl.txt

beautifulsoup-testsuite-4_12_3:
strategy:
matrix:
include:
# TODO: profiling is disabled due to a bug in the profiler paths
# - suffix: Profiling
# profiling: 1
# iast: 0
# appsec: 0
- suffix: IAST
profiling: 0
iast: 1
appsec: 0
- suffix: APPSEC
profiling: 0
iast: 0
appsec: 1
- suffix: Tracer only
profiling: 0
iast: 0
appsec: 0
name: Beautifulsoup 4.12.3 (with ${{ matrix.suffix }})
runs-on: "ubuntu-latest"
needs: needs-run
env:
DD_TESTING_RAISE: true
DD_PROFILING_ENABLED: ${{ matrix.profiling }}
DD_IAST_ENABLED: ${{ matrix.iast }}
DD_APPSEC_ENABLED: ${{ matrix.appsec }}
CMAKE_BUILD_PARALLEL_LEVEL: 12
DD_DEBUGGER_EXPL_OUTPUT_FILE: debugger-expl.txt
steps:
- uses: actions/setup-python@v5
if: needs.needs-run.outputs.outcome == 'success'
with:
python-version: '3.9'
- uses: actions/checkout@v4
if: needs.needs-run.outputs.outcome == 'success'
with:
persist-credentials: false
path: ddtrace
- name: Checkout beautifulsoup
if: needs.needs-run.outputs.outcome == 'success'
run: |
git clone -b 4.12.3 https://git.launchpad.net/beautifulsoup
- name: Install ddtrace
if: needs.needs-run.outputs.outcome == 'success'
run: pip3 install ./ddtrace
- name: Pytest fix
if: needs.needs-run.outputs.outcome == 'success'
run: pip install pytest==8.2.1
- name: Run tests
if: needs.needs-run.outputs.outcome == 'success'
run: cd beautifulsoup && ddtrace-run pytest
18 changes: 9 additions & 9 deletions .riot/requirements/1053dce.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@
#
# pip-compile --allow-unsafe --no-annotate .riot/requirements/1053dce.in
#
attrs==24.2.0
coverage[toml]==7.6.1
gevent==24.2.1
attrs==24.3.0
coverage[toml]==7.6.10
gevent==24.11.1
greenlet==3.1.1
hypothesis==6.45.0
iniconfig==2.0.0
mock==5.1.0
opentracing==2.4.0
packaging==24.1
packaging==24.2
pluggy==1.5.0
pytest==8.3.3
pytest-cov==5.0.0
pytest==8.3.4
pytest-cov==6.0.0
pytest-mock==3.14.0
pytest-randomly==3.15.0
pytest-randomly==3.16.0
sortedcontainers==2.4.0
zope-event==5.0
zope-interface==7.0.3
zope-interface==7.2

# The following packages are considered to be unsafe in a requirements file:
setuptools==75.1.0
setuptools==75.7.0
22 changes: 11 additions & 11 deletions .riot/requirements/1092157.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,27 @@
#
# pip-compile --allow-unsafe --no-annotate .riot/requirements/1092157.in
#
attrs==23.2.0
coverage[toml]==7.6.0
gevent==24.2.1
greenlet==3.0.3
attrs==24.3.0
coverage[toml]==7.6.10
gevent==24.11.1
greenlet==3.1.1
httpretty==1.1.4
hypothesis==6.45.0
iniconfig==2.0.0
mock==5.1.0
opentracing==2.4.0
packaging==24.1
packaging==24.2
pluggy==1.5.0
pyfakefs==5.6.0
pytest==8.3.1
pyfakefs==5.7.3
pytest==8.3.4
pytest-asyncio==0.23.8
pytest-cov==5.0.0
pytest-cov==6.0.0
pytest-mock==3.14.0
pytest-randomly==3.15.0
pytest-randomly==3.16.0
python-json-logger==2.0.7
sortedcontainers==2.4.0
zope-event==5.0
zope-interface==6.4.post2
zope-interface==7.2

# The following packages are considered to be unsafe in a requirements file:
setuptools==71.1.0
setuptools==75.7.0
68 changes: 35 additions & 33 deletions .riot/requirements/d57247c.txt → .riot/requirements/10f3c55.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,24 @@
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# pip-compile --allow-unsafe --no-annotate .riot/requirements/d57247c.in
# pip-compile --allow-unsafe --no-annotate .riot/requirements/10f3c55.in
#
arrow==1.3.0
asgiref==3.8.1
attrs==24.2.0
attrs==24.3.0
autobahn==24.4.2
automat==24.8.1
bcrypt==4.2.1
blessed==1.20.0
certifi==2024.8.30
cffi==1.17.0
channels==4.1.0
charset-normalizer==3.3.2
certifi==2024.12.14
cffi==1.17.1
channels==4.2.0
charset-normalizer==3.4.0
constantly==23.10.4
coverage[toml]==7.6.1
cryptography==43.0.0
coverage[toml]==7.6.9
cryptography==43.0.3
daphne==4.1.2
django==4.2.15
django==4.2.17
django-configurations==2.5.1
django-picklefield==3.2
django-pylibmc==0.6.1
Expand All @@ -27,50 +28,51 @@ django-redis==4.5.0
exceptiongroup==1.2.2
hyperlink==21.0.0
hypothesis==6.45.0
idna==3.8
importlib-metadata==8.4.0
idna==3.10
importlib-metadata==8.5.0
incremental==24.7.2
iniconfig==2.0.0
isodate==0.6.1
isodate==0.7.2
lxml==5.3.0
mock==5.1.0
opentracing==2.4.0
packaging==24.1
platformdirs==4.2.2
packaging==24.2
platformdirs==4.3.6
pluggy==1.5.0
psycopg2-binary==2.9.9
pyasn1==0.6.0
pyasn1-modules==0.4.0
psycopg==3.2.3
psycopg2-binary==2.9.10
pyasn1==0.6.1
pyasn1-modules==0.4.1
pycparser==2.22
pylibmc==1.6.3
pyopenssl==24.2.1
pytest==8.3.2
pytest-cov==5.0.0
pyopenssl==24.3.0
pytest==8.3.4
pytest-cov==6.0.0
pytest-django[testing]==3.10.0
pytest-mock==3.14.0
pytest-randomly==3.15.0
pytest-randomly==3.16.0
python-dateutil==2.9.0.post0
python-memcached==1.62
pytz==2024.1
pytz==2024.2
redis==2.10.6
requests==2.32.3
requests-file==2.1.0
requests-toolbelt==1.0.0
service-identity==24.1.0
six==1.16.0
service-identity==24.2.0
six==1.17.0
sortedcontainers==2.4.0
spyne==2.14.0
sqlparse==0.5.1
tomli==2.0.1
twisted[tls]==24.7.0
sqlparse==0.5.3
tomli==2.2.1
twisted[tls]==24.11.0
txaio==23.1.1
types-python-dateutil==2.9.0.20240821
types-python-dateutil==2.9.0.20241206
typing-extensions==4.12.2
urllib3==2.2.2
urllib3==2.2.3
wcwidth==0.2.13
zeep==4.2.1
zipp==3.20.1
zope-interface==7.0.3
zeep==4.3.1
zipp==3.21.0
zope-interface==7.2

# The following packages are considered to be unsafe in a requirements file:
setuptools==74.0.0
setuptools==75.6.0
12 changes: 6 additions & 6 deletions .riot/requirements/125c1e6.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#
# pip-compile --allow-unsafe --no-annotate .riot/requirements/125c1e6.in
#
attrs==24.2.0
coverage[toml]==7.6.4
attrs==24.3.0
coverage[toml]==7.6.10
exceptiongroup==1.2.2
gevent==24.11.1
greenlet==3.1.1
Expand All @@ -17,17 +17,17 @@ opentracing==2.4.0
packaging==24.2
pluggy==1.5.0
py-cpuinfo==8.0.0
pytest==8.3.3
pytest==8.3.4
pytest-asyncio==0.21.1
pytest-benchmark==5.1.0
pytest-cov==6.0.0
pytest-mock==3.14.0
pytest-randomly==3.16.0
sortedcontainers==2.4.0
tomli==2.0.2
tomli==2.2.1
uwsgi==2.0.28
zope-event==5.0
zope-interface==7.1.1
zope-interface==7.2

# The following packages are considered to be unsafe in a requirements file:
setuptools==75.3.0
setuptools==75.7.0
32 changes: 16 additions & 16 deletions .riot/requirements/12a25de.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,31 @@
#
# pip-compile --allow-unsafe --no-annotate .riot/requirements/12a25de.in
#
attrs==23.2.0
certifi==2024.7.4
charset-normalizer==3.3.2
coverage[toml]==7.6.0
attrs==24.3.0
certifi==2024.12.14
charset-normalizer==3.4.1
coverage[toml]==7.6.10
exceptiongroup==1.2.2
gevent==24.2.1
greenlet==3.0.3
gunicorn==22.0.0
gevent==24.11.1
greenlet==3.1.1
gunicorn==23.0.0
hypothesis==6.45.0
idna==3.7
idna==3.10
iniconfig==2.0.0
mock==5.1.0
opentracing==2.4.0
packaging==24.1
packaging==24.2
pluggy==1.5.0
pytest==8.3.1
pytest-cov==5.0.0
pytest==8.3.4
pytest-cov==6.0.0
pytest-mock==3.14.0
pytest-randomly==3.15.0
pytest-randomly==3.16.0
requests==2.32.3
sortedcontainers==2.4.0
tomli==2.0.1
urllib3==2.2.2
tomli==2.2.1
urllib3==2.3.0
zope-event==5.0
zope-interface==6.4.post2
zope-interface==7.2

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

0 comments on commit 8e5bf1d

Please sign in to comment.