Skip to content

Commit

Permalink
Merge branch '3.x-staging' into christophe-papazian/remove_appsec_dep…
Browse files Browse the repository at this point in the history
…endencies_if_serverless
  • Loading branch information
christophe-papazian authored Feb 3, 2025
2 parents 4e94859 + a22143d commit 484dae9
Show file tree
Hide file tree
Showing 31 changed files with 385 additions and 271 deletions.
8 changes: 8 additions & 0 deletions .gitlab/services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,11 @@
rabbitmq:
name: registry.ddbuild.io/images/mirror/rabbitmq:3.12.7-management-alpine
alias: rabbitmq
mysql:
name: registry.ddbuild.io/images/mirror/mysql:5.7
alias: mysql
variables:
MYSQL_ROOT_PASSWORD: admin
MYSQL_PASSWORD: test
MYSQL_USER: test
MYSQL_DATABASE: test
1 change: 0 additions & 1 deletion .gitlab/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ stages:
variables:
RIOT_RUN_CMD: riot -P -v run --exitfirst --pass-env -s
REPO_LANG: python # "python" is used everywhere rather than "py"
DD_PYTEST_USE_NEW_PLUGIN_BETA: "true"
PYTEST_ADDOPTS: "-s"
# CI_DEBUG_SERVICES: "true"

Expand Down
40 changes: 40 additions & 0 deletions .riot/requirements/106990f.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# pip-compile --no-annotate .riot/requirements/106990f.in
#
astunparse==1.6.3
attrs==24.3.0
certifi==2024.12.14
cffi==1.17.1
charset-normalizer==3.4.1
coverage[toml]==7.6.10
cryptography==44.0.0
googleapis-common-protos==1.66.0
greenlet==3.1.1
grpcio==1.70.0
hypothesis==6.45.0
idna==3.10
iniconfig==2.0.0
mock==5.1.0
mysqlclient==2.1.1
opentracing==2.4.0
packaging==24.2
pluggy==1.5.0
protobuf==5.29.3
psycopg2-binary==2.9.10
pycparser==2.22
pycryptodome==3.21.0
pymysql==1.1.1
pytest==8.3.4
pytest-cov==6.0.0
pytest-mock==3.14.0
requests==2.32.3
simplejson==3.19.3
six==1.17.0
sortedcontainers==2.4.0
sqlalchemy==2.0.22
typing-extensions==4.12.2
urllib3==2.3.0
wheel==0.45.1
42 changes: 42 additions & 0 deletions .riot/requirements/1140d28.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile --no-annotate .riot/requirements/1140d28.in
#
astunparse==1.6.3
attrs==24.3.0
certifi==2024.12.14
cffi==1.17.1
charset-normalizer==3.4.1
coverage[toml]==7.6.1
cryptography==44.0.0
exceptiongroup==1.2.2
googleapis-common-protos==1.66.0
greenlet==3.1.1
grpcio==1.70.0
hypothesis==6.45.0
idna==3.10
iniconfig==2.0.0
mock==5.1.0
mysqlclient==2.1.1
opentracing==2.4.0
packaging==24.2
pluggy==1.5.0
protobuf==5.29.3
psycopg2-binary==2.9.10
pycparser==2.22
pycryptodome==3.21.0
pymysql==1.1.1
pytest==8.3.4
pytest-cov==5.0.0
pytest-mock==3.14.0
requests==2.32.3
simplejson==3.19.3
six==1.17.0
sortedcontainers==2.4.0
sqlalchemy==2.0.22
tomli==2.2.1
typing-extensions==4.12.2
urllib3==2.2.3
wheel==0.45.1
42 changes: 42 additions & 0 deletions .riot/requirements/1568a2f.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
#
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile --no-annotate .riot/requirements/1568a2f.in
#
astunparse==1.6.3
attrs==24.3.0
certifi==2024.12.14
cffi==1.17.1
charset-normalizer==3.4.1
coverage[toml]==7.6.10
cryptography==44.0.0
exceptiongroup==1.2.2
googleapis-common-protos==1.66.0
greenlet==3.1.1
grpcio==1.70.0
hypothesis==6.45.0
idna==3.10
iniconfig==2.0.0
mock==5.1.0
mysqlclient==2.1.1
opentracing==2.4.0
packaging==24.2
pluggy==1.5.0
protobuf==5.29.3
psycopg2-binary==2.9.10
pycparser==2.22
pycryptodome==3.21.0
pymysql==1.1.1
pytest==8.3.4
pytest-cov==6.0.0
pytest-mock==3.14.0
requests==2.32.3
simplejson==3.19.3
six==1.17.0
sortedcontainers==2.4.0
sqlalchemy==2.0.22
tomli==2.2.1
typing-extensions==4.12.2
urllib3==2.3.0
wheel==0.45.1
40 changes: 40 additions & 0 deletions .riot/requirements/16a770c.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile --no-annotate .riot/requirements/16a770c.in
#
astunparse==1.6.3
attrs==24.3.0
certifi==2024.12.14
cffi==1.17.1
charset-normalizer==3.4.1
coverage[toml]==7.6.10
cryptography==44.0.0
googleapis-common-protos==1.66.0
greenlet==3.1.1
grpcio==1.70.0
hypothesis==6.45.0
idna==3.10
iniconfig==2.0.0
mock==5.1.0
mysqlclient==2.1.1
opentracing==2.4.0
packaging==24.2
pluggy==1.5.0
protobuf==5.29.3
psycopg2-binary==2.9.10
pycparser==2.22
pycryptodome==3.21.0
pymysql==1.1.1
pytest==8.3.4
pytest-cov==6.0.0
pytest-mock==3.14.0
requests==2.32.3
simplejson==3.19.3
six==1.17.0
sortedcontainers==2.4.0
sqlalchemy==2.0.22
typing-extensions==4.12.2
urllib3==2.3.0
wheel==0.45.1
28 changes: 15 additions & 13 deletions .riot/requirements/18695ab.txt → .riot/requirements/18c560e.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,39 @@
# This file is autogenerated by pip-compile with Python 3.7
# by the following command:
#
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/18695ab.in
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/18c560e.in
#
astunparse==1.6.3
attrs==23.2.0
certifi==2024.6.2
attrs==24.2.0
certifi==2024.12.14
cffi==1.15.1
charset-normalizer==3.3.2
charset-normalizer==3.4.1
coverage[toml]==7.2.7
cryptography==42.0.7
exceptiongroup==1.2.1
googleapis-common-protos==1.63.1
greenlet==3.0.3
grpcio==1.62.2
cryptography==44.0.0
exceptiongroup==1.2.2
googleapis-common-protos==1.66.0
greenlet==3.1.1
grpcio==1.62.3
hypothesis==6.45.0
idna==3.7
idna==3.10
importlib-metadata==6.7.0
iniconfig==2.0.0
mock==5.1.0
mysqlclient==2.1.1
opentracing==2.4.0
packaging==24.0
pluggy==1.2.0
protobuf==4.24.4
psycopg2-binary==2.9.9
pycparser==2.21
pycryptodome==3.20.0
pycryptodome==3.21.0
pymysql==1.1.1
pytest==7.4.4
pytest-cov==4.1.0
pytest-mock==3.11.1
requests==2.31.0
simplejson==3.19.2
six==1.16.0
simplejson==3.19.3
six==1.17.0
sortedcontainers==2.4.0
sqlalchemy==2.0.22
tomli==2.0.1
Expand Down
40 changes: 0 additions & 40 deletions .riot/requirements/1aedbda.txt

This file was deleted.

38 changes: 0 additions & 38 deletions .riot/requirements/4628049.txt

This file was deleted.

40 changes: 0 additions & 40 deletions .riot/requirements/58881b9.txt

This file was deleted.

Loading

0 comments on commit 484dae9

Please sign in to comment.