diff --git a/.circleci/config.templ.yml b/.circleci/config.templ.yml index c5849813481..45652725f08 100644 --- a/.circleci/config.templ.yml +++ b/.circleci/config.templ.yml @@ -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 diff --git a/.riot/requirements/10d81a7.txt b/.riot/requirements/10d81a7.txt deleted file mode 100644 index 4850480c508..00000000000 --- a/.riot/requirements/10d81a7.txt +++ /dev/null @@ -1,33 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.9 -# by the following command: -# -# pip-compile --config=pyproject.toml --no-annotate .riot/requirements/10d81a7.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.4.4 -hypothesis==6.45.0 -importlib-metadata==7.1.0 -kombu==4.6.11 -mock==5.1.0 -more-itertools==8.10.0 -opentracing==2.4.0 -packaging==24.0 -pluggy==0.13.1 -py==1.11.0 -pytest==4.6.11 -pytest-cov==5.0.0 -pytest-mock==3.2.0 -pytest-randomly==3.15.0 -pytz==2024.1 -redis==3.5.3 -six==1.16.0 -sortedcontainers==2.4.0 -tomli==2.0.1 -vine==1.3.0 -wcwidth==0.2.13 -zipp==3.18.1 diff --git a/.riot/requirements/126a701.txt b/.riot/requirements/126a701.txt deleted file mode 100644 index 8b9a25dac06..00000000000 --- a/.riot/requirements/126a701.txt +++ /dev/null @@ -1,53 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.8 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/126a701.in -# -amqp==5.2.0 -attrs==23.1.0 -backports-zoneinfo[tzdata]==0.2.1 -billiard==3.6.4.0 -celery==5.0.5 -certifi==2023.11.17 -charset-normalizer==3.3.2 -click==7.1.2 -click-didyoumean==0.3.0 -click-plugins==1.1.1 -click-repl==0.3.0 -coverage[toml]==7.3.4 -django==2.2.1 -exceptiongroup==1.2.0 -gevent==23.9.1 -greenlet==3.0.2 -hypothesis==6.45.0 -idna==3.6 -importlib-metadata==7.0.0 -iniconfig==2.0.0 -kombu==5.3.4 -mock==5.1.0 -opentracing==2.4.0 -packaging==23.2 -pluggy==1.3.0 -prompt-toolkit==3.0.43 -pytest==7.4.3 -pytest-cov==4.1.0 -pytest-mock==3.12.0 -pytest-randomly==3.15.0 -pytz==2023.3.post1 -requests==2.31.0 -sortedcontainers==2.4.0 -sqlalchemy==1.2.19 -sqlparse==0.4.4 -tomli==2.0.1 -typing-extensions==4.9.0 -tzdata==2023.3 -urllib3==2.1.0 -vine==5.1.0 -wcwidth==0.2.12 -zipp==3.17.0 -zope-event==5.0 -zope-interface==6.1 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/11d2116.txt b/.riot/requirements/1cb9194.txt similarity index 81% rename from .riot/requirements/11d2116.txt rename to .riot/requirements/1cb9194.txt index ba1c1f6dd5b..8a5e9be047f 100644 --- a/.riot/requirements/11d2116.txt +++ b/.riot/requirements/1cb9194.txt @@ -2,7 +2,7 @@ # 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 @@ -10,7 +10,7 @@ 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 diff --git a/.riot/requirements/1e147db.txt b/.riot/requirements/1e147db.txt new file mode 100644 index 00000000000..063f0e44c08 --- /dev/null +++ b/.riot/requirements/1e147db.txt @@ -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 diff --git a/.riot/requirements/2ca9efa.txt b/.riot/requirements/2ca9efa.txt deleted file mode 100644 index aceaf845534..00000000000 --- a/.riot/requirements/2ca9efa.txt +++ /dev/null @@ -1,33 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.8 -# by the following command: -# -# pip-compile --config=pyproject.toml --no-annotate .riot/requirements/2ca9efa.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.4.4 -hypothesis==6.45.0 -importlib-metadata==7.1.0 -kombu==4.6.11 -mock==5.1.0 -more-itertools==8.10.0 -opentracing==2.4.0 -packaging==24.0 -pluggy==0.13.1 -py==1.11.0 -pytest==4.6.11 -pytest-cov==5.0.0 -pytest-mock==3.2.0 -pytest-randomly==3.15.0 -pytz==2024.1 -redis==3.5.3 -six==1.16.0 -sortedcontainers==2.4.0 -tomli==2.0.1 -vine==1.3.0 -wcwidth==0.2.13 -zipp==3.18.1 diff --git a/.riot/requirements/54aeb0a.txt b/.riot/requirements/54aeb0a.txt deleted file mode 100644 index a0ce9b34e8f..00000000000 --- a/.riot/requirements/54aeb0a.txt +++ /dev/null @@ -1,51 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.9 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/54aeb0a.in -# -amqp==5.2.0 -attrs==23.1.0 -billiard==3.6.4.0 -celery==5.0.5 -certifi==2023.11.17 -charset-normalizer==3.3.2 -click==7.1.2 -click-didyoumean==0.3.0 -click-plugins==1.1.1 -click-repl==0.3.0 -coverage[toml]==7.3.4 -django==2.2.1 -exceptiongroup==1.2.0 -gevent==23.9.1 -greenlet==3.0.3 -hypothesis==6.45.0 -idna==3.6 -importlib-metadata==7.0.0 -iniconfig==2.0.0 -kombu==5.3.4 -mock==5.1.0 -opentracing==2.4.0 -packaging==23.2 -pluggy==1.3.0 -prompt-toolkit==3.0.43 -pytest==7.4.3 -pytest-cov==4.1.0 -pytest-mock==3.12.0 -pytest-randomly==3.15.0 -pytz==2023.3.post1 -requests==2.31.0 -sortedcontainers==2.4.0 -sqlalchemy==1.2.19 -sqlparse==0.4.4 -tomli==2.0.1 -typing-extensions==4.9.0 -urllib3==2.1.0 -vine==5.1.0 -wcwidth==0.2.12 -zipp==3.17.0 -zope-event==5.0 -zope-interface==6.1 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/97ea583.txt b/.riot/requirements/97ea583.txt new file mode 100644 index 00000000000..ccb4bfc1ac3 --- /dev/null +++ b/.riot/requirements/97ea583.txt @@ -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 diff --git a/.riot/requirements/b416620.txt b/.riot/requirements/b416620.txt new file mode 100644 index 00000000000..5cd01b1b2b8 --- /dev/null +++ b/.riot/requirements/b416620.txt @@ -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 diff --git a/.riot/requirements/ce9ed6d.txt b/.riot/requirements/ce9ed6d.txt deleted file mode 100644 index bef66922839..00000000000 --- a/.riot/requirements/ce9ed6d.txt +++ /dev/null @@ -1,49 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.10 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/ce9ed6d.in -# -amqp==5.2.0 -attrs==23.1.0 -billiard==3.6.4.0 -celery==5.0.5 -certifi==2023.11.17 -charset-normalizer==3.3.2 -click==7.1.2 -click-didyoumean==0.3.0 -click-plugins==1.1.1 -click-repl==0.3.0 -coverage[toml]==7.3.4 -django==2.2.1 -exceptiongroup==1.2.0 -gevent==23.9.1 -greenlet==3.0.3 -hypothesis==6.45.0 -idna==3.6 -iniconfig==2.0.0 -kombu==5.3.4 -mock==5.1.0 -opentracing==2.4.0 -packaging==23.2 -pluggy==1.3.0 -prompt-toolkit==3.0.43 -pytest==7.4.3 -pytest-cov==4.1.0 -pytest-mock==3.12.0 -pytest-randomly==3.15.0 -pytz==2023.3.post1 -requests==2.31.0 -sortedcontainers==2.4.0 -sqlalchemy==1.2.19 -sqlparse==0.4.4 -tomli==2.0.1 -typing-extensions==4.9.0 -urllib3==2.1.0 -vine==5.1.0 -wcwidth==0.2.12 -zope-event==5.0 -zope-interface==6.1 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/d5bcdee.txt b/.riot/requirements/d5bcdee.txt deleted file mode 100644 index 3898b908324..00000000000 --- a/.riot/requirements/d5bcdee.txt +++ /dev/null @@ -1,47 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/d5bcdee.in -# -amqp==5.2.0 -attrs==23.1.0 -billiard==3.6.4.0 -celery==5.0.5 -certifi==2023.11.17 -charset-normalizer==3.3.2 -click==7.1.2 -click-didyoumean==0.3.0 -click-plugins==1.1.1 -click-repl==0.3.0 -coverage[toml]==7.3.4 -django==2.2.1 -gevent==23.9.1 -greenlet==3.0.3 -hypothesis==6.45.0 -idna==3.6 -iniconfig==2.0.0 -kombu==5.3.4 -mock==5.1.0 -opentracing==2.4.0 -packaging==23.2 -pluggy==1.3.0 -prompt-toolkit==3.0.43 -pytest==7.4.3 -pytest-cov==4.1.0 -pytest-mock==3.12.0 -pytest-randomly==3.15.0 -pytz==2023.3.post1 -requests==2.31.0 -sortedcontainers==2.4.0 -sqlalchemy==1.2.19 -sqlparse==0.4.4 -typing-extensions==4.9.0 -urllib3==2.1.0 -vine==5.1.0 -wcwidth==0.2.12 -zope-event==5.0 -zope-interface==6.1 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/e0c0926.txt b/.riot/requirements/e0c0926.txt new file mode 100644 index 00000000000..08fe0d707f1 --- /dev/null +++ b/.riot/requirements/e0c0926.txt @@ -0,0 +1,55 @@ +# +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/e0c0926.in +# +amqp==5.2.0 +attrs==23.2.0 +backports-zoneinfo[tzdata]==0.2.1 +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 diff --git a/riotfile.py b/riotfile.py index a02d781fbac..b492008e640 100644 --- a/riotfile.py +++ b/riotfile.py @@ -661,7 +661,7 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): pkgs={ "pytest": "~=4.0", "celery": [ - "~=4.4", # most recent 4.x + latest, # most recent 4.x ], "redis": "~=3.5", "kombu": "~=4.4", @@ -674,18 +674,18 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): Venv(pys="3.7", pkgs={"exceptiongroup": latest}), ], ), - Venv( - # celery added support for Python 3.9 in 4.x - pys=select_pys(min_version="3.8", max_version="3.9"), - pkgs={ - "pytest": "~=4.0", - "celery": [ - "~=4.4", # most recent 4.x - ], - "redis": "~=3.5", - "kombu": "~=4.4", - }, - ), + # Venv( + # # celery added support for Python 3.9 in 4.x + # pys=select_pys(min_version="3.8", max_version="3.9"), + # pkgs={ + # "pytest": "~=4.0", + # "celery": [ + # "latest", # most recent 4.x + # ], + # "redis": "~=3.5", + # "kombu": "~=4.4", + # }, + # ), # Celery 5.x wants Python 3.6+ # Split into <3.8 and >=3.8 to pin importlib_metadata dependency for kombu Venv( @@ -902,7 +902,7 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): # that we currently have no reasons for expanding this matrix. "django": "==2.2.1", "sqlalchemy": "~=1.2.18", - "celery": "~=5.0.5", + "celery": latest, "gevent": latest, "requests": latest, "typing-extensions": latest,