From 7f0dc0ebb558c4350713fc6f18f3f0483e9c44d6 Mon Sep 17 00:00:00 2001 From: Yun Kim Date: Thu, 10 Aug 2023 14:57:31 -0400 Subject: [PATCH 01/58] feat: add support for Python 3.12 --- .circleci/config.templ.yml | 2 +- .circleci/config.yml | 2 +- .riot/requirements/102f5ed.txt | 24 ++++++ .riot/requirements/1036992.txt | 18 +++++ .riot/requirements/1037a9e.txt | 30 +++++++ .riot/requirements/1043965.txt | 18 +++++ .riot/requirements/1059ae4.txt | 66 ++++++++++++++++ .../requirements/{103019c.txt => 10d77cd.txt} | 19 ++--- .riot/requirements/10faaef.txt | 18 +++++ .riot/requirements/1108166.txt | 23 ++++++ .riot/requirements/115000b.txt | 56 +++++++++++++ .riot/requirements/11673f8.txt | 24 ++++++ .riot/requirements/118b2b0.txt | 19 +++++ .riot/requirements/119dcbd.txt | 31 ++++++++ .riot/requirements/11b75a6.txt | 20 +++++ .riot/requirements/11c9b11.txt | 32 ++++++++ .riot/requirements/11e0a22.txt | 23 ++++++ .riot/requirements/11ec1d1.txt | 22 ++++++ .riot/requirements/11ef2c8.txt | 19 +++++ .riot/requirements/1238375.txt | 22 ++++++ .riot/requirements/126287a.txt | 24 ++++++ .riot/requirements/1288133.txt | 24 ++++++ .riot/requirements/128d117.txt | 26 ++++++ .riot/requirements/12a04f4.txt | 19 +++++ .riot/requirements/12ff32e.txt | 19 +++++ .riot/requirements/1329bb6.txt | 22 ++++++ .riot/requirements/1342cf6.txt | 22 ++++++ .riot/requirements/1458cd8.txt | 23 ++++++ .riot/requirements/146a564.txt | 30 +++++++ .riot/requirements/14ba6b2.txt | 23 ++++++ .riot/requirements/14f0bdd.txt | 28 +++++++ .riot/requirements/1562ac8.txt | 20 +++++ .riot/requirements/158f822.txt | 68 ++++++++++++++++ .riot/requirements/15a4905.txt | 30 +++++++ .riot/requirements/15ae61d.txt | 38 +++++++++ .riot/requirements/15e629e.txt | 21 +++++ .riot/requirements/164ec1c.txt | 22 ++++++ .riot/requirements/165caef.txt | 21 +++++ .riot/requirements/168915b.txt | 19 +++++ .riot/requirements/16aae71.txt | 36 +++++++++ .riot/requirements/16cc580.txt | 31 ++++++++ .riot/requirements/16d62ae.txt | 20 +++++ .riot/requirements/171ef96.txt | 20 +++++ .riot/requirements/1767260.txt | 22 ++++++ .riot/requirements/176c954.txt | 29 +++++++ .riot/requirements/179d3fd.txt | 22 ++++++ .riot/requirements/17c2d6c.txt | 27 +++++++ .riot/requirements/17ca8a8.txt | 32 ++++++++ .riot/requirements/18256e4.txt | 28 +++++++ .riot/requirements/18471e1.txt | 25 ++++++ .riot/requirements/1853197.txt | 19 +++++ .riot/requirements/18cd02f.txt | 79 +++++++++++++++++++ .riot/requirements/18dfaeb.txt | 32 ++++++++ .riot/requirements/1965d19.txt | 20 +++++ .riot/requirements/1996920.txt | 22 ++++++ .riot/requirements/19af47c.txt | 24 ++++++ .riot/requirements/19c5517.txt | 24 ++++++ .riot/requirements/19eb948.txt | 29 +++++++ .riot/requirements/19f5030.txt | 30 +++++++ .riot/requirements/1a039ba.txt | 19 +++++ .riot/requirements/1a26cde.txt | 21 +++++ .riot/requirements/1a60c2e.txt | 23 ++++++ .riot/requirements/1a630b3.txt | 19 +++++ .riot/requirements/1af4f34.txt | 36 +++++++++ .riot/requirements/1af552c.txt | 20 +++++ .riot/requirements/1b0b05e.txt | 26 ++++++ .riot/requirements/1b728bf.txt | 19 +++++ .../requirements/{130cf94.txt => 1b7cb49.txt} | 19 ++--- .riot/requirements/1b83c72.txt | 21 +++++ .riot/requirements/1bc5161.txt | 38 +++++++++ .riot/requirements/1bce306.txt | 41 ++++++++++ .riot/requirements/1c45659.txt | 20 +++++ .riot/requirements/1c810ba.txt | 20 +++++ .riot/requirements/1c94482.txt | 31 ++++++++ .riot/requirements/1c9a3d8.txt | 68 ++++++++++++++++ .riot/requirements/1d0d03e.txt | 19 +++++ .riot/requirements/1d2c37a.txt | 68 ++++++++++++++++ .riot/requirements/1d725d8.txt | 19 +++++ .riot/requirements/1d78810.txt | 32 ++++++++ .riot/requirements/1d9611e.txt | 31 ++++++++ .riot/requirements/1dda3e1.txt | 28 +++++++ .riot/requirements/1df06ea.txt | 20 +++++ .riot/requirements/1dfb998.txt | 23 ++++++ .riot/requirements/1e1f9ed.txt | 20 +++++ .riot/requirements/1e68324.txt | 19 +++++ .riot/requirements/1e690e1.txt | 22 ++++++ .riot/requirements/1ea67e6.txt | 28 +++++++ .riot/requirements/1ed4b2f.txt | 21 +++++ .riot/requirements/1f114a1.txt | 20 +++++ .riot/requirements/1f598f0.txt | 20 +++++ .riot/requirements/1f6fa90.txt | 22 ------ .riot/requirements/1fd2c20.txt | 21 +++++ .riot/requirements/1fe6c51.txt | 20 +++++ .riot/requirements/1ffd39b.txt | 24 ++++++ .riot/requirements/246da88.txt | 19 +++++ .riot/requirements/25676e3.txt | 22 ++++++ .riot/requirements/277a719.txt | 19 +++++ .riot/requirements/29c779d.txt | 27 +++++++ .riot/requirements/2bd75d2.txt | 18 +++++ .riot/requirements/2d9a1f8.txt | 19 +++++ .riot/requirements/2f2479c.txt | 31 ++++++++ .riot/requirements/2f76f48.txt | 21 +++++ .riot/requirements/34653f4.txt | 25 ++++++ .riot/requirements/3591bdc.txt | 32 ++++++++ .riot/requirements/3d67ff0.txt | 21 +++++ .riot/requirements/3e91d07.txt | 36 +++++++++ .riot/requirements/3eacf0d.txt | 22 ++++++ .riot/requirements/4639c12.txt | 26 ++++++ .riot/requirements/4ec2419.txt | 28 +++++++ .riot/requirements/4fad0fb.txt | 36 +++++++++ .riot/requirements/4fef498.txt | 20 +++++ .riot/requirements/50151f5.txt | 30 +++++++ .riot/requirements/5540194.txt | 24 ++++++ .riot/requirements/56b205e.txt | 22 ++++++ .riot/requirements/5883bdc.txt | 34 ++++++++ .riot/requirements/5be816f.txt | 21 +++++ .riot/requirements/5c88126.txt | 20 +++++ .riot/requirements/6009fe3.txt | 20 +++++ .riot/requirements/63bcee1.txt | 66 ++++++++++++++++ .riot/requirements/65afd8d.txt | 21 +++++ .riot/requirements/6ce2052.txt | 22 ------ .../requirements/{14ffec7.txt => 8071a9d.txt} | 19 ++--- .riot/requirements/850dfa2.txt | 38 +++++++++ .riot/requirements/8606bf2.txt | 31 ++++++++ .riot/requirements/87af88b.txt | 25 ++++++ .riot/requirements/89475ad.txt | 21 +++++ .riot/requirements/8d11306.txt | 20 +++++ .riot/requirements/912a64b.txt | 20 +++++ .riot/requirements/91ffad0.txt | 23 ++++++ .riot/requirements/9297f39.txt | 19 +++++ .riot/requirements/99f5f19.txt | 23 ++++++ .riot/requirements/a0b7aa3.txt | 23 ++++++ .riot/requirements/a5fa5ab.txt | 18 +++++ .riot/requirements/ad2a87e.txt | 19 +++++ .riot/requirements/adfaf52.txt | 22 ------ .riot/requirements/b0ffb4b.txt | 28 +++++++ .riot/requirements/b4959b4.txt | 19 +++++ .riot/requirements/b83fcd5.txt | 19 +++++ .riot/requirements/badf37b.txt | 26 ++++++ .riot/requirements/bc5ded5.txt | 21 +++++ .riot/requirements/bcbcf6c.txt | 25 ++++++ .riot/requirements/cb5c806.txt | 21 +++++ .riot/requirements/cfc44ec.txt | 19 +++++ .riot/requirements/d4721d0.txt | 25 ++++++ .riot/requirements/df77164.txt | 20 +++++ .riot/requirements/e355274.txt | 21 +++++ .riot/requirements/e7776bf.txt | 30 +++++++ .riot/requirements/ead9fee.txt | 25 ++++++ .riot/requirements/ed535cd.txt | 23 ++++++ .riot/requirements/eec83eb.txt | 24 ++++++ .riot/requirements/ef1f1a4.txt | 28 +++++++ .riot/requirements/f7ba2e9.txt | 46 +++++++++++ .riot/requirements/fb7182a.txt | 19 +++++ docs/contributing-testing.rst | 2 +- hatch.toml | 2 +- pyproject.toml | 3 - riotfile.py | 46 +++++++++-- scripts/ddtest | 3 +- setup.py | 2 + 159 files changed, 3880 insertions(+), 116 deletions(-) create mode 100644 .riot/requirements/102f5ed.txt create mode 100644 .riot/requirements/1036992.txt create mode 100644 .riot/requirements/1037a9e.txt create mode 100644 .riot/requirements/1043965.txt create mode 100644 .riot/requirements/1059ae4.txt rename .riot/requirements/{103019c.txt => 10d77cd.txt} (50%) create mode 100644 .riot/requirements/10faaef.txt create mode 100644 .riot/requirements/1108166.txt create mode 100644 .riot/requirements/115000b.txt create mode 100644 .riot/requirements/11673f8.txt create mode 100644 .riot/requirements/118b2b0.txt create mode 100644 .riot/requirements/119dcbd.txt create mode 100644 .riot/requirements/11b75a6.txt create mode 100644 .riot/requirements/11c9b11.txt create mode 100644 .riot/requirements/11e0a22.txt create mode 100644 .riot/requirements/11ec1d1.txt create mode 100644 .riot/requirements/11ef2c8.txt create mode 100644 .riot/requirements/1238375.txt create mode 100644 .riot/requirements/126287a.txt create mode 100644 .riot/requirements/1288133.txt create mode 100644 .riot/requirements/128d117.txt create mode 100644 .riot/requirements/12a04f4.txt create mode 100644 .riot/requirements/12ff32e.txt create mode 100644 .riot/requirements/1329bb6.txt create mode 100644 .riot/requirements/1342cf6.txt create mode 100644 .riot/requirements/1458cd8.txt create mode 100644 .riot/requirements/146a564.txt create mode 100644 .riot/requirements/14ba6b2.txt create mode 100644 .riot/requirements/14f0bdd.txt create mode 100644 .riot/requirements/1562ac8.txt create mode 100644 .riot/requirements/158f822.txt create mode 100644 .riot/requirements/15a4905.txt create mode 100644 .riot/requirements/15ae61d.txt create mode 100644 .riot/requirements/15e629e.txt create mode 100644 .riot/requirements/164ec1c.txt create mode 100644 .riot/requirements/165caef.txt create mode 100644 .riot/requirements/168915b.txt create mode 100644 .riot/requirements/16aae71.txt create mode 100644 .riot/requirements/16cc580.txt create mode 100644 .riot/requirements/16d62ae.txt create mode 100644 .riot/requirements/171ef96.txt create mode 100644 .riot/requirements/1767260.txt create mode 100644 .riot/requirements/176c954.txt create mode 100644 .riot/requirements/179d3fd.txt create mode 100644 .riot/requirements/17c2d6c.txt create mode 100644 .riot/requirements/17ca8a8.txt create mode 100644 .riot/requirements/18256e4.txt create mode 100644 .riot/requirements/18471e1.txt create mode 100644 .riot/requirements/1853197.txt create mode 100644 .riot/requirements/18cd02f.txt create mode 100644 .riot/requirements/18dfaeb.txt create mode 100644 .riot/requirements/1965d19.txt create mode 100644 .riot/requirements/1996920.txt create mode 100644 .riot/requirements/19af47c.txt create mode 100644 .riot/requirements/19c5517.txt create mode 100644 .riot/requirements/19eb948.txt create mode 100644 .riot/requirements/19f5030.txt create mode 100644 .riot/requirements/1a039ba.txt create mode 100644 .riot/requirements/1a26cde.txt create mode 100644 .riot/requirements/1a60c2e.txt create mode 100644 .riot/requirements/1a630b3.txt create mode 100644 .riot/requirements/1af4f34.txt create mode 100644 .riot/requirements/1af552c.txt create mode 100644 .riot/requirements/1b0b05e.txt create mode 100644 .riot/requirements/1b728bf.txt rename .riot/requirements/{130cf94.txt => 1b7cb49.txt} (50%) create mode 100644 .riot/requirements/1b83c72.txt create mode 100644 .riot/requirements/1bc5161.txt create mode 100644 .riot/requirements/1bce306.txt create mode 100644 .riot/requirements/1c45659.txt create mode 100644 .riot/requirements/1c810ba.txt create mode 100644 .riot/requirements/1c94482.txt create mode 100644 .riot/requirements/1c9a3d8.txt create mode 100644 .riot/requirements/1d0d03e.txt create mode 100644 .riot/requirements/1d2c37a.txt create mode 100644 .riot/requirements/1d725d8.txt create mode 100644 .riot/requirements/1d78810.txt create mode 100644 .riot/requirements/1d9611e.txt create mode 100644 .riot/requirements/1dda3e1.txt create mode 100644 .riot/requirements/1df06ea.txt create mode 100644 .riot/requirements/1dfb998.txt create mode 100644 .riot/requirements/1e1f9ed.txt create mode 100644 .riot/requirements/1e68324.txt create mode 100644 .riot/requirements/1e690e1.txt create mode 100644 .riot/requirements/1ea67e6.txt create mode 100644 .riot/requirements/1ed4b2f.txt create mode 100644 .riot/requirements/1f114a1.txt create mode 100644 .riot/requirements/1f598f0.txt delete mode 100644 .riot/requirements/1f6fa90.txt create mode 100644 .riot/requirements/1fd2c20.txt create mode 100644 .riot/requirements/1fe6c51.txt create mode 100644 .riot/requirements/1ffd39b.txt create mode 100644 .riot/requirements/246da88.txt create mode 100644 .riot/requirements/25676e3.txt create mode 100644 .riot/requirements/277a719.txt create mode 100644 .riot/requirements/29c779d.txt create mode 100644 .riot/requirements/2bd75d2.txt create mode 100644 .riot/requirements/2d9a1f8.txt create mode 100644 .riot/requirements/2f2479c.txt create mode 100644 .riot/requirements/2f76f48.txt create mode 100644 .riot/requirements/34653f4.txt create mode 100644 .riot/requirements/3591bdc.txt create mode 100644 .riot/requirements/3d67ff0.txt create mode 100644 .riot/requirements/3e91d07.txt create mode 100644 .riot/requirements/3eacf0d.txt create mode 100644 .riot/requirements/4639c12.txt create mode 100644 .riot/requirements/4ec2419.txt create mode 100644 .riot/requirements/4fad0fb.txt create mode 100644 .riot/requirements/4fef498.txt create mode 100644 .riot/requirements/50151f5.txt create mode 100644 .riot/requirements/5540194.txt create mode 100644 .riot/requirements/56b205e.txt create mode 100644 .riot/requirements/5883bdc.txt create mode 100644 .riot/requirements/5be816f.txt create mode 100644 .riot/requirements/5c88126.txt create mode 100644 .riot/requirements/6009fe3.txt create mode 100644 .riot/requirements/63bcee1.txt create mode 100644 .riot/requirements/65afd8d.txt delete mode 100644 .riot/requirements/6ce2052.txt rename .riot/requirements/{14ffec7.txt => 8071a9d.txt} (50%) create mode 100644 .riot/requirements/850dfa2.txt create mode 100644 .riot/requirements/8606bf2.txt create mode 100644 .riot/requirements/87af88b.txt create mode 100644 .riot/requirements/89475ad.txt create mode 100644 .riot/requirements/8d11306.txt create mode 100644 .riot/requirements/912a64b.txt create mode 100644 .riot/requirements/91ffad0.txt create mode 100644 .riot/requirements/9297f39.txt create mode 100644 .riot/requirements/99f5f19.txt create mode 100644 .riot/requirements/a0b7aa3.txt create mode 100644 .riot/requirements/a5fa5ab.txt create mode 100644 .riot/requirements/ad2a87e.txt delete mode 100644 .riot/requirements/adfaf52.txt create mode 100644 .riot/requirements/b0ffb4b.txt create mode 100644 .riot/requirements/b4959b4.txt create mode 100644 .riot/requirements/b83fcd5.txt create mode 100644 .riot/requirements/badf37b.txt create mode 100644 .riot/requirements/bc5ded5.txt create mode 100644 .riot/requirements/bcbcf6c.txt create mode 100644 .riot/requirements/cb5c806.txt create mode 100644 .riot/requirements/cfc44ec.txt create mode 100644 .riot/requirements/d4721d0.txt create mode 100644 .riot/requirements/df77164.txt create mode 100644 .riot/requirements/e355274.txt create mode 100644 .riot/requirements/e7776bf.txt create mode 100644 .riot/requirements/ead9fee.txt create mode 100644 .riot/requirements/ed535cd.txt create mode 100644 .riot/requirements/eec83eb.txt create mode 100644 .riot/requirements/ef1f1a4.txt create mode 100644 .riot/requirements/f7ba2e9.txt create mode 100644 .riot/requirements/fb7182a.txt diff --git a/.circleci/config.templ.yml b/.circleci/config.templ.yml index ae4a1b99f6b..42b60eddb3a 100644 --- a/.circleci/config.templ.yml +++ b/.circleci/config.templ.yml @@ -78,7 +78,7 @@ commands: description: "Install riot" steps: # Make sure we install and run riot on Python 3 - - run: pip3 install riot==0.17.7 + - run: pip3 install riot==0.19.0 setup_hatch: description: "Install hatch" diff --git a/.circleci/config.yml b/.circleci/config.yml index 260901772ef..1c910518daa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,7 +30,7 @@ jobs: - run: name: Generate config command: | - pip3 install riot==0.17.7 + pip3 install riot==0.19.0 riot -v run --pass-env -s circleci-gen-config -- -v - continuation/continue: configuration_path: .circleci/config.gen.yml diff --git a/.riot/requirements/102f5ed.txt b/.riot/requirements/102f5ed.txt new file mode 100644 index 00000000000..4ade8297125 --- /dev/null +++ b/.riot/requirements/102f5ed.txt @@ -0,0 +1,24 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/102f5ed.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +gunicorn==21.2.0 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +protobuf==4.22.0 +py-cpuinfo==8.0.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-benchmark==4.0.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +uwsgi==2.0.22 diff --git a/.riot/requirements/1036992.txt b/.riot/requirements/1036992.txt new file mode 100644 index 00000000000..029e9787ba4 --- /dev/null +++ b/.riot/requirements/1036992.txt @@ -0,0 +1,18 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1036992.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/1037a9e.txt b/.riot/requirements/1037a9e.txt new file mode 100644 index 00000000000..c5f8a5bc073 --- /dev/null +++ b/.riot/requirements/1037a9e.txt @@ -0,0 +1,30 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1037a9e.in +# +attrs==23.1.0 +blinker==1.6.2 +certifi==2023.7.22 +charset-normalizer==3.2.0 +click==8.1.6 +coverage[toml]==7.2.7 +flask==2.3.2 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +itsdangerous==2.1.2 +jinja2==3.1.2 +markupsafe==2.1.3 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +requests==2.31.0 +sortedcontainers==2.4.0 +urllib3==2.0.4 +werkzeug==2.3.6 diff --git a/.riot/requirements/1043965.txt b/.riot/requirements/1043965.txt new file mode 100644 index 00000000000..a4173d3daa3 --- /dev/null +++ b/.riot/requirements/1043965.txt @@ -0,0 +1,18 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1043965.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/1059ae4.txt b/.riot/requirements/1059ae4.txt new file mode 100644 index 00000000000..f8fb567b69e --- /dev/null +++ b/.riot/requirements/1059ae4.txt @@ -0,0 +1,66 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1059ae4.in +# +ai21==1.2.4 +aiohttp==3.8.5 +aiosignal==1.3.1 +async-timeout==4.0.2 +attrs==23.1.0 +backoff==2.2.1 +certifi==2023.7.22 +charset-normalizer==3.2.0 +cohere==4.19.2 +coverage[toml]==7.2.7 +dataclasses-json==0.5.14 +dnspython==2.4.2 +exceptiongroup==1.1.2 +fastavro==1.8.2 +filelock==3.12.2 +frozenlist==1.4.0 +fsspec==2023.6.0 +huggingface-hub==0.16.4 +hypothesis==6.45.0 +idna==3.4 +importlib-metadata==6.8.0 +iniconfig==2.0.0 +langchain==0.0.261 +langsmith==0.0.20 +loguru==0.7.0 +marshmallow==3.20.1 +mock==5.1.0 +multidict==6.0.4 +mypy-extensions==1.0.0 +numexpr==2.8.5 +numpy==1.25.2 +openai==0.27.8 +openapi-schema-pydantic==1.2.4 +opentracing==2.4.0 +packaging==23.1 +pinecone-client==2.2.2 +pluggy==1.2.0 +psutil==5.9.5 +pydantic==1.10.12 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +python-dateutil==2.8.2 +pyyaml==6.0.1 +regex==2023.8.8 +requests==2.31.0 +six==1.16.0 +sortedcontainers==2.4.0 +sqlalchemy==2.0.19 +tenacity==8.2.2 +tiktoken==0.4.0 +tqdm==4.66.1 +typing-extensions==4.7.1 +typing-inspect==0.9.0 +urllib3==2.0.4 +vcrpy==5.1.0 +wrapt==1.15.0 +yarl==1.9.2 +zipp==3.16.2 diff --git a/.riot/requirements/103019c.txt b/.riot/requirements/10d77cd.txt similarity index 50% rename from .riot/requirements/103019c.txt rename to .riot/requirements/10d77cd.txt index 9b43cc9ea6e..58d965049e0 100644 --- a/.riot/requirements/103019c.txt +++ b/.riot/requirements/10d77cd.txt @@ -1,22 +1,19 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/103019c.in +# pip-compile --no-annotate --resolver=backtracking .riot/requirements/8071a9d.in # -attrs==20.1.0 -coverage[toml]==7.2.3 -httpretty==0.9.7 +attrs==22.2.0 +coverage[toml]==7.2.2 hypothesis==6.45.0 iniconfig==2.0.0 -mock==5.0.2 -msgpack==1.0.5 +mock==5.0.1 +mysqlclient==2.1.1 opentracing==2.4.0 -packaging==23.1 +packaging==23.0 pluggy==1.0.0 -pytest==7.3.1 +pytest==7.2.2 pytest-cov==4.0.0 pytest-mock==3.10.0 -six==1.16.0 sortedcontainers==2.4.0 -structlog==23.1.0 diff --git a/.riot/requirements/10faaef.txt b/.riot/requirements/10faaef.txt new file mode 100644 index 00000000000..a0a29b33cb3 --- /dev/null +++ b/.riot/requirements/10faaef.txt @@ -0,0 +1,18 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/10faaef.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/1108166.txt b/.riot/requirements/1108166.txt new file mode 100644 index 00000000000..efe8758a49f --- /dev/null +++ b/.riot/requirements/1108166.txt @@ -0,0 +1,23 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1108166.in +# +attrs==23.1.0 +beautifulsoup4==4.12.2 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +soupsieve==2.4.1 +waitress==2.1.2 +webob==1.8.7 +webtest==3.0.0 diff --git a/.riot/requirements/115000b.txt b/.riot/requirements/115000b.txt new file mode 100644 index 00000000000..d5084a6a6bf --- /dev/null +++ b/.riot/requirements/115000b.txt @@ -0,0 +1,56 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/115000b.in +# +asgiref==3.7.2 +attrs==23.1.0 +autobahn==23.6.2 +automat==22.10.0 +certifi==2023.7.22 +cffi==1.15.1 +channels==4.0.0 +charset-normalizer==3.2.0 +constantly==15.1.0 +coverage[toml]==7.2.7 +cryptography==41.0.3 +daphne==4.0.0 +django==4.2.4 +django-pylibmc==0.6.1 +django-redis==4.5.0 +hyperlink==21.0.0 +hypothesis==6.45.0 +idna==3.4 +incremental==22.10.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +psycopg==3.1.10 +psycopg2-binary==2.9.7 +pyasn1==0.5.0 +pyasn1-modules==0.3.0 +pycparser==2.21 +pylibmc==1.6.3 +pyopenssl==23.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-django==3.10.0 +pytest-mock==3.11.1 +python-memcached==1.59 +redis==2.10.6 +requests==2.31.0 +service-identity==23.1.0 +six==1.16.0 +sortedcontainers==2.4.0 +sqlparse==0.4.4 +twisted[tls]==22.10.0 +txaio==23.1.1 +typing-extensions==4.7.1 +urllib3==2.0.4 +zope-interface==6.0 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/11673f8.txt b/.riot/requirements/11673f8.txt new file mode 100644 index 00000000000..e336f34073b --- /dev/null +++ b/.riot/requirements/11673f8.txt @@ -0,0 +1,24 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/11673f8.in +# +algoliasearch==2.6.3 +attrs==23.1.0 +certifi==2023.7.22 +charset-normalizer==3.2.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +requests==2.31.0 +sortedcontainers==2.4.0 +urllib3==2.0.4 diff --git a/.riot/requirements/118b2b0.txt b/.riot/requirements/118b2b0.txt new file mode 100644 index 00000000000..1f1c47f96c1 --- /dev/null +++ b/.riot/requirements/118b2b0.txt @@ -0,0 +1,19 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/118b2b0.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/119dcbd.txt b/.riot/requirements/119dcbd.txt new file mode 100644 index 00000000000..8813f80fe46 --- /dev/null +++ b/.riot/requirements/119dcbd.txt @@ -0,0 +1,31 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/119dcbd.in +# +aiohttp==3.8.5 +aiohttp-jinja2==1.5.1 +aiosignal==1.3.1 +async-timeout==4.0.2 +attrs==23.1.0 +charset-normalizer==3.2.0 +coverage[toml]==7.2.7 +frozenlist==1.4.0 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +jinja2==3.1.2 +markupsafe==2.1.3 +mock==5.1.0 +multidict==6.0.4 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-aiohttp==1.0.4 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +yarl==1.9.2 diff --git a/.riot/requirements/11b75a6.txt b/.riot/requirements/11b75a6.txt new file mode 100644 index 00000000000..2bc878fbbca --- /dev/null +++ b/.riot/requirements/11b75a6.txt @@ -0,0 +1,20 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/11b75a6.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +elasticsearch5==5.5.6 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +urllib3==2.0.4 diff --git a/.riot/requirements/11c9b11.txt b/.riot/requirements/11c9b11.txt new file mode 100644 index 00000000000..766681b51b3 --- /dev/null +++ b/.riot/requirements/11c9b11.txt @@ -0,0 +1,32 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/11c9b11.in +# +attrs==23.1.0 +blinker==1.6.2 +certifi==2023.7.22 +charset-normalizer==3.2.0 +click==8.1.6 +coverage[toml]==7.2.7 +flask==2.3.2 +hypothesis==6.45.0 +idna==3.4 +importlib-metadata==6.0.0 +iniconfig==2.0.0 +itsdangerous==2.1.2 +jinja2==3.1.2 +markupsafe==2.1.3 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +requests==2.31.0 +sortedcontainers==2.4.0 +urllib3==2.0.4 +werkzeug==2.3.6 +zipp==3.16.2 diff --git a/.riot/requirements/11e0a22.txt b/.riot/requirements/11e0a22.txt new file mode 100644 index 00000000000..0467c6c8886 --- /dev/null +++ b/.riot/requirements/11e0a22.txt @@ -0,0 +1,23 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/11e0a22.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +httpretty==0.9.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +msgpack==1.0.5 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +six==1.16.0 +sortedcontainers==2.4.0 +typing-extensions==4.7.1 diff --git a/.riot/requirements/11ec1d1.txt b/.riot/requirements/11ec1d1.txt new file mode 100644 index 00000000000..c51d8b08fbf --- /dev/null +++ b/.riot/requirements/11ec1d1.txt @@ -0,0 +1,22 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/11ec1d1.in +# +attrs==23.1.0 +certifi==2023.7.22 +coverage[toml]==7.2.7 +elastic-transport==8.4.0 +elasticsearch8==8.9.0 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +urllib3==1.26.16 diff --git a/.riot/requirements/11ef2c8.txt b/.riot/requirements/11ef2c8.txt new file mode 100644 index 00000000000..21161c10979 --- /dev/null +++ b/.riot/requirements/11ef2c8.txt @@ -0,0 +1,19 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/11ef2c8.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +msgpack==1.0.5 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/1238375.txt b/.riot/requirements/1238375.txt new file mode 100644 index 00000000000..eb22e68a4d9 --- /dev/null +++ b/.riot/requirements/1238375.txt @@ -0,0 +1,22 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1238375.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +decorator==5.1.1 +dogpile-cache==1.2.2 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pbr==5.11.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +stevedore==5.1.0 diff --git a/.riot/requirements/126287a.txt b/.riot/requirements/126287a.txt new file mode 100644 index 00000000000..d1f75e7526b --- /dev/null +++ b/.riot/requirements/126287a.txt @@ -0,0 +1,24 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/126287a.in +# +attrs==23.1.0 +certifi==2023.7.22 +charset-normalizer==3.2.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +mock==5.1.0 +opensearch-py[requests]==1.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +requests==2.31.0 +sortedcontainers==2.4.0 +urllib3==1.26.16 diff --git a/.riot/requirements/1288133.txt b/.riot/requirements/1288133.txt new file mode 100644 index 00000000000..e8e5705ba02 --- /dev/null +++ b/.riot/requirements/1288133.txt @@ -0,0 +1,24 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1288133.in +# +attrs==23.1.0 +certifi==2023.7.22 +charset-normalizer==3.2.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +mock==5.1.0 +opensearch-py[requests]==2.0.1 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +requests==2.31.0 +sortedcontainers==2.4.0 +urllib3==1.26.16 diff --git a/.riot/requirements/128d117.txt b/.riot/requirements/128d117.txt new file mode 100644 index 00000000000..7e611e8455b --- /dev/null +++ b/.riot/requirements/128d117.txt @@ -0,0 +1,26 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/128d117.in +# +attrs==23.1.0 +certifi==2023.7.22 +coverage[toml]==7.2.7 +h11==0.14.0 +httpcore==0.12.3 +httpx==0.17.1 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +rfc3986[idna2008]==1.5.0 +sniffio==1.3.0 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/12a04f4.txt b/.riot/requirements/12a04f4.txt new file mode 100644 index 00000000000..b57483ac151 --- /dev/null +++ b/.riot/requirements/12a04f4.txt @@ -0,0 +1,19 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/12a04f4.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +msgpack==1.0.5 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/12ff32e.txt b/.riot/requirements/12ff32e.txt new file mode 100644 index 00000000000..e9534483387 --- /dev/null +++ b/.riot/requirements/12ff32e.txt @@ -0,0 +1,19 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/12ff32e.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pymysql==1.1.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/1329bb6.txt b/.riot/requirements/1329bb6.txt new file mode 100644 index 00000000000..20851103495 --- /dev/null +++ b/.riot/requirements/1329bb6.txt @@ -0,0 +1,22 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1329bb6.in +# +attrs==20.1.0 +coverage[toml]==7.2.7 +httpretty==0.9.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +msgpack==1.0.5 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +six==1.16.0 +sortedcontainers==2.4.0 +structlog==23.1.0 diff --git a/.riot/requirements/1342cf6.txt b/.riot/requirements/1342cf6.txt new file mode 100644 index 00000000000..45d92b9dc26 --- /dev/null +++ b/.riot/requirements/1342cf6.txt @@ -0,0 +1,22 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1342cf6.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +httpretty==0.9.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +msgpack==1.0.5 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +six==1.16.0 +sortedcontainers==2.4.0 +structlog==23.1.0 diff --git a/.riot/requirements/1458cd8.txt b/.riot/requirements/1458cd8.txt new file mode 100644 index 00000000000..19b3c4c0ed4 --- /dev/null +++ b/.riot/requirements/1458cd8.txt @@ -0,0 +1,23 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1458cd8.in +# +attrs==23.1.0 +cattrs==22.2.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +molten==1.0.2 +mypy-extensions==1.0.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +typing-extensions==3.10.0.2 +typing-inspect==0.6.0 diff --git a/.riot/requirements/146a564.txt b/.riot/requirements/146a564.txt new file mode 100644 index 00000000000..a8de9e3d53e --- /dev/null +++ b/.riot/requirements/146a564.txt @@ -0,0 +1,30 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/146a564.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +gevent==23.7.0 +greenlet==3.0.0a1 +gunicorn[gevent]==21.2.0 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +py-cpuinfo==8.0.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-benchmark==4.0.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +uwsgi==2.0.22 +zope-event==5.0 +zope-interface==6.0 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/14ba6b2.txt b/.riot/requirements/14ba6b2.txt new file mode 100644 index 00000000000..a6c55d9f069 --- /dev/null +++ b/.riot/requirements/14ba6b2.txt @@ -0,0 +1,23 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/14ba6b2.in +# +aniso8601==9.0.1 +attrs==23.1.0 +coverage[toml]==7.2.7 +graphene==3.0 +graphql-core==3.1.7 +graphql-relay==3.1.5 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/14f0bdd.txt b/.riot/requirements/14f0bdd.txt new file mode 100644 index 00000000000..ab0b479939c --- /dev/null +++ b/.riot/requirements/14f0bdd.txt @@ -0,0 +1,28 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/14f0bdd.in +# +anyio==3.7.1 +asgiref==3.0.0 +async-timeout==3.0.1 +attrs==23.1.0 +certifi==2023.7.22 +coverage[toml]==7.2.7 +h11==0.14.0 +httpcore==0.17.3 +httpx==0.24.1 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sniffio==1.3.0 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/1562ac8.txt b/.riot/requirements/1562ac8.txt new file mode 100644 index 00000000000..6fe02a6fb97 --- /dev/null +++ b/.riot/requirements/1562ac8.txt @@ -0,0 +1,20 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1562ac8.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +elasticsearch2==2.5.1 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +urllib3==1.26.16 diff --git a/.riot/requirements/158f822.txt b/.riot/requirements/158f822.txt new file mode 100644 index 00000000000..bcc4dfcb7f4 --- /dev/null +++ b/.riot/requirements/158f822.txt @@ -0,0 +1,68 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/158f822.in +# +attrs==23.1.0 +aws-sam-translator==1.73.0 +aws-xray-sdk==2.12.0 +boto==2.49.0 +boto3==1.28.23 +botocore==1.31.23 +certifi==2023.7.22 +cffi==1.15.1 +cfn-lint==0.53.1 +charset-normalizer==3.2.0 +coverage[toml]==7.2.7 +cryptography==41.0.3 +docker==6.1.3 +ecdsa==0.14.1 +hypothesis==6.45.0 +idna==2.10 +iniconfig==2.0.0 +jinja2==2.11.3 +jmespath==1.0.1 +jsondiff==2.0.0 +jsonpatch==1.33 +jsonpointer==2.4 +jsonschema==3.2.0 +junit-xml==1.9 +markupsafe==1.1.1 +mock==5.1.0 +more-itertools==10.1.0 +moto==1.3.16 +networkx==2.8.8 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pyasn1==0.5.0 +pycparser==2.21 +pydantic==1.10.12 +pynamodb==5.5.0 +pyrsistent==0.19.3 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +python-dateutil==2.8.2 +python-jose[cryptography]==3.3.0 +pytz==2023.3 +pyyaml==6.0.1 +requests==2.31.0 +responses==0.23.3 +rsa==4.9 +s3transfer==0.6.1 +six==1.16.0 +sortedcontainers==2.4.0 +sshpubkeys==3.3.1 +types-pyyaml==6.0.12.11 +typing-extensions==4.7.1 +urllib3==1.26.16 +websocket-client==1.6.1 +werkzeug==2.1.2 +wrapt==1.15.0 +xmltodict==0.13.0 +zipp==3.16.2 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/15a4905.txt b/.riot/requirements/15a4905.txt new file mode 100644 index 00000000000..6c20a4e4c05 --- /dev/null +++ b/.riot/requirements/15a4905.txt @@ -0,0 +1,30 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/15a4905.in +# +attrs==23.1.0 +blinker==1.6.2 +cachelib==0.9.0 +click==7.1.2 +coverage[toml]==7.2.7 +flask==1.1.4 +flask-caching==2.0.2 +hypothesis==6.45.0 +iniconfig==2.0.0 +itsdangerous==1.1.0 +jinja2==2.11.3 +markupsafe==1.1.1 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +python-memcached==1.59 +redis==2.10.6 +six==1.16.0 +sortedcontainers==2.4.0 +werkzeug==1.0.1 diff --git a/.riot/requirements/15ae61d.txt b/.riot/requirements/15ae61d.txt new file mode 100644 index 00000000000..0f3d7f7820e --- /dev/null +++ b/.riot/requirements/15ae61d.txt @@ -0,0 +1,38 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/15ae61d.in +# +annotated-types==0.5.0 +attrs==23.1.0 +autocommand==2.2.2 +cheroot==10.0.0 +cherrypy==18.8.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +inflect==7.0.0 +iniconfig==2.0.0 +jaraco-collections==4.3.0 +jaraco-context==4.3.0 +jaraco-functools==3.8.1 +jaraco-text==3.11.1 +mock==5.1.0 +more-itertools==8.10.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +portend==3.2.0 +pydantic==2.1.1 +pydantic-core==2.4.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +pytz==2023.3 +sortedcontainers==2.4.0 +tempora==5.5.0 +typing-extensions==4.7.1 +zc-lockfile==3.0.post1 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/15e629e.txt b/.riot/requirements/15e629e.txt new file mode 100644 index 00000000000..d23735e745c --- /dev/null +++ b/.riot/requirements/15e629e.txt @@ -0,0 +1,21 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/15e629e.in +# +amqp==5.1.1 +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +kombu==5.3.1 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +vine==5.0.0 diff --git a/.riot/requirements/164ec1c.txt b/.riot/requirements/164ec1c.txt new file mode 100644 index 00000000000..f34d8324457 --- /dev/null +++ b/.riot/requirements/164ec1c.txt @@ -0,0 +1,22 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/164ec1c.in +# +attrs==20.1.0 +coverage[toml]==7.2.7 +httpretty==0.9.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +msgpack==1.0.5 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +six==1.16.0 +sortedcontainers==2.4.0 +structlog==23.1.0 diff --git a/.riot/requirements/165caef.txt b/.riot/requirements/165caef.txt new file mode 100644 index 00000000000..f3678d7dc52 --- /dev/null +++ b/.riot/requirements/165caef.txt @@ -0,0 +1,21 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/165caef.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +dnspython==2.4.2 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +mongoengine==0.27.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pymongo==4.4.1 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/168915b.txt b/.riot/requirements/168915b.txt new file mode 100644 index 00000000000..89245fe5d06 --- /dev/null +++ b/.riot/requirements/168915b.txt @@ -0,0 +1,19 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/168915b.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +msgpack==1.0.5 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/16aae71.txt b/.riot/requirements/16aae71.txt new file mode 100644 index 00000000000..2550acefa8f --- /dev/null +++ b/.riot/requirements/16aae71.txt @@ -0,0 +1,36 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/16aae71.in +# +aiofiles==23.2.1 +annotated-types==0.5.0 +anyio==3.7.1 +attrs==23.1.0 +certifi==2023.7.22 +charset-normalizer==3.2.0 +coverage[toml]==7.2.7 +fastapi==0.101.0 +h11==0.14.0 +httpcore==0.17.3 +httpx==0.24.1 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pydantic==2.1.1 +pydantic-core==2.4.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +requests==2.31.0 +sniffio==1.3.0 +sortedcontainers==2.4.0 +starlette==0.27.0 +typing-extensions==4.7.1 +urllib3==2.0.4 diff --git a/.riot/requirements/16cc580.txt b/.riot/requirements/16cc580.txt new file mode 100644 index 00000000000..52f61e03cf3 --- /dev/null +++ b/.riot/requirements/16cc580.txt @@ -0,0 +1,31 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/16cc580.in +# +aiohttp==3.8.5 +aiohttp-jinja2==1.5.1 +aiosignal==1.3.1 +async-timeout==4.0.2 +attrs==23.1.0 +charset-normalizer==3.2.0 +coverage[toml]==7.2.7 +frozenlist==1.4.0 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +jinja2==3.1.2 +markupsafe==2.1.3 +mock==5.1.0 +multidict==6.0.4 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-aiohttp==1.0.4 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +yarl==1.9.2 diff --git a/.riot/requirements/16d62ae.txt b/.riot/requirements/16d62ae.txt new file mode 100644 index 00000000000..830563ceed7 --- /dev/null +++ b/.riot/requirements/16d62ae.txt @@ -0,0 +1,20 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/16d62ae.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +jinja2==3.1.2 +markupsafe==2.1.3 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/171ef96.txt b/.riot/requirements/171ef96.txt new file mode 100644 index 00000000000..701704f3df5 --- /dev/null +++ b/.riot/requirements/171ef96.txt @@ -0,0 +1,20 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/171ef96.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pymemcache==3.4.4 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +six==1.16.0 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/1767260.txt b/.riot/requirements/1767260.txt new file mode 100644 index 00000000000..926b92fee68 --- /dev/null +++ b/.riot/requirements/1767260.txt @@ -0,0 +1,22 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1767260.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +httpretty==0.9.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +msgpack==1.0.5 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +six==1.16.0 +sortedcontainers==2.4.0 +structlog==23.1.0 diff --git a/.riot/requirements/176c954.txt b/.riot/requirements/176c954.txt new file mode 100644 index 00000000000..c1a1af00426 --- /dev/null +++ b/.riot/requirements/176c954.txt @@ -0,0 +1,29 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/176c954.in +# +attrs==23.1.0 +blinker==1.6.2 +click==8.1.6 +coverage[toml]==7.2.7 +flask==2.3.2 +flask-caching==1.10.1 +hypothesis==6.45.0 +iniconfig==2.0.0 +itsdangerous==2.1.2 +jinja2==3.1.2 +markupsafe==2.1.3 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +python-memcached==1.59 +redis==2.10.6 +six==1.16.0 +sortedcontainers==2.4.0 +werkzeug==2.3.6 diff --git a/.riot/requirements/179d3fd.txt b/.riot/requirements/179d3fd.txt new file mode 100644 index 00000000000..95a4c10e25c --- /dev/null +++ b/.riot/requirements/179d3fd.txt @@ -0,0 +1,22 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/179d3fd.in +# +attrs==20.1.0 +coverage[toml]==7.2.7 +httpretty==0.9.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +msgpack==1.0.5 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +six==1.16.0 +sortedcontainers==2.4.0 +structlog==23.1.0 diff --git a/.riot/requirements/17c2d6c.txt b/.riot/requirements/17c2d6c.txt new file mode 100644 index 00000000000..77779c403b7 --- /dev/null +++ b/.riot/requirements/17c2d6c.txt @@ -0,0 +1,27 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/17c2d6c.in +# +anyio==3.7.1 +asgiref==3.7.2 +attrs==23.1.0 +certifi==2023.7.22 +coverage[toml]==7.2.7 +h11==0.14.0 +httpcore==0.17.3 +httpx==0.24.1 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sniffio==1.3.0 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/17ca8a8.txt b/.riot/requirements/17ca8a8.txt new file mode 100644 index 00000000000..7653f3cea3e --- /dev/null +++ b/.riot/requirements/17ca8a8.txt @@ -0,0 +1,32 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/17ca8a8.in +# +attrs==23.1.0 +blinker==1.6.2 +certifi==2023.7.22 +charset-normalizer==3.2.0 +click==8.1.6 +coverage[toml]==7.2.7 +flask==2.0.3 +hypothesis==6.45.0 +idna==3.4 +importlib-metadata==6.0.0 +iniconfig==2.0.0 +itsdangerous==2.1.2 +jinja2==3.1.2 +markupsafe==2.1.3 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +requests==2.31.0 +sortedcontainers==2.4.0 +urllib3==2.0.4 +werkzeug==2.3.6 +zipp==3.16.2 diff --git a/.riot/requirements/18256e4.txt b/.riot/requirements/18256e4.txt new file mode 100644 index 00000000000..fdc749e4803 --- /dev/null +++ b/.riot/requirements/18256e4.txt @@ -0,0 +1,28 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/18256e4.in +# +aiohttp==3.8.5 +aiosignal==1.3.1 +async-timeout==4.0.2 +attrs==23.1.0 +charset-normalizer==3.2.0 +coverage[toml]==7.2.7 +frozenlist==1.4.0 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +mock==5.1.0 +multidict==6.0.4 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-aiohttp==1.0.4 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +yarl==1.9.2 diff --git a/.riot/requirements/18471e1.txt b/.riot/requirements/18471e1.txt new file mode 100644 index 00000000000..76aa51482e8 --- /dev/null +++ b/.riot/requirements/18471e1.txt @@ -0,0 +1,25 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/18471e1.in +# +attrs==23.1.0 +certifi==2023.7.22 +charset-normalizer==3.2.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +requests==2.31.0 +requests-mock==1.11.0 +six==1.16.0 +sortedcontainers==2.4.0 +urllib3==2.0.4 diff --git a/.riot/requirements/1853197.txt b/.riot/requirements/1853197.txt new file mode 100644 index 00000000000..be946a75e54 --- /dev/null +++ b/.riot/requirements/1853197.txt @@ -0,0 +1,19 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1853197.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +falcon==3.0.1 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/18cd02f.txt b/.riot/requirements/18cd02f.txt new file mode 100644 index 00000000000..2942b411626 --- /dev/null +++ b/.riot/requirements/18cd02f.txt @@ -0,0 +1,79 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/18cd02f.in +# +attrs==23.1.0 +aws-sam-translator==1.73.0 +aws-xray-sdk==2.12.0 +boto3==1.28.23 +botocore==1.31.23 +certifi==2023.7.22 +cffi==1.15.1 +cfn-lint==0.79.6 +charset-normalizer==3.2.0 +coverage[toml]==7.2.7 +cryptography==41.0.3 +docker==6.1.3 +ecdsa==0.18.0 +graphql-core==3.2.3 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +jinja2==3.1.2 +jmespath==1.0.1 +jschema-to-python==1.2.3 +jsondiff==2.0.0 +jsonpatch==1.33 +jsonpickle==3.0.1 +jsonpointer==2.4 +jsonschema==4.17.3 +jsonschema-spec==0.1.6 +junit-xml==1.9 +lazy-object-proxy==1.9.0 +markupsafe==2.1.3 +mock==5.1.0 +moto[all]==4.1.14 +mpmath==1.3.0 +networkx==3.1 +openapi-schema-validator==0.4.4 +openapi-spec-validator==0.5.7 +opentracing==2.4.0 +packaging==23.1 +pathable==0.4.3 +pbr==5.11.1 +pluggy==1.2.0 +py-partiql-parser==0.3.6 +pyasn1==0.5.0 +pycparser==2.21 +pydantic==1.10.12 +pyparsing==3.1.1 +pyrsistent==0.19.3 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +python-dateutil==2.8.2 +python-jose[cryptography]==3.3.0 +pyyaml==6.0.1 +regex==2023.8.8 +requests==2.31.0 +responses==0.23.3 +rfc3339-validator==0.1.4 +rsa==4.9 +s3transfer==0.6.1 +sarif-om==1.0.4 +six==1.16.0 +sortedcontainers==2.4.0 +sshpubkeys==3.3.1 +sympy==1.12 +types-pyyaml==6.0.12.11 +typing-extensions==4.7.1 +urllib3==1.26.16 +websocket-client==1.6.1 +werkzeug==2.3.6 +wrapt==1.15.0 +xmltodict==0.13.0 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/18dfaeb.txt b/.riot/requirements/18dfaeb.txt new file mode 100644 index 00000000000..d390daaae51 --- /dev/null +++ b/.riot/requirements/18dfaeb.txt @@ -0,0 +1,32 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/18dfaeb.in +# +attrs==23.1.0 +blinker==1.6.2 +certifi==2023.7.22 +charset-normalizer==3.2.0 +click==8.1.6 +coverage[toml]==7.2.7 +flask==2.3.2 +hypothesis==6.45.0 +idna==3.4 +importlib-metadata==6.0.0 +iniconfig==2.0.0 +itsdangerous==2.1.2 +jinja2==3.1.2 +markupsafe==2.1.3 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +requests==2.31.0 +sortedcontainers==2.4.0 +urllib3==2.0.4 +werkzeug==2.3.6 +zipp==3.16.2 diff --git a/.riot/requirements/1965d19.txt b/.riot/requirements/1965d19.txt new file mode 100644 index 00000000000..7e21fa4763c --- /dev/null +++ b/.riot/requirements/1965d19.txt @@ -0,0 +1,20 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1965d19.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +jinja2==3.0.3 +markupsafe==2.1.3 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/1996920.txt b/.riot/requirements/1996920.txt new file mode 100644 index 00000000000..ea1116f65bc --- /dev/null +++ b/.riot/requirements/1996920.txt @@ -0,0 +1,22 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1996920.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +httpretty==0.9.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +msgpack==1.0.5 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +six==1.16.0 +sortedcontainers==2.4.0 +structlog==23.1.0 diff --git a/.riot/requirements/19af47c.txt b/.riot/requirements/19af47c.txt new file mode 100644 index 00000000000..437324d23af --- /dev/null +++ b/.riot/requirements/19af47c.txt @@ -0,0 +1,24 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/19af47c.in +# +asgiref==3.7.2 +attrs==23.1.0 +coverage[toml]==7.2.7 +django==4.2.4 +djangorestframework==3.14.0 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-django==3.10.0 +pytest-mock==3.11.1 +pytz==2023.3 +sortedcontainers==2.4.0 +sqlparse==0.4.4 diff --git a/.riot/requirements/19c5517.txt b/.riot/requirements/19c5517.txt new file mode 100644 index 00000000000..7ebe2b75ab9 --- /dev/null +++ b/.riot/requirements/19c5517.txt @@ -0,0 +1,24 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/19c5517.in +# +asgiref==3.7.2 +attrs==23.1.0 +coverage[toml]==7.2.7 +django==3.2.20 +djangorestframework==3.11.2 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-django==3.10.0 +pytest-mock==3.11.1 +pytz==2023.3 +sortedcontainers==2.4.0 +sqlparse==0.4.4 diff --git a/.riot/requirements/19eb948.txt b/.riot/requirements/19eb948.txt new file mode 100644 index 00000000000..2dea36e05b2 --- /dev/null +++ b/.riot/requirements/19eb948.txt @@ -0,0 +1,29 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/19eb948.in +# +attrs==23.1.0 +blinker==1.6.2 +click==7.1.2 +coverage[toml]==7.2.7 +flask==1.1.4 +flask-caching==1.10.1 +hypothesis==6.45.0 +iniconfig==2.0.0 +itsdangerous==1.1.0 +jinja2==2.11.3 +markupsafe==1.1.1 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +python-memcached==1.59 +redis==2.10.6 +six==1.16.0 +sortedcontainers==2.4.0 +werkzeug==1.0.1 diff --git a/.riot/requirements/19f5030.txt b/.riot/requirements/19f5030.txt new file mode 100644 index 00000000000..99c2dde38f2 --- /dev/null +++ b/.riot/requirements/19f5030.txt @@ -0,0 +1,30 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/19f5030.in +# +attrs==23.1.0 +blinker==1.6.2 +cachelib==0.9.0 +click==8.1.6 +coverage[toml]==7.2.7 +flask==2.3.2 +flask-caching==2.0.2 +hypothesis==6.45.0 +iniconfig==2.0.0 +itsdangerous==2.1.2 +jinja2==3.1.2 +markupsafe==2.1.3 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +python-memcached==1.59 +redis==2.10.6 +six==1.16.0 +sortedcontainers==2.4.0 +werkzeug==2.3.6 diff --git a/.riot/requirements/1a039ba.txt b/.riot/requirements/1a039ba.txt new file mode 100644 index 00000000000..2c39b94daa7 --- /dev/null +++ b/.riot/requirements/1a039ba.txt @@ -0,0 +1,19 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1a039ba.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +falcon==3.1.1 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/1a26cde.txt b/.riot/requirements/1a26cde.txt new file mode 100644 index 00000000000..8fbaf6e0405 --- /dev/null +++ b/.riot/requirements/1a26cde.txt @@ -0,0 +1,21 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1a26cde.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +dnspython==2.4.2 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +mongoengine==0.27.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pymongo==4.4.1 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/1a60c2e.txt b/.riot/requirements/1a60c2e.txt new file mode 100644 index 00000000000..668f582e305 --- /dev/null +++ b/.riot/requirements/1a60c2e.txt @@ -0,0 +1,23 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1a60c2e.in +# +attrs==23.1.0 +certifi==2023.7.22 +coverage[toml]==7.2.7 +elasticsearch==1.6.0 +elasticsearch6==6.8.2 +elasticsearch7==7.13.4 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +urllib3==1.26.16 diff --git a/.riot/requirements/1a630b3.txt b/.riot/requirements/1a630b3.txt new file mode 100644 index 00000000000..94a77b9f6a9 --- /dev/null +++ b/.riot/requirements/1a630b3.txt @@ -0,0 +1,19 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1a630b3.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +msgpack==1.0.5 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/1af4f34.txt b/.riot/requirements/1af4f34.txt new file mode 100644 index 00000000000..b24fde8c6bf --- /dev/null +++ b/.riot/requirements/1af4f34.txt @@ -0,0 +1,36 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1af4f34.in +# +aiobotocore==1.4.2 +aiohttp==3.8.5 +aioitertools==0.11.0 +aiosignal==1.3.1 +async-generator==1.10 +async-timeout==4.0.2 +attrs==23.1.0 +botocore==1.20.106 +charset-normalizer==3.2.0 +coverage[toml]==7.2.7 +frozenlist==1.4.0 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +jmespath==0.10.0 +mock==5.1.0 +multidict==6.0.4 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +python-dateutil==2.8.2 +six==1.16.0 +sortedcontainers==2.4.0 +urllib3==1.26.16 +wrapt==1.15.0 +yarl==1.9.2 diff --git a/.riot/requirements/1af552c.txt b/.riot/requirements/1af552c.txt new file mode 100644 index 00000000000..574284c6bd1 --- /dev/null +++ b/.riot/requirements/1af552c.txt @@ -0,0 +1,20 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1af552c.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +graphql-core==3.2.3 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/1b0b05e.txt b/.riot/requirements/1b0b05e.txt new file mode 100644 index 00000000000..6d5463990e8 --- /dev/null +++ b/.riot/requirements/1b0b05e.txt @@ -0,0 +1,26 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1b0b05e.in +# +anyio==3.7.1 +attrs==23.1.0 +certifi==2023.7.22 +coverage[toml]==7.2.7 +h11==0.14.0 +httpcore==0.17.3 +httpx==0.24.1 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sniffio==1.3.0 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/1b728bf.txt b/.riot/requirements/1b728bf.txt new file mode 100644 index 00000000000..61c606cd3cd --- /dev/null +++ b/.riot/requirements/1b728bf.txt @@ -0,0 +1,19 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1b728bf.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pylibmc==1.6.3 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/130cf94.txt b/.riot/requirements/1b7cb49.txt similarity index 50% rename from .riot/requirements/130cf94.txt rename to .riot/requirements/1b7cb49.txt index 734336e7867..9f56c1e6c73 100644 --- a/.riot/requirements/130cf94.txt +++ b/.riot/requirements/1b7cb49.txt @@ -1,22 +1,19 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/130cf94.in +# pip-compile --no-annotate --resolver=backtracking .riot/requirements/1b7cb49.in # -attrs==23.1.0 -coverage[toml]==7.2.3 -httpretty==0.9.7 +attrs==22.2.0 +coverage[toml]==7.2.2 hypothesis==6.45.0 iniconfig==2.0.0 -mock==5.0.2 -msgpack==1.0.5 +mock==5.0.1 opentracing==2.4.0 -packaging==23.1 +packaging==23.0 pluggy==1.0.0 -pytest==7.3.1 +pytest==7.2.2 pytest-cov==4.0.0 pytest-mock==3.10.0 -six==1.16.0 sortedcontainers==2.4.0 -structlog==23.1.0 +tornado==6.2 diff --git a/.riot/requirements/1b83c72.txt b/.riot/requirements/1b83c72.txt new file mode 100644 index 00000000000..efb64f5b830 --- /dev/null +++ b/.riot/requirements/1b83c72.txt @@ -0,0 +1,21 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1b83c72.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +dnspython==2.4.2 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +mongoengine==0.27.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pymongo==4.4.1 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/1bc5161.txt b/.riot/requirements/1bc5161.txt new file mode 100644 index 00000000000..526abfb3adb --- /dev/null +++ b/.riot/requirements/1bc5161.txt @@ -0,0 +1,38 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1bc5161.in +# +astunparse==1.6.3 +attrs==23.1.0 +blinker==1.6.2 +certifi==2023.7.22 +cffi==1.15.1 +charset-normalizer==3.2.0 +click==8.1.6 +coverage[toml]==7.2.7 +cryptography==41.0.3 +flask==2.3.2 +gunicorn==21.2.0 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +itsdangerous==2.1.2 +jinja2==3.1.2 +markupsafe==2.1.3 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pycparser==2.21 +pycryptodome==3.18.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +requests==2.31.0 +six==1.16.0 +sortedcontainers==2.4.0 +urllib3==2.0.4 +werkzeug==2.3.6 +wheel==0.41.1 diff --git a/.riot/requirements/1bce306.txt b/.riot/requirements/1bce306.txt new file mode 100644 index 00000000000..0d09efb43b9 --- /dev/null +++ b/.riot/requirements/1bce306.txt @@ -0,0 +1,41 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1bce306.in +# +attrs==23.1.0 +beautifulsoup4==4.12.2 +certifi==2023.7.22 +charset-normalizer==3.2.0 +coverage[toml]==7.2.7 +hupper==1.12 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pastedeploy==3.0.1 +plaster==1.1.2 +plaster-pastedeploy==1.0.1 +pluggy==1.2.0 +pserve-test-app @ file:///Users/yun.kim/go/src/github.com/DataDog/dd-trace-py/tests/contrib/pyramid/pserve_app +pyramid==2.0.1 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +requests==2.31.0 +sortedcontainers==2.4.0 +soupsieve==2.4.1 +translationstring==1.4 +urllib3==2.0.4 +venusian==3.0.0 +waitress==2.1.2 +webob==1.8.7 +webtest==3.0.0 +zope-deprecation==5.0 +zope-interface==6.0 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/1c45659.txt b/.riot/requirements/1c45659.txt new file mode 100644 index 00000000000..865768ac0dd --- /dev/null +++ b/.riot/requirements/1c45659.txt @@ -0,0 +1,20 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1c45659.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pymemcache==3.5.2 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +six==1.16.0 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/1c810ba.txt b/.riot/requirements/1c810ba.txt new file mode 100644 index 00000000000..7b42737dbbd --- /dev/null +++ b/.riot/requirements/1c810ba.txt @@ -0,0 +1,20 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1c810ba.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +elasticsearch6==6.8.2 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +urllib3==2.0.4 diff --git a/.riot/requirements/1c94482.txt b/.riot/requirements/1c94482.txt new file mode 100644 index 00000000000..efbe04b5e99 --- /dev/null +++ b/.riot/requirements/1c94482.txt @@ -0,0 +1,31 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1c94482.in +# +attrs==23.1.0 +certifi==2023.7.22 +charset-normalizer==3.2.0 +coverage[toml]==7.2.7 +gevent==23.7.0 +greenlet==3.0.0a1 +gunicorn==20.0.4 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +requests==2.31.0 +sortedcontainers==2.4.0 +urllib3==2.0.4 +zope-event==5.0 +zope-interface==6.0 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/1c9a3d8.txt b/.riot/requirements/1c9a3d8.txt new file mode 100644 index 00000000000..054c11b50ff --- /dev/null +++ b/.riot/requirements/1c9a3d8.txt @@ -0,0 +1,68 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1c9a3d8.in +# +attrs==23.1.0 +aws-sam-translator==1.73.0 +aws-xray-sdk==2.12.0 +boto==2.49.0 +boto3==1.28.23 +botocore==1.31.23 +certifi==2023.7.22 +cffi==1.15.1 +cfn-lint==0.53.1 +charset-normalizer==3.2.0 +coverage[toml]==7.2.7 +cryptography==41.0.3 +docker==6.1.3 +ecdsa==0.14.1 +hypothesis==6.45.0 +idna==2.10 +iniconfig==2.0.0 +jinja2==2.11.3 +jmespath==1.0.1 +jsondiff==2.0.0 +jsonpatch==1.33 +jsonpointer==2.4 +jsonschema==3.2.0 +junit-xml==1.9 +markupsafe==1.1.1 +mock==5.1.0 +more-itertools==10.1.0 +moto==1.3.16 +networkx==2.8.8 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pyasn1==0.5.0 +pycparser==2.21 +pydantic==1.10.12 +pynamodb==5.5.0 +pyrsistent==0.19.3 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +python-dateutil==2.8.2 +python-jose[cryptography]==3.3.0 +pytz==2023.3 +pyyaml==6.0.1 +requests==2.31.0 +responses==0.23.3 +rsa==4.9 +s3transfer==0.6.1 +six==1.16.0 +sortedcontainers==2.4.0 +sshpubkeys==3.3.1 +types-pyyaml==6.0.12.11 +typing-extensions==4.7.1 +urllib3==1.26.16 +websocket-client==1.6.1 +werkzeug==2.1.2 +wrapt==1.15.0 +xmltodict==0.13.0 +zipp==3.16.2 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/1d0d03e.txt b/.riot/requirements/1d0d03e.txt new file mode 100644 index 00000000000..8e2b89a66c3 --- /dev/null +++ b/.riot/requirements/1d0d03e.txt @@ -0,0 +1,19 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1d0d03e.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/1d2c37a.txt b/.riot/requirements/1d2c37a.txt new file mode 100644 index 00000000000..9b9b0fec257 --- /dev/null +++ b/.riot/requirements/1d2c37a.txt @@ -0,0 +1,68 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1d2c37a.in +# +attrs==23.1.0 +aws-sam-translator==1.73.0 +aws-xray-sdk==2.12.0 +boto==2.49.0 +boto3==1.28.23 +botocore==1.31.23 +certifi==2023.7.22 +cffi==1.15.1 +cfn-lint==0.53.1 +charset-normalizer==3.2.0 +coverage[toml]==7.2.7 +cryptography==41.0.3 +docker==6.1.3 +ecdsa==0.14.1 +hypothesis==6.45.0 +idna==2.10 +iniconfig==2.0.0 +jinja2==2.11.3 +jmespath==1.0.1 +jsondiff==2.0.0 +jsonpatch==1.33 +jsonpointer==2.4 +jsonschema==3.2.0 +junit-xml==1.9 +markupsafe==1.1.1 +mock==5.1.0 +more-itertools==10.1.0 +moto==1.3.16 +networkx==2.8.8 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pyasn1==0.5.0 +pycparser==2.21 +pydantic==1.10.12 +pynamodb==5.5.0 +pyrsistent==0.19.3 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +python-dateutil==2.8.2 +python-jose[cryptography]==3.3.0 +pytz==2023.3 +pyyaml==6.0.1 +requests==2.31.0 +responses==0.23.3 +rsa==4.9 +s3transfer==0.6.1 +six==1.16.0 +sortedcontainers==2.4.0 +sshpubkeys==3.3.1 +types-pyyaml==6.0.12.11 +typing-extensions==4.7.1 +urllib3==1.26.16 +websocket-client==1.6.1 +werkzeug==2.1.2 +wrapt==1.15.0 +xmltodict==0.13.0 +zipp==3.16.2 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/1d725d8.txt b/.riot/requirements/1d725d8.txt new file mode 100644 index 00000000000..3dce6c590e3 --- /dev/null +++ b/.riot/requirements/1d725d8.txt @@ -0,0 +1,19 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1d725d8.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +falcon==3.1.1 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/1d78810.txt b/.riot/requirements/1d78810.txt new file mode 100644 index 00000000000..415861e1229 --- /dev/null +++ b/.riot/requirements/1d78810.txt @@ -0,0 +1,32 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1d78810.in +# +attrs==23.1.0 +certifi==2023.7.22 +charset-normalizer==3.2.0 +click==8.1.6 +coverage[toml]==7.2.7 +flask==2.2.3 +gunicorn==21.2.0 +httpretty==0.9.7 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +itsdangerous==2.1.2 +jinja2==3.1.2 +markupsafe==2.1.3 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +requests==2.31.0 +six==1.16.0 +sortedcontainers==2.4.0 +urllib3==2.0.4 +werkzeug==2.3.6 diff --git a/.riot/requirements/1d9611e.txt b/.riot/requirements/1d9611e.txt new file mode 100644 index 00000000000..dc7f27a43f3 --- /dev/null +++ b/.riot/requirements/1d9611e.txt @@ -0,0 +1,31 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1d9611e.in +# +aiohttp==3.8.5 +aiohttp-jinja2==1.5.1 +aiosignal==1.3.1 +async-timeout==4.0.2 +attrs==23.1.0 +charset-normalizer==3.2.0 +coverage[toml]==7.2.7 +frozenlist==1.4.0 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +jinja2==3.1.2 +markupsafe==2.1.3 +mock==5.1.0 +multidict==6.0.4 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-aiohttp==1.0.4 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +yarl==1.9.2 diff --git a/.riot/requirements/1dda3e1.txt b/.riot/requirements/1dda3e1.txt new file mode 100644 index 00000000000..998d7540215 --- /dev/null +++ b/.riot/requirements/1dda3e1.txt @@ -0,0 +1,28 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1dda3e1.in +# +aiohttp==3.8.5 +aiosignal==1.3.1 +async-timeout==4.0.2 +attrs==23.1.0 +charset-normalizer==3.2.0 +coverage[toml]==7.2.7 +frozenlist==1.4.0 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +mock==5.1.0 +multidict==6.0.4 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-aiohttp==1.0.4 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +yarl==1.9.2 diff --git a/.riot/requirements/1df06ea.txt b/.riot/requirements/1df06ea.txt new file mode 100644 index 00000000000..812d5834168 --- /dev/null +++ b/.riot/requirements/1df06ea.txt @@ -0,0 +1,20 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1df06ea.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +redis==3.5.3 +redis-py-cluster==2.1.3 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/1dfb998.txt b/.riot/requirements/1dfb998.txt new file mode 100644 index 00000000000..b603229b4f8 --- /dev/null +++ b/.riot/requirements/1dfb998.txt @@ -0,0 +1,23 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1dfb998.in +# +aniso8601==9.0.1 +attrs==23.1.0 +coverage[toml]==7.2.7 +graphene==3.3 +graphql-core==3.1.7 +graphql-relay==3.1.5 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/1e1f9ed.txt b/.riot/requirements/1e1f9ed.txt new file mode 100644 index 00000000000..e047c3a5a9a --- /dev/null +++ b/.riot/requirements/1e1f9ed.txt @@ -0,0 +1,20 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1e1f9ed.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +elasticsearch==7.6.0 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +urllib3==2.0.4 diff --git a/.riot/requirements/1e68324.txt b/.riot/requirements/1e68324.txt new file mode 100644 index 00000000000..14cf1dfb69d --- /dev/null +++ b/.riot/requirements/1e68324.txt @@ -0,0 +1,19 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1e68324.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +psycopg2-binary==2.9.7 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/1e690e1.txt b/.riot/requirements/1e690e1.txt new file mode 100644 index 00000000000..9fcf20f8e42 --- /dev/null +++ b/.riot/requirements/1e690e1.txt @@ -0,0 +1,22 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1e690e1.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +httpretty==0.9.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +msgpack==1.0.5 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +six==1.16.0 +sortedcontainers==2.4.0 +structlog==23.1.0 diff --git a/.riot/requirements/1ea67e6.txt b/.riot/requirements/1ea67e6.txt new file mode 100644 index 00000000000..db8e9501d33 --- /dev/null +++ b/.riot/requirements/1ea67e6.txt @@ -0,0 +1,28 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1ea67e6.in +# +anyio==3.7.1 +attrs==23.1.0 +certifi==2023.7.22 +charset-normalizer==3.2.0 +coverage[toml]==7.2.7 +h11==0.12.0 +httpcore==0.14.7 +httpx==0.22.0 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +rfc3986[idna2008]==1.5.0 +sniffio==1.3.0 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/1ed4b2f.txt b/.riot/requirements/1ed4b2f.txt new file mode 100644 index 00000000000..59122bcb269 --- /dev/null +++ b/.riot/requirements/1ed4b2f.txt @@ -0,0 +1,21 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1ed4b2f.in +# +attrs==23.1.0 +certifi==2023.7.22 +coverage[toml]==7.2.7 +elasticsearch==7.10.1 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +urllib3==1.26.16 diff --git a/.riot/requirements/1f114a1.txt b/.riot/requirements/1f114a1.txt new file mode 100644 index 00000000000..7bc5b92db38 --- /dev/null +++ b/.riot/requirements/1f114a1.txt @@ -0,0 +1,20 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1f114a1.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +graphql-core==3.1.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/1f598f0.txt b/.riot/requirements/1f598f0.txt new file mode 100644 index 00000000000..7a79bf29317 --- /dev/null +++ b/.riot/requirements/1f598f0.txt @@ -0,0 +1,20 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1f598f0.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +decorator==5.1.1 +dogpile-cache==0.9.2 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/1f6fa90.txt b/.riot/requirements/1f6fa90.txt deleted file mode 100644 index 6485a545785..00000000000 --- a/.riot/requirements/1f6fa90.txt +++ /dev/null @@ -1,22 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/1f6fa90.in -# -attrs==20.1.0 -coverage[toml]==7.2.3 -httpretty==0.9.7 -hypothesis==6.45.0 -iniconfig==2.0.0 -mock==5.0.2 -msgpack==1.0.5 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.0.0 -pytest==7.3.1 -pytest-cov==4.0.0 -pytest-mock==3.10.0 -six==1.16.0 -sortedcontainers==2.4.0 -structlog==23.1.0 diff --git a/.riot/requirements/1fd2c20.txt b/.riot/requirements/1fd2c20.txt new file mode 100644 index 00000000000..a01a8e1b930 --- /dev/null +++ b/.riot/requirements/1fd2c20.txt @@ -0,0 +1,21 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1fd2c20.in +# +aiomysql==0.1.1 +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pymysql==1.1.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/1fe6c51.txt b/.riot/requirements/1fe6c51.txt new file mode 100644 index 00000000000..c196a2c3dd8 --- /dev/null +++ b/.riot/requirements/1fe6c51.txt @@ -0,0 +1,20 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1fe6c51.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +elasticsearch6==6.8.2 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +urllib3==2.0.4 diff --git a/.riot/requirements/1ffd39b.txt b/.riot/requirements/1ffd39b.txt new file mode 100644 index 00000000000..93b2ce27a71 --- /dev/null +++ b/.riot/requirements/1ffd39b.txt @@ -0,0 +1,24 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1ffd39b.in +# +asgiref==3.7.2 +attrs==23.1.0 +coverage[toml]==7.2.7 +django==3.2.20 +django-hosts==4.0 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-django==3.10.0 +pytest-mock==3.11.1 +pytz==2023.3 +sortedcontainers==2.4.0 +sqlparse==0.4.4 diff --git a/.riot/requirements/246da88.txt b/.riot/requirements/246da88.txt new file mode 100644 index 00000000000..ae3ec113961 --- /dev/null +++ b/.riot/requirements/246da88.txt @@ -0,0 +1,19 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/246da88.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/25676e3.txt b/.riot/requirements/25676e3.txt new file mode 100644 index 00000000000..0eaa276288a --- /dev/null +++ b/.riot/requirements/25676e3.txt @@ -0,0 +1,22 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/25676e3.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +decorator==5.1.1 +dogpile-cache==1.2.2 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pbr==5.11.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +stevedore==5.1.0 diff --git a/.riot/requirements/277a719.txt b/.riot/requirements/277a719.txt new file mode 100644 index 00000000000..78912cb11de --- /dev/null +++ b/.riot/requirements/277a719.txt @@ -0,0 +1,19 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/277a719.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mariadb==1.1.7 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/29c779d.txt b/.riot/requirements/29c779d.txt new file mode 100644 index 00000000000..da67ef801cd --- /dev/null +++ b/.riot/requirements/29c779d.txt @@ -0,0 +1,27 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/29c779d.in +# +anyio==3.7.1 +asgiref==3.7.2 +attrs==23.1.0 +certifi==2023.7.22 +coverage[toml]==7.2.7 +h11==0.14.0 +httpcore==0.17.3 +httpx==0.24.1 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sniffio==1.3.0 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/2bd75d2.txt b/.riot/requirements/2bd75d2.txt new file mode 100644 index 00000000000..fc99a62bbad --- /dev/null +++ b/.riot/requirements/2bd75d2.txt @@ -0,0 +1,18 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/2bd75d2.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/2d9a1f8.txt b/.riot/requirements/2d9a1f8.txt new file mode 100644 index 00000000000..b59960d12d5 --- /dev/null +++ b/.riot/requirements/2d9a1f8.txt @@ -0,0 +1,19 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/2d9a1f8.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +psycopg2-binary==2.9.7 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/2f2479c.txt b/.riot/requirements/2f2479c.txt new file mode 100644 index 00000000000..269c0e5da73 --- /dev/null +++ b/.riot/requirements/2f2479c.txt @@ -0,0 +1,31 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/2f2479c.in +# +attrs==23.1.0 +certifi==2023.7.22 +charset-normalizer==3.2.0 +coverage[toml]==7.2.7 +gevent==23.7.0 +greenlet==3.0.0a1 +gunicorn==21.2.0 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +requests==2.31.0 +sortedcontainers==2.4.0 +urllib3==2.0.4 +zope-event==5.0 +zope-interface==6.0 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/2f76f48.txt b/.riot/requirements/2f76f48.txt new file mode 100644 index 00000000000..067b0086d97 --- /dev/null +++ b/.riot/requirements/2f76f48.txt @@ -0,0 +1,21 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/2f76f48.in +# +asynctest==0.13.0 +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +more-itertools==8.10.0 +msgpack==1.0.5 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/34653f4.txt b/.riot/requirements/34653f4.txt new file mode 100644 index 00000000000..4b6a3ca715b --- /dev/null +++ b/.riot/requirements/34653f4.txt @@ -0,0 +1,25 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/34653f4.in +# +attrs==23.1.0 +certifi==2023.7.22 +charset-normalizer==3.2.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +requests==2.31.0 +requests-mock==1.11.0 +six==1.16.0 +sortedcontainers==2.4.0 +urllib3==2.0.4 diff --git a/.riot/requirements/3591bdc.txt b/.riot/requirements/3591bdc.txt new file mode 100644 index 00000000000..5d3d9952f40 --- /dev/null +++ b/.riot/requirements/3591bdc.txt @@ -0,0 +1,32 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/3591bdc.in +# +attrs==23.1.0 +blinker==1.6.2 +certifi==2023.7.22 +charset-normalizer==3.2.0 +click==8.1.6 +coverage[toml]==7.2.7 +flask==2.3.2 +hypothesis==6.45.0 +idna==3.4 +importlib-metadata==6.0.0 +iniconfig==2.0.0 +itsdangerous==2.1.2 +jinja2==3.1.2 +markupsafe==2.1.3 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +requests==2.31.0 +sortedcontainers==2.4.0 +urllib3==2.0.4 +werkzeug==2.3.6 +zipp==3.16.2 diff --git a/.riot/requirements/3d67ff0.txt b/.riot/requirements/3d67ff0.txt new file mode 100644 index 00000000000..368afa640e2 --- /dev/null +++ b/.riot/requirements/3d67ff0.txt @@ -0,0 +1,21 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/3d67ff0.in +# +attrs==23.1.0 +click==8.1.6 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +redis==4.6.0 +rq==1.15.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/3e91d07.txt b/.riot/requirements/3e91d07.txt new file mode 100644 index 00000000000..8b4e7de2170 --- /dev/null +++ b/.riot/requirements/3e91d07.txt @@ -0,0 +1,36 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/3e91d07.in +# +aiobotocore==2.5.4 +aiohttp==3.8.5 +aioitertools==0.11.0 +aiosignal==1.3.1 +async-generator==1.10 +async-timeout==4.0.2 +attrs==23.1.0 +botocore==1.31.17 +charset-normalizer==3.2.0 +coverage[toml]==7.2.7 +frozenlist==1.4.0 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +jmespath==1.0.1 +mock==5.1.0 +multidict==6.0.4 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +python-dateutil==2.8.2 +six==1.16.0 +sortedcontainers==2.4.0 +urllib3==1.26.16 +wrapt==1.15.0 +yarl==1.9.2 diff --git a/.riot/requirements/3eacf0d.txt b/.riot/requirements/3eacf0d.txt new file mode 100644 index 00000000000..daaa945bd48 --- /dev/null +++ b/.riot/requirements/3eacf0d.txt @@ -0,0 +1,22 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/3eacf0d.in +# +attrs==20.1.0 +coverage[toml]==7.2.7 +httpretty==0.9.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +msgpack==1.0.5 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +six==1.16.0 +sortedcontainers==2.4.0 +structlog==23.1.0 diff --git a/.riot/requirements/4639c12.txt b/.riot/requirements/4639c12.txt new file mode 100644 index 00000000000..2215d631873 --- /dev/null +++ b/.riot/requirements/4639c12.txt @@ -0,0 +1,26 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/4639c12.in +# +attrs==23.1.0 +certifi==2023.7.22 +charset-normalizer==3.2.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +mock==5.1.0 +opensearch-py[requests]==2.3.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +python-dateutil==2.8.2 +requests==2.31.0 +six==1.16.0 +sortedcontainers==2.4.0 +urllib3==1.26.16 diff --git a/.riot/requirements/4ec2419.txt b/.riot/requirements/4ec2419.txt new file mode 100644 index 00000000000..4a7f0bd57a2 --- /dev/null +++ b/.riot/requirements/4ec2419.txt @@ -0,0 +1,28 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/4ec2419.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +glob2==0.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mako==1.2.4 +markupsafe==2.1.3 +mock==5.1.0 +more-itertools==8.10.0 +msgpack==1.0.5 +opentracing==2.4.0 +packaging==23.1 +parse==1.19.1 +parse-type==0.6.2 +pluggy==1.2.0 +py==1.11.0 +pytest==7.4.0 +pytest-bdd==6.0.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +six==1.16.0 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/4fad0fb.txt b/.riot/requirements/4fad0fb.txt new file mode 100644 index 00000000000..edc55769473 --- /dev/null +++ b/.riot/requirements/4fad0fb.txt @@ -0,0 +1,36 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/4fad0fb.in +# +aiobotocore==2.0.1 +aiohttp==3.8.5 +aioitertools==0.11.0 +aiosignal==1.3.1 +async-generator==1.10 +async-timeout==4.0.2 +attrs==23.1.0 +botocore==1.22.8 +charset-normalizer==3.2.0 +coverage[toml]==7.2.7 +frozenlist==1.4.0 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +jmespath==0.10.0 +mock==5.1.0 +multidict==6.0.4 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +python-dateutil==2.8.2 +six==1.16.0 +sortedcontainers==2.4.0 +urllib3==1.26.16 +wrapt==1.15.0 +yarl==1.9.2 diff --git a/.riot/requirements/4fef498.txt b/.riot/requirements/4fef498.txt new file mode 100644 index 00000000000..8eb778d2d28 --- /dev/null +++ b/.riot/requirements/4fef498.txt @@ -0,0 +1,20 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/4fef498.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +mongoengine==0.27.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pymongo==3.12.3 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/50151f5.txt b/.riot/requirements/50151f5.txt new file mode 100644 index 00000000000..db1af01e1aa --- /dev/null +++ b/.riot/requirements/50151f5.txt @@ -0,0 +1,30 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/50151f5.in +# +attrs==23.1.0 +blinker==1.6.2 +certifi==2023.7.22 +charset-normalizer==3.2.0 +click==8.1.6 +coverage[toml]==7.2.7 +flask==2.3.2 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +itsdangerous==2.1.2 +jinja2==3.1.2 +markupsafe==2.1.3 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +requests==2.31.0 +sortedcontainers==2.4.0 +urllib3==2.0.4 +werkzeug==2.3.6 diff --git a/.riot/requirements/5540194.txt b/.riot/requirements/5540194.txt new file mode 100644 index 00000000000..b36d52d9f57 --- /dev/null +++ b/.riot/requirements/5540194.txt @@ -0,0 +1,24 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/5540194.in +# +asgiref==3.7.2 +attrs==23.1.0 +coverage[toml]==7.2.7 +django==4.2.4 +djangorestframework==3.14.0 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-django==3.10.0 +pytest-mock==3.11.1 +pytz==2023.3 +sortedcontainers==2.4.0 +sqlparse==0.4.4 diff --git a/.riot/requirements/56b205e.txt b/.riot/requirements/56b205e.txt new file mode 100644 index 00000000000..0ac4b4c07d4 --- /dev/null +++ b/.riot/requirements/56b205e.txt @@ -0,0 +1,22 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/56b205e.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +decorator==5.1.1 +dogpile-cache==1.2.2 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pbr==5.11.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +stevedore==5.1.0 diff --git a/.riot/requirements/5883bdc.txt b/.riot/requirements/5883bdc.txt new file mode 100644 index 00000000000..fec7d2a7adf --- /dev/null +++ b/.riot/requirements/5883bdc.txt @@ -0,0 +1,34 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/5883bdc.in +# +aiofiles==23.2.1 +anyio==3.7.1 +attrs==23.1.0 +certifi==2023.7.22 +charset-normalizer==3.2.0 +coverage[toml]==7.2.7 +fastapi==0.86.0 +h11==0.14.0 +httpcore==0.17.3 +httpx==0.24.1 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pydantic==1.10.12 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +requests==2.31.0 +sniffio==1.3.0 +sortedcontainers==2.4.0 +starlette==0.20.4 +typing-extensions==4.7.1 +urllib3==2.0.4 diff --git a/.riot/requirements/5be816f.txt b/.riot/requirements/5be816f.txt new file mode 100644 index 00000000000..2a9c9b1ba27 --- /dev/null +++ b/.riot/requirements/5be816f.txt @@ -0,0 +1,21 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/5be816f.in +# +attrs==23.1.0 +certifi==2023.7.22 +coverage[toml]==7.2.7 +elasticsearch==7.8.1 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +urllib3==2.0.4 diff --git a/.riot/requirements/5c88126.txt b/.riot/requirements/5c88126.txt new file mode 100644 index 00000000000..580cbd122b6 --- /dev/null +++ b/.riot/requirements/5c88126.txt @@ -0,0 +1,20 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/5c88126.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mako==1.2.4 +markupsafe==2.1.3 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/6009fe3.txt b/.riot/requirements/6009fe3.txt new file mode 100644 index 00000000000..ce05769549a --- /dev/null +++ b/.riot/requirements/6009fe3.txt @@ -0,0 +1,20 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/6009fe3.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +elasticsearch1==1.10.0 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +urllib3==1.26.16 diff --git a/.riot/requirements/63bcee1.txt b/.riot/requirements/63bcee1.txt new file mode 100644 index 00000000000..1b639c74663 --- /dev/null +++ b/.riot/requirements/63bcee1.txt @@ -0,0 +1,66 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/63bcee1.in +# +ai21==1.2.4 +aiohttp==3.8.5 +aiosignal==1.3.1 +async-timeout==4.0.2 +attrs==23.1.0 +backoff==2.2.1 +certifi==2023.7.22 +charset-normalizer==3.2.0 +cohere==4.19.2 +coverage[toml]==7.2.7 +dataclasses-json==0.5.14 +dnspython==2.4.2 +exceptiongroup==1.1.2 +fastavro==1.8.2 +filelock==3.12.2 +frozenlist==1.4.0 +fsspec==2023.6.0 +huggingface-hub==0.16.4 +hypothesis==6.45.0 +idna==3.4 +importlib-metadata==6.8.0 +iniconfig==2.0.0 +langchain==0.0.192 +langchainplus-sdk==0.0.4 +loguru==0.7.0 +marshmallow==3.20.1 +mock==5.1.0 +multidict==6.0.4 +mypy-extensions==1.0.0 +numexpr==2.8.5 +numpy==1.25.2 +openai==0.27.8 +openapi-schema-pydantic==1.2.4 +opentracing==2.4.0 +packaging==23.1 +pinecone-client==2.2.2 +pluggy==1.2.0 +psutil==5.9.5 +pydantic==1.10.12 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +python-dateutil==2.8.2 +pyyaml==6.0.1 +regex==2023.8.8 +requests==2.31.0 +six==1.16.0 +sortedcontainers==2.4.0 +sqlalchemy==2.0.19 +tenacity==8.2.2 +tiktoken==0.4.0 +tqdm==4.66.1 +typing-extensions==4.7.1 +typing-inspect==0.9.0 +urllib3==2.0.4 +vcrpy==5.1.0 +wrapt==1.15.0 +yarl==1.9.2 +zipp==3.16.2 diff --git a/.riot/requirements/65afd8d.txt b/.riot/requirements/65afd8d.txt new file mode 100644 index 00000000000..813a01e8a7b --- /dev/null +++ b/.riot/requirements/65afd8d.txt @@ -0,0 +1,21 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/65afd8d.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +dnspython==2.4.2 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +mongoengine==0.27.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pymongo==4.4.1 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/6ce2052.txt b/.riot/requirements/6ce2052.txt deleted file mode 100644 index 7b29258261e..00000000000 --- a/.riot/requirements/6ce2052.txt +++ /dev/null @@ -1,22 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/6ce2052.in -# -attrs==20.1.0 -coverage[toml]==7.2.3 -httpretty==0.9.7 -hypothesis==6.45.0 -iniconfig==2.0.0 -mock==5.0.2 -msgpack==1.0.5 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.0.0 -pytest==7.3.1 -pytest-cov==4.0.0 -pytest-mock==3.10.0 -six==1.16.0 -sortedcontainers==2.4.0 -structlog==23.1.0 diff --git a/.riot/requirements/14ffec7.txt b/.riot/requirements/8071a9d.txt similarity index 50% rename from .riot/requirements/14ffec7.txt rename to .riot/requirements/8071a9d.txt index e595f501857..58d965049e0 100644 --- a/.riot/requirements/14ffec7.txt +++ b/.riot/requirements/8071a9d.txt @@ -1,22 +1,19 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/14ffec7.in +# pip-compile --no-annotate --resolver=backtracking .riot/requirements/8071a9d.in # -attrs==23.1.0 -coverage[toml]==7.2.3 -httpretty==0.9.7 +attrs==22.2.0 +coverage[toml]==7.2.2 hypothesis==6.45.0 iniconfig==2.0.0 -mock==5.0.2 -msgpack==1.0.5 +mock==5.0.1 +mysqlclient==2.1.1 opentracing==2.4.0 -packaging==23.1 +packaging==23.0 pluggy==1.0.0 -pytest==7.3.1 +pytest==7.2.2 pytest-cov==4.0.0 pytest-mock==3.10.0 -six==1.16.0 sortedcontainers==2.4.0 -structlog==23.1.0 diff --git a/.riot/requirements/850dfa2.txt b/.riot/requirements/850dfa2.txt new file mode 100644 index 00000000000..29f2333d304 --- /dev/null +++ b/.riot/requirements/850dfa2.txt @@ -0,0 +1,38 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/850dfa2.in +# +annotated-types==0.5.0 +attrs==23.1.0 +autocommand==2.2.2 +cheroot==10.0.0 +cherrypy==18.8.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +inflect==7.0.0 +iniconfig==2.0.0 +jaraco-collections==4.3.0 +jaraco-context==4.3.0 +jaraco-functools==3.8.1 +jaraco-text==3.11.1 +mock==5.1.0 +more-itertools==8.10.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +portend==3.2.0 +pydantic==2.1.1 +pydantic-core==2.4.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +pytz==2023.3 +sortedcontainers==2.4.0 +tempora==5.5.0 +typing-extensions==4.7.1 +zc-lockfile==3.0.post1 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/8606bf2.txt b/.riot/requirements/8606bf2.txt new file mode 100644 index 00000000000..d118c7f5418 --- /dev/null +++ b/.riot/requirements/8606bf2.txt @@ -0,0 +1,31 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/8606bf2.in +# +aiohttp==3.8.5 +aiohttp-jinja2==1.5.1 +aiosignal==1.3.1 +async-timeout==4.0.2 +attrs==23.1.0 +charset-normalizer==3.2.0 +coverage[toml]==7.2.7 +frozenlist==1.4.0 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +jinja2==3.1.2 +markupsafe==2.1.3 +mock==5.1.0 +multidict==6.0.4 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-aiohttp==1.0.4 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +yarl==1.9.2 diff --git a/.riot/requirements/87af88b.txt b/.riot/requirements/87af88b.txt new file mode 100644 index 00000000000..bc45282325d --- /dev/null +++ b/.riot/requirements/87af88b.txt @@ -0,0 +1,25 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/87af88b.in +# +attrs==23.1.0 +certifi==2023.7.22 +charset-normalizer==3.2.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +requests==2.31.0 +requests-mock==1.11.0 +six==1.16.0 +sortedcontainers==2.4.0 +urllib3==2.0.4 diff --git a/.riot/requirements/89475ad.txt b/.riot/requirements/89475ad.txt new file mode 100644 index 00000000000..7e584e1ab20 --- /dev/null +++ b/.riot/requirements/89475ad.txt @@ -0,0 +1,21 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/89475ad.in +# +aiomysql==0.2.0 +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pymysql==1.1.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/8d11306.txt b/.riot/requirements/8d11306.txt new file mode 100644 index 00000000000..753afc3cda5 --- /dev/null +++ b/.riot/requirements/8d11306.txt @@ -0,0 +1,20 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/8d11306.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mako==1.1.6 +markupsafe==2.1.3 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/912a64b.txt b/.riot/requirements/912a64b.txt new file mode 100644 index 00000000000..120b2e992c6 --- /dev/null +++ b/.riot/requirements/912a64b.txt @@ -0,0 +1,20 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/912a64b.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +graphql-core==3.2.3 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/91ffad0.txt b/.riot/requirements/91ffad0.txt new file mode 100644 index 00000000000..380f130dfb0 --- /dev/null +++ b/.riot/requirements/91ffad0.txt @@ -0,0 +1,23 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/91ffad0.in +# +asgiref==3.7.2 +attrs==23.1.0 +coverage[toml]==7.2.7 +django==4.2.4 +django-hosts==5.2 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-django==3.10.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +sqlparse==0.4.4 diff --git a/.riot/requirements/9297f39.txt b/.riot/requirements/9297f39.txt new file mode 100644 index 00000000000..f3c32893eae --- /dev/null +++ b/.riot/requirements/9297f39.txt @@ -0,0 +1,19 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/9297f39.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +msgpack==1.0.5 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/99f5f19.txt b/.riot/requirements/99f5f19.txt new file mode 100644 index 00000000000..a423fc7d81e --- /dev/null +++ b/.riot/requirements/99f5f19.txt @@ -0,0 +1,23 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/99f5f19.in +# +asgiref==3.7.2 +attrs==23.1.0 +coverage[toml]==7.2.7 +django==4.2.4 +django-hosts==5.2 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-django==3.10.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +sqlparse==0.4.4 diff --git a/.riot/requirements/a0b7aa3.txt b/.riot/requirements/a0b7aa3.txt new file mode 100644 index 00000000000..c2824d3baf9 --- /dev/null +++ b/.riot/requirements/a0b7aa3.txt @@ -0,0 +1,23 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/a0b7aa3.in +# +attrs==23.1.0 +cattrs==22.2.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +molten==1.0.2 +mypy-extensions==1.0.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +typing-extensions==3.10.0.2 +typing-inspect==0.6.0 diff --git a/.riot/requirements/a5fa5ab.txt b/.riot/requirements/a5fa5ab.txt new file mode 100644 index 00000000000..1f7b2266185 --- /dev/null +++ b/.riot/requirements/a5fa5ab.txt @@ -0,0 +1,18 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/a5fa5ab.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/ad2a87e.txt b/.riot/requirements/ad2a87e.txt new file mode 100644 index 00000000000..9dd6b6d6fb6 --- /dev/null +++ b/.riot/requirements/ad2a87e.txt @@ -0,0 +1,19 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/ad2a87e.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mariadb==1.1.7 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/adfaf52.txt b/.riot/requirements/adfaf52.txt deleted file mode 100644 index a5995a0d86a..00000000000 --- a/.riot/requirements/adfaf52.txt +++ /dev/null @@ -1,22 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/adfaf52.in -# -attrs==23.1.0 -coverage[toml]==7.2.3 -httpretty==0.9.7 -hypothesis==6.45.0 -iniconfig==2.0.0 -mock==5.0.2 -msgpack==1.0.5 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.0.0 -pytest==7.3.1 -pytest-cov==4.0.0 -pytest-mock==3.10.0 -six==1.16.0 -sortedcontainers==2.4.0 -structlog==23.1.0 diff --git a/.riot/requirements/b0ffb4b.txt b/.riot/requirements/b0ffb4b.txt new file mode 100644 index 00000000000..2067b9aa335 --- /dev/null +++ b/.riot/requirements/b0ffb4b.txt @@ -0,0 +1,28 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/b0ffb4b.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +glob2==0.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mako==1.2.4 +markupsafe==2.1.3 +mock==5.1.0 +more-itertools==8.10.0 +msgpack==1.0.5 +opentracing==2.4.0 +packaging==23.1 +parse==1.19.1 +parse-type==0.6.2 +pluggy==1.2.0 +py==1.11.0 +pytest==7.4.0 +pytest-bdd==4.1.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +six==1.16.0 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/b4959b4.txt b/.riot/requirements/b4959b4.txt new file mode 100644 index 00000000000..b6435557684 --- /dev/null +++ b/.riot/requirements/b4959b4.txt @@ -0,0 +1,19 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/b4959b4.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +msgpack==1.0.5 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/b83fcd5.txt b/.riot/requirements/b83fcd5.txt new file mode 100644 index 00000000000..6105728dd67 --- /dev/null +++ b/.riot/requirements/b83fcd5.txt @@ -0,0 +1,19 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/b83fcd5.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +msgpack==1.0.5 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/badf37b.txt b/.riot/requirements/badf37b.txt new file mode 100644 index 00000000000..d1212da3489 --- /dev/null +++ b/.riot/requirements/badf37b.txt @@ -0,0 +1,26 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/badf37b.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +gevent==23.7.0 +greenlet==3.0.0a1 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +redis==4.6.0 +sortedcontainers==2.4.0 +zope-event==5.0 +zope-interface==6.0 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/bc5ded5.txt b/.riot/requirements/bc5ded5.txt new file mode 100644 index 00000000000..89765fc3d66 --- /dev/null +++ b/.riot/requirements/bc5ded5.txt @@ -0,0 +1,21 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/bc5ded5.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/bcbcf6c.txt b/.riot/requirements/bcbcf6c.txt new file mode 100644 index 00000000000..2f17d5fe1ed --- /dev/null +++ b/.riot/requirements/bcbcf6c.txt @@ -0,0 +1,25 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/bcbcf6c.in +# +attrs==23.1.0 +certifi==2023.7.22 +charset-normalizer==3.2.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +python-consul==1.1.0 +requests==2.31.0 +six==1.16.0 +sortedcontainers==2.4.0 +urllib3==2.0.4 diff --git a/.riot/requirements/cb5c806.txt b/.riot/requirements/cb5c806.txt new file mode 100644 index 00000000000..cfdc2a56471 --- /dev/null +++ b/.riot/requirements/cb5c806.txt @@ -0,0 +1,21 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/cb5c806.in +# +amqp==5.1.1 +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +kombu==5.2.4 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +vine==5.0.0 diff --git a/.riot/requirements/cfc44ec.txt b/.riot/requirements/cfc44ec.txt new file mode 100644 index 00000000000..51ea1d11985 --- /dev/null +++ b/.riot/requirements/cfc44ec.txt @@ -0,0 +1,19 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/cfc44ec.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pymemcache==4.0.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/d4721d0.txt b/.riot/requirements/d4721d0.txt new file mode 100644 index 00000000000..a2a885b722d --- /dev/null +++ b/.riot/requirements/d4721d0.txt @@ -0,0 +1,25 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/d4721d0.in +# +attrs==23.1.0 +certifi==2023.7.22 +charset-normalizer==3.2.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +python-consul==1.1.0 +requests==2.31.0 +six==1.16.0 +sortedcontainers==2.4.0 +urllib3==2.0.4 diff --git a/.riot/requirements/df77164.txt b/.riot/requirements/df77164.txt new file mode 100644 index 00000000000..0863f72ee5a --- /dev/null +++ b/.riot/requirements/df77164.txt @@ -0,0 +1,20 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/df77164.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +redis==3.0.1 +redis-py-cluster==2.0.0 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/e355274.txt b/.riot/requirements/e355274.txt new file mode 100644 index 00000000000..23480dc8372 --- /dev/null +++ b/.riot/requirements/e355274.txt @@ -0,0 +1,21 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/e355274.in +# +attrs==23.1.0 +certifi==2023.7.22 +coverage[toml]==7.2.7 +elasticsearch7==7.11.0 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +urllib3==1.26.16 diff --git a/.riot/requirements/e7776bf.txt b/.riot/requirements/e7776bf.txt new file mode 100644 index 00000000000..922a8421e9e --- /dev/null +++ b/.riot/requirements/e7776bf.txt @@ -0,0 +1,30 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/e7776bf.in +# +attrs==23.1.0 +blinker==1.6.2 +certifi==2023.7.22 +charset-normalizer==3.2.0 +click==8.1.6 +coverage[toml]==7.2.7 +flask==2.0.3 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +itsdangerous==2.1.2 +jinja2==3.1.2 +markupsafe==2.1.3 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +requests==2.31.0 +sortedcontainers==2.4.0 +urllib3==2.0.4 +werkzeug==2.3.6 diff --git a/.riot/requirements/ead9fee.txt b/.riot/requirements/ead9fee.txt new file mode 100644 index 00000000000..b91fe75e83e --- /dev/null +++ b/.riot/requirements/ead9fee.txt @@ -0,0 +1,25 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/ead9fee.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +gevent==23.7.0 +greenlet==3.0.0a1 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +zope-event==5.0 +zope-interface==6.0 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/ed535cd.txt b/.riot/requirements/ed535cd.txt new file mode 100644 index 00000000000..df57d6192bd --- /dev/null +++ b/.riot/requirements/ed535cd.txt @@ -0,0 +1,23 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/ed535cd.in +# +asynctest==0.13.0 +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +more-itertools==8.10.0 +msgpack==1.0.5 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +py==1.11.0 +pytest==6.2.5 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +toml==0.10.2 diff --git a/.riot/requirements/eec83eb.txt b/.riot/requirements/eec83eb.txt new file mode 100644 index 00000000000..f4dfc4fd406 --- /dev/null +++ b/.riot/requirements/eec83eb.txt @@ -0,0 +1,24 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/eec83eb.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +gunicorn==21.2.0 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +protobuf==4.24.0 +py-cpuinfo==8.0.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-benchmark==4.0.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +uwsgi==2.0.22 diff --git a/.riot/requirements/ef1f1a4.txt b/.riot/requirements/ef1f1a4.txt new file mode 100644 index 00000000000..63a0996c00d --- /dev/null +++ b/.riot/requirements/ef1f1a4.txt @@ -0,0 +1,28 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/ef1f1a4.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +gevent==23.7.0 +greenlet==3.0.0a1 +httpretty==0.9.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +six==1.16.0 +sortedcontainers==2.4.0 +zope-event==5.0 +zope-interface==6.0 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/f7ba2e9.txt b/.riot/requirements/f7ba2e9.txt new file mode 100644 index 00000000000..19ca0d29167 --- /dev/null +++ b/.riot/requirements/f7ba2e9.txt @@ -0,0 +1,46 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/f7ba2e9.in +# +amqp==5.1.1 +attrs==23.1.0 +billiard==3.6.4.0 +celery==5.0.5 +certifi==2023.7.22 +charset-normalizer==3.2.0 +click==7.1.2 +click-didyoumean==0.3.0 +click-plugins==1.1.1 +click-repl==0.3.0 +coverage[toml]==7.2.7 +django==2.2.1 +gevent==23.7.0 +greenlet==3.0.0a1 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +kombu==5.3.1 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +prompt-toolkit==3.0.39 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +pytz==2023.3 +requests==2.31.0 +sortedcontainers==2.4.0 +sqlalchemy==1.2.19 +sqlparse==0.4.4 +typing-extensions==4.7.1 +urllib3==2.0.4 +vine==5.0.0 +wcwidth==0.2.6 +zope-event==5.0 +zope-interface==6.0 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/fb7182a.txt b/.riot/requirements/fb7182a.txt new file mode 100644 index 00000000000..dbf415d62b4 --- /dev/null +++ b/.riot/requirements/fb7182a.txt @@ -0,0 +1,19 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/fb7182a.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pymysql==1.1.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/docs/contributing-testing.rst b/docs/contributing-testing.rst index a1ae692b9db..ae2c6b05a50 100644 --- a/docs/contributing-testing.rst +++ b/docs/contributing-testing.rst @@ -35,7 +35,7 @@ In addition, you will need `riot `_ an .. code-block:: bash - $ pip install riot==0.17.4 + $ pip install riot==0.19.0 $ pip install hatch==1.7.0 Some of our test environments are managed with Riot, others with Hatch. diff --git a/hatch.toml b/hatch.toml index d422711da48..6c5bfe29536 100644 --- a/hatch.toml +++ b/hatch.toml @@ -29,7 +29,7 @@ dependencies = [ "flake8-rst-docstrings", "flake8-isort", "pygments", - "riot==0.17.4", + "riot==0.18.0", ] [envs.lint.scripts] diff --git a/pyproject.toml b/pyproject.toml index 6afb08451a6..66b22faf993 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,9 +14,6 @@ authors = [ ] classifiers = [ "Programming Language :: Python", - "Programming Language :: Python :: 2.7", - "Programming Language :: Python :: 3.5", - "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", diff --git a/riotfile.py b/riotfile.py index 6ed4425dee3..cd00af808ca 100644 --- a/riotfile.py +++ b/riotfile.py @@ -16,6 +16,7 @@ (3, 9), (3, 10), (3, 11), + (3, 12), ] # type: List[Tuple[int, int]] @@ -33,6 +34,8 @@ def version_to_str(version): '3.10' >>> version_to_str((3, 11)) '3.11' + >>> version_to_str((3, 12)) + '3.12' >>> version_to_str((3, )) '3' """ @@ -53,6 +56,8 @@ def str_to_version(version): (3, 10) >>> str_to_version("3.11") (3, 11) + >>> str_to_version("3.12") + (3, 12) >>> str_to_version("3") (3,) """ @@ -68,9 +73,9 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): """Helper to select python versions from the list of versions we support >>> select_pys() - ['3.7', '3.8', '3.9', '3.10', '3.11'] + ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12'] >>> select_pys(min_version='3') - ['3.7', '3.8', '3.9', '3.10', '3.11'] + ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12'] >>> select_pys(max_version='3') [] >>> select_pys(min_version='3.7', max_version='3.9') @@ -1911,7 +1916,7 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): Venv( name="opentelemetry", command="pytest {cmdargs} tests/opentelemetry", - pys=select_pys(min_version="3.7"), + pys=select_pys(min_version="3.7", max_version="3.11"), pkgs={ "pytest-asyncio": latest, "opentelemetry-api": ["~=1.0.0", "~=1.3.0", "~=1.4.0", "~=1.8.0", "~=1.11.0", "~=1.15.0", latest], @@ -1944,13 +1949,13 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): }, ), Venv( - pys=select_pys(min_version="3.7"), + pys=select_pys(min_version="3.7", max_version="3.11"), pkgs={ "openai[embeddings]": ["==0.27.2", latest], }, ), Venv( - pys=select_pys(min_version="3.8"), + pys=select_pys(min_version="3.8", max_version="3.11"), pkgs={ "openai[embeddings]": [latest], "tiktoken": latest, @@ -1973,7 +1978,7 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): pkgs={"pytest-asyncio": latest}, ), Venv( - pys=select_pys(min_version="3.7"), + pys=select_pys(min_version="3.7", max_version="3.11"), command="pytest {cmdargs} tests/opentracer/test_tracer_tornado.py", # TODO: update opentracing tests to be compatible with Tornado v6. # https://github.com/opentracing/opentracing-python/issues/136 @@ -2309,9 +2314,9 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): ), ], ), - # Python 3.11+ + # Python 3.11 Venv( - pys=select_pys(min_version="3.11"), + pys="3.11", venvs=[ Venv( pkgs={ @@ -2334,6 +2339,31 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): ), ], ), + # Python 3.12 + Venv( + pys=select_pys(min_version="3.12"), + venvs=[ + Venv( + pkgs={ + "protobuf": ["==4.22.0", latest], + }, + ), + # Gevent + Venv( + env={ + "DD_PROFILE_TEST_GEVENT": "1", + }, + pkgs={ + "gunicorn[gevent]": latest, + }, + venvs=[ + Venv( + pkgs={"gevent": ["==23.7.0"]}, + ), + ], + ), + ], + ), ], ), ], diff --git a/scripts/ddtest b/scripts/ddtest index 44a576b9def..7b44295f949 100755 --- a/scripts/ddtest +++ b/scripts/ddtest @@ -12,8 +12,7 @@ fi # retry docker pull if fails for i in {1..3}; do docker-compose pull -q testrunner && break || sleep 3; done -FULL_CMD="pip install -q --disable-pip-version-check riot==0.17.7 hatch==1.7.0 \ - && $CMD" +FULL_CMD="pip install -q --disable-pip-version-check riot==0.19.0 hatch==1.7.0 && $CMD" # install and upgrade riot in case testrunner image has not been updated diff --git a/setup.py b/setup.py index 13b09c87f91..94800004a0b 100644 --- a/setup.py +++ b/setup.py @@ -547,6 +547,7 @@ def get_ddup_ext(): "xmltodict>=0.12", "envier", "opentelemetry-api>=1; python_version>='3.7'", + "setuptools; python_version>='3.12'", ] + bytecode, extras_require={ @@ -582,6 +583,7 @@ def get_ddup_ext(): "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", ], setup_requires=["setuptools_scm[toml]>=4", "cython<3", "cmake>=3.24.2; python_version>='3.6'"], ext_modules=ext_modules From 67b4dd4d939d60c1116c873c50a53b1142d7cc03 Mon Sep 17 00:00:00 2001 From: Yun Kim Date: Thu, 10 Aug 2023 16:17:19 -0400 Subject: [PATCH 02/58] Fix test suites --- .riot/requirements/1059ae4.txt | 66 ---------------- .riot/requirements/10f750a.txt | 35 ++++++++ .riot/requirements/114bf3f.txt | 35 ++++++++ .../requirements/{1d78810.txt => 1156dac.txt} | 11 ++- .riot/requirements/119dcbd.txt | 31 -------- .riot/requirements/127998e.txt | 27 +++++++ .riot/requirements/12b1643.txt | 39 --------- .../requirements/{11e0a22.txt => 1353fd0.txt} | 9 +-- .../requirements/{17b171a.txt => 1398072.txt} | 25 +++--- .riot/requirements/143e207.txt | 27 ------- .../requirements/{1329bb6.txt => 153fe5b.txt} | 8 +- .riot/requirements/158f822.txt | 68 ---------------- .riot/requirements/15a4905.txt | 30 ------- .../requirements/{61fd204.txt => 15d434b.txt} | 25 +++--- .riot/requirements/16cc580.txt | 31 -------- .riot/requirements/176c954.txt | 29 ------- .riot/requirements/18256e4.txt | 28 ------- .riot/requirements/19eb948.txt | 29 ------- .../requirements/{164ec1c.txt => 19ed516.txt} | 8 +- .riot/requirements/19f5030.txt | 30 ------- .../requirements/{9423397.txt => 1a74ed3.txt} | 27 +++---- .../requirements/{d3fd547.txt => 1a8dea8.txt} | 12 +-- .../requirements/{f5a5572.txt => 1a9b995.txt} | 13 ++- .riot/requirements/1af4f34.txt | 36 --------- .riot/requirements/1bce306.txt | 41 ---------- .../requirements/{1996920.txt => 1bd153a.txt} | 8 +- .../requirements/{1e690e1.txt => 1c83510.txt} | 8 +- .riot/requirements/1c9a3d8.txt | 68 ---------------- .riot/requirements/1ca304d.txt | 24 ++++++ .../requirements/{179d3fd.txt => 1cc0457.txt} | 8 +- .riot/requirements/1d2c37a.txt | 68 ---------------- .../requirements/{195f89f.txt => 1d5e643.txt} | 25 +++--- .riot/requirements/1d84a29.txt | 39 --------- .riot/requirements/1d9611e.txt | 31 -------- .riot/requirements/1da96d1.txt | 22 ------ .riot/requirements/1dda3e1.txt | 28 ------- .riot/requirements/1df06ea.txt | 20 ----- .../requirements/{721875d.txt => 1e231c4.txt} | 23 +++--- .riot/requirements/1e67ccb.txt | 22 ++++++ .riot/requirements/1ea78c5.txt | 24 ------ .riot/requirements/1edfc9b.txt | 24 ------ .riot/requirements/1ee1d52.txt | 23 ------ .riot/requirements/1f6511d.txt | 40 ---------- .riot/requirements/2348649.txt | 24 ++++++ .riot/requirements/3a13f7b.txt | 37 --------- .riot/requirements/3af4ac9.txt | 22 ------ .riot/requirements/3e91d07.txt | 36 --------- .riot/requirements/4721305.txt | 24 ------ .riot/requirements/4c0dd57.txt | 24 ------ .riot/requirements/4fad0fb.txt | 36 --------- .riot/requirements/574c1b1.txt | 36 +++++++++ .riot/requirements/58d0b7f.txt | 33 ++++++++ .riot/requirements/5c95c1a.txt | 24 ++++++ .riot/requirements/5e10a2d.txt | 24 ------ .riot/requirements/6126a3f.txt | 22 ++++++ .riot/requirements/63bcee1.txt | 66 ---------------- .riot/requirements/640620a.txt | 24 ++++++ .riot/requirements/699389a.txt | 31 ++++++++ .../requirements/{ef1f1a4.txt => 72b2f21.txt} | 7 +- .riot/requirements/72f9106.txt | 24 ++++++ .riot/requirements/78a356f.txt | 35 -------- .riot/requirements/80f0844.txt | 24 ------ .riot/requirements/8606bf2.txt | 31 -------- .riot/requirements/9070b25.txt | 24 ++++++ .riot/requirements/9b47f98.txt | 24 ++++++ .../requirements/{1767260.txt => a1828ca.txt} | 8 +- .../requirements/{1427229.txt => af3567d.txt} | 15 ++-- .../requirements/{345f42d.txt => c2ee914.txt} | 13 ++- .../requirements/{3eacf0d.txt => c503907.txt} | 8 +- .riot/requirements/ca1140c.txt | 27 ------- .riot/requirements/cb5c806.txt | 21 ----- .../requirements/{1342cf6.txt => d9c952b.txt} | 8 +- .riot/requirements/df77164.txt | 20 ----- .riot/requirements/f7ba2e9.txt | 46 ----------- ddtrace/__init__.py | 2 +- ddtrace/tracer.py | 3 + pyproject.toml | 21 +---- riotfile.py | 48 ++++++----- scripts/needs_testrun.py | 3 +- setup.py | 9 +-- tests/contrib/aiopg/py35/__init__.py | 0 tests/contrib/aiopg/py35/test.py | 61 -------------- tests/contrib/psycopg/test_psycopg.py | 6 +- tests/contrib/psycopg2/test_psycopg.py | 6 +- tests/contrib/requests/test_requests.py | 8 +- tests/debugging/py35/__init__.py | 0 tests/debugging/py35/test_async.py | 47 ----------- tests/internal/py35/__init__.py | 0 tests/internal/py35/asyncstuff.py | 2 - tests/internal/py35/test_wrapping.py | 79 ------------------- .../remoteconfig/test_remoteconfig.py | 5 ++ tests/tracer/runtime/test_runtime_metrics.py | 16 ++-- 92 files changed, 605 insertions(+), 1734 deletions(-) delete mode 100644 .riot/requirements/1059ae4.txt create mode 100644 .riot/requirements/10f750a.txt create mode 100644 .riot/requirements/114bf3f.txt rename .riot/requirements/{1d78810.txt => 1156dac.txt} (76%) delete mode 100644 .riot/requirements/119dcbd.txt create mode 100644 .riot/requirements/127998e.txt delete mode 100644 .riot/requirements/12b1643.txt rename .riot/requirements/{11e0a22.txt => 1353fd0.txt} (62%) rename .riot/requirements/{17b171a.txt => 1398072.txt} (54%) delete mode 100644 .riot/requirements/143e207.txt rename .riot/requirements/{1329bb6.txt => 153fe5b.txt} (73%) delete mode 100644 .riot/requirements/158f822.txt delete mode 100644 .riot/requirements/15a4905.txt rename .riot/requirements/{61fd204.txt => 15d434b.txt} (54%) delete mode 100644 .riot/requirements/16cc580.txt delete mode 100644 .riot/requirements/176c954.txt delete mode 100644 .riot/requirements/18256e4.txt delete mode 100644 .riot/requirements/19eb948.txt rename .riot/requirements/{164ec1c.txt => 19ed516.txt} (73%) delete mode 100644 .riot/requirements/19f5030.txt rename .riot/requirements/{9423397.txt => 1a74ed3.txt} (52%) rename .riot/requirements/{d3fd547.txt => 1a8dea8.txt} (77%) rename .riot/requirements/{f5a5572.txt => 1a9b995.txt} (59%) delete mode 100644 .riot/requirements/1af4f34.txt delete mode 100644 .riot/requirements/1bce306.txt rename .riot/requirements/{1996920.txt => 1bd153a.txt} (73%) rename .riot/requirements/{1e690e1.txt => 1c83510.txt} (73%) delete mode 100644 .riot/requirements/1c9a3d8.txt create mode 100644 .riot/requirements/1ca304d.txt rename .riot/requirements/{179d3fd.txt => 1cc0457.txt} (73%) delete mode 100644 .riot/requirements/1d2c37a.txt rename .riot/requirements/{195f89f.txt => 1d5e643.txt} (54%) delete mode 100644 .riot/requirements/1d84a29.txt delete mode 100644 .riot/requirements/1d9611e.txt delete mode 100644 .riot/requirements/1da96d1.txt delete mode 100644 .riot/requirements/1dda3e1.txt delete mode 100644 .riot/requirements/1df06ea.txt rename .riot/requirements/{721875d.txt => 1e231c4.txt} (55%) create mode 100644 .riot/requirements/1e67ccb.txt delete mode 100644 .riot/requirements/1ea78c5.txt delete mode 100644 .riot/requirements/1edfc9b.txt delete mode 100644 .riot/requirements/1ee1d52.txt delete mode 100644 .riot/requirements/1f6511d.txt create mode 100644 .riot/requirements/2348649.txt delete mode 100644 .riot/requirements/3a13f7b.txt delete mode 100644 .riot/requirements/3af4ac9.txt delete mode 100644 .riot/requirements/3e91d07.txt delete mode 100644 .riot/requirements/4721305.txt delete mode 100644 .riot/requirements/4c0dd57.txt delete mode 100644 .riot/requirements/4fad0fb.txt create mode 100644 .riot/requirements/574c1b1.txt create mode 100644 .riot/requirements/58d0b7f.txt create mode 100644 .riot/requirements/5c95c1a.txt delete mode 100644 .riot/requirements/5e10a2d.txt create mode 100644 .riot/requirements/6126a3f.txt delete mode 100644 .riot/requirements/63bcee1.txt create mode 100644 .riot/requirements/640620a.txt create mode 100644 .riot/requirements/699389a.txt rename .riot/requirements/{ef1f1a4.txt => 72b2f21.txt} (80%) create mode 100644 .riot/requirements/72f9106.txt delete mode 100644 .riot/requirements/78a356f.txt delete mode 100644 .riot/requirements/80f0844.txt delete mode 100644 .riot/requirements/8606bf2.txt create mode 100644 .riot/requirements/9070b25.txt create mode 100644 .riot/requirements/9b47f98.txt rename .riot/requirements/{1767260.txt => a1828ca.txt} (73%) rename .riot/requirements/{1427229.txt => af3567d.txt} (61%) rename .riot/requirements/{345f42d.txt => c2ee914.txt} (59%) rename .riot/requirements/{3eacf0d.txt => c503907.txt} (73%) delete mode 100644 .riot/requirements/ca1140c.txt delete mode 100644 .riot/requirements/cb5c806.txt rename .riot/requirements/{1342cf6.txt => d9c952b.txt} (73%) delete mode 100644 .riot/requirements/df77164.txt delete mode 100644 .riot/requirements/f7ba2e9.txt delete mode 100644 tests/contrib/aiopg/py35/__init__.py delete mode 100644 tests/contrib/aiopg/py35/test.py delete mode 100644 tests/debugging/py35/__init__.py delete mode 100644 tests/debugging/py35/test_async.py delete mode 100644 tests/internal/py35/__init__.py delete mode 100644 tests/internal/py35/asyncstuff.py delete mode 100644 tests/internal/py35/test_wrapping.py diff --git a/.riot/requirements/1059ae4.txt b/.riot/requirements/1059ae4.txt deleted file mode 100644 index f8fb567b69e..00000000000 --- a/.riot/requirements/1059ae4.txt +++ /dev/null @@ -1,66 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/1059ae4.in -# -ai21==1.2.4 -aiohttp==3.8.5 -aiosignal==1.3.1 -async-timeout==4.0.2 -attrs==23.1.0 -backoff==2.2.1 -certifi==2023.7.22 -charset-normalizer==3.2.0 -cohere==4.19.2 -coverage[toml]==7.2.7 -dataclasses-json==0.5.14 -dnspython==2.4.2 -exceptiongroup==1.1.2 -fastavro==1.8.2 -filelock==3.12.2 -frozenlist==1.4.0 -fsspec==2023.6.0 -huggingface-hub==0.16.4 -hypothesis==6.45.0 -idna==3.4 -importlib-metadata==6.8.0 -iniconfig==2.0.0 -langchain==0.0.261 -langsmith==0.0.20 -loguru==0.7.0 -marshmallow==3.20.1 -mock==5.1.0 -multidict==6.0.4 -mypy-extensions==1.0.0 -numexpr==2.8.5 -numpy==1.25.2 -openai==0.27.8 -openapi-schema-pydantic==1.2.4 -opentracing==2.4.0 -packaging==23.1 -pinecone-client==2.2.2 -pluggy==1.2.0 -psutil==5.9.5 -pydantic==1.10.12 -pytest==7.4.0 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.11.1 -python-dateutil==2.8.2 -pyyaml==6.0.1 -regex==2023.8.8 -requests==2.31.0 -six==1.16.0 -sortedcontainers==2.4.0 -sqlalchemy==2.0.19 -tenacity==8.2.2 -tiktoken==0.4.0 -tqdm==4.66.1 -typing-extensions==4.7.1 -typing-inspect==0.9.0 -urllib3==2.0.4 -vcrpy==5.1.0 -wrapt==1.15.0 -yarl==1.9.2 -zipp==3.16.2 diff --git a/.riot/requirements/10f750a.txt b/.riot/requirements/10f750a.txt new file mode 100644 index 00000000000..ff4d50f45a5 --- /dev/null +++ b/.riot/requirements/10f750a.txt @@ -0,0 +1,35 @@ +# +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/10f750a.in +# +attrs==23.1.0 +certifi==2023.7.22 +charset-normalizer==3.2.0 +click==8.1.7 +coverage[toml]==7.3.0 +exceptiongroup==1.1.3 +flask==2.2.3 +gunicorn==21.2.0 +httpretty==1.1.4 +hypothesis==6.45.0 +idna==3.4 +importlib-metadata==6.8.0 +iniconfig==2.0.0 +itsdangerous==2.1.2 +jinja2==3.1.2 +markupsafe==2.1.3 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +requests==2.31.0 +sortedcontainers==2.4.0 +tomli==2.0.1 +urllib3==2.0.4 +werkzeug==2.3.7 +zipp==3.16.2 diff --git a/.riot/requirements/114bf3f.txt b/.riot/requirements/114bf3f.txt new file mode 100644 index 00000000000..16b6ccb6e59 --- /dev/null +++ b/.riot/requirements/114bf3f.txt @@ -0,0 +1,35 @@ +# +# This file is autogenerated by pip-compile with Python 3.9 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/114bf3f.in +# +attrs==23.1.0 +certifi==2023.7.22 +charset-normalizer==3.2.0 +click==8.1.7 +coverage[toml]==7.3.0 +exceptiongroup==1.1.3 +flask==2.2.3 +gunicorn==21.2.0 +httpretty==1.1.4 +hypothesis==6.45.0 +idna==3.4 +importlib-metadata==6.8.0 +iniconfig==2.0.0 +itsdangerous==2.1.2 +jinja2==3.1.2 +markupsafe==2.1.3 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +requests==2.31.0 +sortedcontainers==2.4.0 +tomli==2.0.1 +urllib3==2.0.4 +werkzeug==2.3.7 +zipp==3.16.2 diff --git a/.riot/requirements/1d78810.txt b/.riot/requirements/1156dac.txt similarity index 76% rename from .riot/requirements/1d78810.txt rename to .riot/requirements/1156dac.txt index 415861e1229..ed504eab70d 100644 --- a/.riot/requirements/1d78810.txt +++ b/.riot/requirements/1156dac.txt @@ -2,16 +2,16 @@ # This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --no-annotate .riot/requirements/1d78810.in +# pip-compile --no-annotate .riot/requirements/1156dac.in # attrs==23.1.0 certifi==2023.7.22 charset-normalizer==3.2.0 -click==8.1.6 -coverage[toml]==7.2.7 +click==8.1.7 +coverage[toml]==7.3.0 flask==2.2.3 gunicorn==21.2.0 -httpretty==0.9.7 +httpretty==1.1.4 hypothesis==6.45.0 idna==3.4 iniconfig==2.0.0 @@ -26,7 +26,6 @@ pytest==7.4.0 pytest-cov==4.1.0 pytest-mock==3.11.1 requests==2.31.0 -six==1.16.0 sortedcontainers==2.4.0 urllib3==2.0.4 -werkzeug==2.3.6 +werkzeug==2.3.7 diff --git a/.riot/requirements/119dcbd.txt b/.riot/requirements/119dcbd.txt deleted file mode 100644 index 8813f80fe46..00000000000 --- a/.riot/requirements/119dcbd.txt +++ /dev/null @@ -1,31 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/119dcbd.in -# -aiohttp==3.8.5 -aiohttp-jinja2==1.5.1 -aiosignal==1.3.1 -async-timeout==4.0.2 -attrs==23.1.0 -charset-normalizer==3.2.0 -coverage[toml]==7.2.7 -frozenlist==1.4.0 -hypothesis==6.45.0 -idna==3.4 -iniconfig==2.0.0 -jinja2==3.1.2 -markupsafe==2.1.3 -mock==5.1.0 -multidict==6.0.4 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.2.0 -pytest==7.4.0 -pytest-aiohttp==1.0.4 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.11.1 -sortedcontainers==2.4.0 -yarl==1.9.2 diff --git a/.riot/requirements/127998e.txt b/.riot/requirements/127998e.txt new file mode 100644 index 00000000000..eec1c09dffb --- /dev/null +++ b/.riot/requirements/127998e.txt @@ -0,0 +1,27 @@ +# +# 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/127998e.in +# +attrs==20.1.0 +coverage[toml]==7.2.7 +exceptiongroup==1.1.3 +httpretty==1.1.4 +hypothesis==6.45.0 +importlib-metadata==6.7.0 +iniconfig==2.0.0 +mock==5.1.0 +msgpack==1.0.5 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +structlog==23.1.0 +tomli==2.0.1 +typing-extensions==4.7.1 +wheel==0.41.2 +zipp==3.15.0 diff --git a/.riot/requirements/12b1643.txt b/.riot/requirements/12b1643.txt deleted file mode 100644 index 4fb1db9f409..00000000000 --- a/.riot/requirements/12b1643.txt +++ /dev/null @@ -1,39 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.9 -# by the following command: -# -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/12b1643.in -# -attrs==23.1.0 -certifi==2022.12.7 -charset-normalizer==3.1.0 -click==8.1.3 -coverage[toml]==7.2.3 -exceptiongroup==1.1.1 -flask==2.2.3 -gunicorn==20.1.0 -httpretty==0.9.7 -hypothesis==6.45.0 -idna==3.4 -importlib-metadata==6.6.0 -iniconfig==2.0.0 -itsdangerous==2.1.2 -jinja2==3.1.2 -markupsafe==2.1.2 -mock==5.0.2 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.0.0 -pytest==7.3.1 -pytest-cov==4.0.0 -pytest-mock==3.10.0 -requests==2.29.0 -six==1.16.0 -sortedcontainers==2.4.0 -tomli==2.0.1 -urllib3==1.26.15 -werkzeug==2.3.0 -zipp==3.15.0 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/11e0a22.txt b/.riot/requirements/1353fd0.txt similarity index 62% rename from .riot/requirements/11e0a22.txt rename to .riot/requirements/1353fd0.txt index 0467c6c8886..d8b18bdb4ef 100644 --- a/.riot/requirements/11e0a22.txt +++ b/.riot/requirements/1353fd0.txt @@ -1,12 +1,12 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --no-annotate .riot/requirements/11e0a22.in +# pip-compile --no-annotate .riot/requirements/1353fd0.in # attrs==23.1.0 -coverage[toml]==7.2.7 -httpretty==0.9.7 +coverage[toml]==7.3.0 +httpretty==1.1.4 hypothesis==6.45.0 iniconfig==2.0.0 mock==5.1.0 @@ -18,6 +18,5 @@ pytest==7.4.0 pytest-asyncio==0.21.1 pytest-cov==4.1.0 pytest-mock==3.11.1 -six==1.16.0 sortedcontainers==2.4.0 typing-extensions==4.7.1 diff --git a/.riot/requirements/17b171a.txt b/.riot/requirements/1398072.txt similarity index 54% rename from .riot/requirements/17b171a.txt rename to .riot/requirements/1398072.txt index 2c1c4eb4168..bc70bc8a51e 100644 --- a/.riot/requirements/17b171a.txt +++ b/.riot/requirements/1398072.txt @@ -2,28 +2,27 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/17b171a.in +# pip-compile --no-annotate .riot/requirements/1398072.in # attrs==23.1.0 -coverage[toml]==7.2.5 -exceptiongroup==1.1.1 -gevent==22.10.2 +coverage[toml]==7.3.0 +exceptiongroup==1.1.3 +gevent==23.7.0 greenlet==2.0.2 -httpretty==0.9.7 +httpretty==1.1.4 hypothesis==6.45.0 iniconfig==2.0.0 -mock==5.0.2 +mock==5.1.0 opentracing==2.4.0 packaging==23.1 -pluggy==1.0.0 -pytest==7.3.1 -pytest-asyncio==0.21.0 -pytest-cov==4.0.0 -pytest-mock==3.10.0 -six==1.16.0 +pluggy==1.2.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 sortedcontainers==2.4.0 tomli==2.0.1 -zope-event==4.6 +zope-event==5.0 zope-interface==6.0 # The following packages are considered to be unsafe in a requirements file: diff --git a/.riot/requirements/143e207.txt b/.riot/requirements/143e207.txt deleted file mode 100644 index 5560574b83a..00000000000 --- a/.riot/requirements/143e207.txt +++ /dev/null @@ -1,27 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.7 -# by the following command: -# -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/143e207.in -# -attrs==20.1.0 -coverage[toml]==7.2.2 -exceptiongroup==1.1.1 -httpretty==0.9.7 -hypothesis==6.45.0 -importlib-metadata==6.0.0 -iniconfig==2.0.0 -mock==5.0.1 -msgpack==1.0.5 -opentracing==2.4.0 -packaging==23.0 -pluggy==1.0.0 -pytest==7.2.2 -pytest-cov==4.0.0 -pytest-mock==3.10.0 -six==1.16.0 -sortedcontainers==2.4.0 -structlog==22.3.0 -tomli==2.0.1 -typing-extensions==4.7.0 -zipp==3.15.0 diff --git a/.riot/requirements/1329bb6.txt b/.riot/requirements/153fe5b.txt similarity index 73% rename from .riot/requirements/1329bb6.txt rename to .riot/requirements/153fe5b.txt index 20851103495..16cd665ac74 100644 --- a/.riot/requirements/1329bb6.txt +++ b/.riot/requirements/153fe5b.txt @@ -2,11 +2,11 @@ # This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --no-annotate .riot/requirements/1329bb6.in +# pip-compile --no-annotate .riot/requirements/153fe5b.in # attrs==20.1.0 -coverage[toml]==7.2.7 -httpretty==0.9.7 +coverage[toml]==7.3.0 +httpretty==1.1.4 hypothesis==6.45.0 iniconfig==2.0.0 mock==5.1.0 @@ -17,6 +17,6 @@ pluggy==1.2.0 pytest==7.4.0 pytest-cov==4.1.0 pytest-mock==3.11.1 -six==1.16.0 sortedcontainers==2.4.0 structlog==23.1.0 +wheel==0.41.2 diff --git a/.riot/requirements/158f822.txt b/.riot/requirements/158f822.txt deleted file mode 100644 index bcc4dfcb7f4..00000000000 --- a/.riot/requirements/158f822.txt +++ /dev/null @@ -1,68 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/158f822.in -# -attrs==23.1.0 -aws-sam-translator==1.73.0 -aws-xray-sdk==2.12.0 -boto==2.49.0 -boto3==1.28.23 -botocore==1.31.23 -certifi==2023.7.22 -cffi==1.15.1 -cfn-lint==0.53.1 -charset-normalizer==3.2.0 -coverage[toml]==7.2.7 -cryptography==41.0.3 -docker==6.1.3 -ecdsa==0.14.1 -hypothesis==6.45.0 -idna==2.10 -iniconfig==2.0.0 -jinja2==2.11.3 -jmespath==1.0.1 -jsondiff==2.0.0 -jsonpatch==1.33 -jsonpointer==2.4 -jsonschema==3.2.0 -junit-xml==1.9 -markupsafe==1.1.1 -mock==5.1.0 -more-itertools==10.1.0 -moto==1.3.16 -networkx==2.8.8 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.2.0 -pyasn1==0.5.0 -pycparser==2.21 -pydantic==1.10.12 -pynamodb==5.5.0 -pyrsistent==0.19.3 -pytest==7.4.0 -pytest-cov==4.1.0 -pytest-mock==3.11.1 -python-dateutil==2.8.2 -python-jose[cryptography]==3.3.0 -pytz==2023.3 -pyyaml==6.0.1 -requests==2.31.0 -responses==0.23.3 -rsa==4.9 -s3transfer==0.6.1 -six==1.16.0 -sortedcontainers==2.4.0 -sshpubkeys==3.3.1 -types-pyyaml==6.0.12.11 -typing-extensions==4.7.1 -urllib3==1.26.16 -websocket-client==1.6.1 -werkzeug==2.1.2 -wrapt==1.15.0 -xmltodict==0.13.0 -zipp==3.16.2 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/15a4905.txt b/.riot/requirements/15a4905.txt deleted file mode 100644 index 6c20a4e4c05..00000000000 --- a/.riot/requirements/15a4905.txt +++ /dev/null @@ -1,30 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/15a4905.in -# -attrs==23.1.0 -blinker==1.6.2 -cachelib==0.9.0 -click==7.1.2 -coverage[toml]==7.2.7 -flask==1.1.4 -flask-caching==2.0.2 -hypothesis==6.45.0 -iniconfig==2.0.0 -itsdangerous==1.1.0 -jinja2==2.11.3 -markupsafe==1.1.1 -mock==5.1.0 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.2.0 -pytest==7.4.0 -pytest-cov==4.1.0 -pytest-mock==3.11.1 -python-memcached==1.59 -redis==2.10.6 -six==1.16.0 -sortedcontainers==2.4.0 -werkzeug==1.0.1 diff --git a/.riot/requirements/61fd204.txt b/.riot/requirements/15d434b.txt similarity index 54% rename from .riot/requirements/61fd204.txt rename to .riot/requirements/15d434b.txt index d2b3cc04800..01324e80ea9 100644 --- a/.riot/requirements/61fd204.txt +++ b/.riot/requirements/15d434b.txt @@ -2,28 +2,27 @@ # This file is autogenerated by pip-compile with Python 3.9 # by the following command: # -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/61fd204.in +# pip-compile --no-annotate .riot/requirements/15d434b.in # attrs==23.1.0 -coverage[toml]==7.2.5 -exceptiongroup==1.1.1 -gevent==22.10.2 +coverage[toml]==7.3.0 +exceptiongroup==1.1.3 +gevent==23.7.0 greenlet==2.0.2 -httpretty==0.9.7 +httpretty==1.1.4 hypothesis==6.45.0 iniconfig==2.0.0 -mock==5.0.2 +mock==5.1.0 opentracing==2.4.0 packaging==23.1 -pluggy==1.0.0 -pytest==7.3.1 -pytest-asyncio==0.21.0 -pytest-cov==4.0.0 -pytest-mock==3.10.0 -six==1.16.0 +pluggy==1.2.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 sortedcontainers==2.4.0 tomli==2.0.1 -zope-event==4.6 +zope-event==5.0 zope-interface==6.0 # The following packages are considered to be unsafe in a requirements file: diff --git a/.riot/requirements/16cc580.txt b/.riot/requirements/16cc580.txt deleted file mode 100644 index 52f61e03cf3..00000000000 --- a/.riot/requirements/16cc580.txt +++ /dev/null @@ -1,31 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/16cc580.in -# -aiohttp==3.8.5 -aiohttp-jinja2==1.5.1 -aiosignal==1.3.1 -async-timeout==4.0.2 -attrs==23.1.0 -charset-normalizer==3.2.0 -coverage[toml]==7.2.7 -frozenlist==1.4.0 -hypothesis==6.45.0 -idna==3.4 -iniconfig==2.0.0 -jinja2==3.1.2 -markupsafe==2.1.3 -mock==5.1.0 -multidict==6.0.4 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.2.0 -pytest==7.4.0 -pytest-aiohttp==1.0.4 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.11.1 -sortedcontainers==2.4.0 -yarl==1.9.2 diff --git a/.riot/requirements/176c954.txt b/.riot/requirements/176c954.txt deleted file mode 100644 index c1a1af00426..00000000000 --- a/.riot/requirements/176c954.txt +++ /dev/null @@ -1,29 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/176c954.in -# -attrs==23.1.0 -blinker==1.6.2 -click==8.1.6 -coverage[toml]==7.2.7 -flask==2.3.2 -flask-caching==1.10.1 -hypothesis==6.45.0 -iniconfig==2.0.0 -itsdangerous==2.1.2 -jinja2==3.1.2 -markupsafe==2.1.3 -mock==5.1.0 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.2.0 -pytest==7.4.0 -pytest-cov==4.1.0 -pytest-mock==3.11.1 -python-memcached==1.59 -redis==2.10.6 -six==1.16.0 -sortedcontainers==2.4.0 -werkzeug==2.3.6 diff --git a/.riot/requirements/18256e4.txt b/.riot/requirements/18256e4.txt deleted file mode 100644 index fdc749e4803..00000000000 --- a/.riot/requirements/18256e4.txt +++ /dev/null @@ -1,28 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/18256e4.in -# -aiohttp==3.8.5 -aiosignal==1.3.1 -async-timeout==4.0.2 -attrs==23.1.0 -charset-normalizer==3.2.0 -coverage[toml]==7.2.7 -frozenlist==1.4.0 -hypothesis==6.45.0 -idna==3.4 -iniconfig==2.0.0 -mock==5.1.0 -multidict==6.0.4 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.2.0 -pytest==7.4.0 -pytest-aiohttp==1.0.4 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.11.1 -sortedcontainers==2.4.0 -yarl==1.9.2 diff --git a/.riot/requirements/19eb948.txt b/.riot/requirements/19eb948.txt deleted file mode 100644 index 2dea36e05b2..00000000000 --- a/.riot/requirements/19eb948.txt +++ /dev/null @@ -1,29 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/19eb948.in -# -attrs==23.1.0 -blinker==1.6.2 -click==7.1.2 -coverage[toml]==7.2.7 -flask==1.1.4 -flask-caching==1.10.1 -hypothesis==6.45.0 -iniconfig==2.0.0 -itsdangerous==1.1.0 -jinja2==2.11.3 -markupsafe==1.1.1 -mock==5.1.0 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.2.0 -pytest==7.4.0 -pytest-cov==4.1.0 -pytest-mock==3.11.1 -python-memcached==1.59 -redis==2.10.6 -six==1.16.0 -sortedcontainers==2.4.0 -werkzeug==1.0.1 diff --git a/.riot/requirements/164ec1c.txt b/.riot/requirements/19ed516.txt similarity index 73% rename from .riot/requirements/164ec1c.txt rename to .riot/requirements/19ed516.txt index f34d8324457..13070b961ee 100644 --- a/.riot/requirements/164ec1c.txt +++ b/.riot/requirements/19ed516.txt @@ -2,11 +2,11 @@ # This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --no-annotate .riot/requirements/164ec1c.in +# pip-compile --no-annotate .riot/requirements/19ed516.in # attrs==20.1.0 -coverage[toml]==7.2.7 -httpretty==0.9.7 +coverage[toml]==7.3.0 +httpretty==1.1.4 hypothesis==6.45.0 iniconfig==2.0.0 mock==5.1.0 @@ -17,6 +17,6 @@ pluggy==1.2.0 pytest==7.4.0 pytest-cov==4.1.0 pytest-mock==3.11.1 -six==1.16.0 sortedcontainers==2.4.0 structlog==23.1.0 +wheel==0.41.2 diff --git a/.riot/requirements/19f5030.txt b/.riot/requirements/19f5030.txt deleted file mode 100644 index 99c2dde38f2..00000000000 --- a/.riot/requirements/19f5030.txt +++ /dev/null @@ -1,30 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/19f5030.in -# -attrs==23.1.0 -blinker==1.6.2 -cachelib==0.9.0 -click==8.1.6 -coverage[toml]==7.2.7 -flask==2.3.2 -flask-caching==2.0.2 -hypothesis==6.45.0 -iniconfig==2.0.0 -itsdangerous==2.1.2 -jinja2==3.1.2 -markupsafe==2.1.3 -mock==5.1.0 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.2.0 -pytest==7.4.0 -pytest-cov==4.1.0 -pytest-mock==3.11.1 -python-memcached==1.59 -redis==2.10.6 -six==1.16.0 -sortedcontainers==2.4.0 -werkzeug==2.3.6 diff --git a/.riot/requirements/9423397.txt b/.riot/requirements/1a74ed3.txt similarity index 52% rename from .riot/requirements/9423397.txt rename to .riot/requirements/1a74ed3.txt index 926b9f95f42..5de8c4a26f2 100644 --- a/.riot/requirements/9423397.txt +++ b/.riot/requirements/1a74ed3.txt @@ -2,31 +2,30 @@ # This file is autogenerated by pip-compile with Python 3.7 # by the following command: # -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/9423397.in +# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/1a74ed3.in # attrs==23.1.0 -coverage[toml]==7.2.5 -exceptiongroup==1.1.1 +coverage[toml]==7.2.7 +exceptiongroup==1.1.3 gevent==22.10.2 greenlet==2.0.2 -httpretty==0.9.7 +httpretty==1.1.4 hypothesis==6.45.0 -importlib-metadata==6.6.0 +importlib-metadata==6.7.0 iniconfig==2.0.0 -mock==5.0.2 +mock==5.1.0 opentracing==2.4.0 packaging==23.1 -pluggy==1.0.0 -pytest==7.3.1 -pytest-asyncio==0.21.0 -pytest-cov==4.0.0 -pytest-mock==3.10.0 -six==1.16.0 +pluggy==1.2.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 sortedcontainers==2.4.0 tomli==2.0.1 -typing-extensions==4.7.0 +typing-extensions==4.7.1 zipp==3.15.0 -zope-event==4.6 +zope-event==5.0 zope-interface==6.0 # The following packages are considered to be unsafe in a requirements file: diff --git a/.riot/requirements/d3fd547.txt b/.riot/requirements/1a8dea8.txt similarity index 77% rename from .riot/requirements/d3fd547.txt rename to .riot/requirements/1a8dea8.txt index 88bf8f115aa..413686946a2 100644 --- a/.riot/requirements/d3fd547.txt +++ b/.riot/requirements/1a8dea8.txt @@ -2,26 +2,26 @@ # 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/d3fd547.in +# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/1a8dea8.in # attrs==23.1.0 coverage[toml]==7.2.7 -exceptiongroup==1.1.2 -httpretty==0.9.7 +exceptiongroup==1.1.3 +httpretty==1.1.4 hypothesis==6.45.0 importlib-metadata==6.7.0 iniconfig==2.0.0 -mock==5.0.2 +mock==5.1.0 msgpack==1.0.5 opentracing==2.4.0 packaging==23.1 pluggy==1.2.0 pytest==7.4.0 -pytest-asyncio==0.21.0 pytest-cov==4.1.0 pytest-mock==3.11.1 -six==1.16.0 sortedcontainers==2.4.0 +structlog==23.1.0 tomli==2.0.1 typing-extensions==4.7.1 +wheel==0.41.2 zipp==3.15.0 diff --git a/.riot/requirements/f5a5572.txt b/.riot/requirements/1a9b995.txt similarity index 59% rename from .riot/requirements/f5a5572.txt rename to .riot/requirements/1a9b995.txt index baf27fa3537..0eba8f41fa6 100644 --- a/.riot/requirements/f5a5572.txt +++ b/.riot/requirements/1a9b995.txt @@ -2,24 +2,23 @@ # This file is autogenerated by pip-compile with Python 3.10 # by the following command: # -# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/f5a5572.in +# pip-compile --no-annotate .riot/requirements/1a9b995.in # attrs==23.1.0 -coverage[toml]==7.2.7 -exceptiongroup==1.1.2 -httpretty==0.9.7 +coverage[toml]==7.3.0 +exceptiongroup==1.1.3 +httpretty==1.1.4 hypothesis==6.45.0 iniconfig==2.0.0 -mock==5.0.2 +mock==5.1.0 msgpack==1.0.5 opentracing==2.4.0 packaging==23.1 pluggy==1.2.0 pytest==7.4.0 -pytest-asyncio==0.21.0 +pytest-asyncio==0.21.1 pytest-cov==4.1.0 pytest-mock==3.11.1 -six==1.16.0 sortedcontainers==2.4.0 tomli==2.0.1 typing-extensions==4.7.1 diff --git a/.riot/requirements/1af4f34.txt b/.riot/requirements/1af4f34.txt deleted file mode 100644 index b24fde8c6bf..00000000000 --- a/.riot/requirements/1af4f34.txt +++ /dev/null @@ -1,36 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/1af4f34.in -# -aiobotocore==1.4.2 -aiohttp==3.8.5 -aioitertools==0.11.0 -aiosignal==1.3.1 -async-generator==1.10 -async-timeout==4.0.2 -attrs==23.1.0 -botocore==1.20.106 -charset-normalizer==3.2.0 -coverage[toml]==7.2.7 -frozenlist==1.4.0 -hypothesis==6.45.0 -idna==3.4 -iniconfig==2.0.0 -jmespath==0.10.0 -mock==5.1.0 -multidict==6.0.4 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.2.0 -pytest==7.4.0 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.11.1 -python-dateutil==2.8.2 -six==1.16.0 -sortedcontainers==2.4.0 -urllib3==1.26.16 -wrapt==1.15.0 -yarl==1.9.2 diff --git a/.riot/requirements/1bce306.txt b/.riot/requirements/1bce306.txt deleted file mode 100644 index 0d09efb43b9..00000000000 --- a/.riot/requirements/1bce306.txt +++ /dev/null @@ -1,41 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/1bce306.in -# -attrs==23.1.0 -beautifulsoup4==4.12.2 -certifi==2023.7.22 -charset-normalizer==3.2.0 -coverage[toml]==7.2.7 -hupper==1.12 -hypothesis==6.45.0 -idna==3.4 -iniconfig==2.0.0 -mock==5.1.0 -opentracing==2.4.0 -packaging==23.1 -pastedeploy==3.0.1 -plaster==1.1.2 -plaster-pastedeploy==1.0.1 -pluggy==1.2.0 -pserve-test-app @ file:///Users/yun.kim/go/src/github.com/DataDog/dd-trace-py/tests/contrib/pyramid/pserve_app -pyramid==2.0.1 -pytest==7.4.0 -pytest-cov==4.1.0 -pytest-mock==3.11.1 -requests==2.31.0 -sortedcontainers==2.4.0 -soupsieve==2.4.1 -translationstring==1.4 -urllib3==2.0.4 -venusian==3.0.0 -waitress==2.1.2 -webob==1.8.7 -webtest==3.0.0 -zope-deprecation==5.0 -zope-interface==6.0 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/1996920.txt b/.riot/requirements/1bd153a.txt similarity index 73% rename from .riot/requirements/1996920.txt rename to .riot/requirements/1bd153a.txt index ea1116f65bc..781ef218e87 100644 --- a/.riot/requirements/1996920.txt +++ b/.riot/requirements/1bd153a.txt @@ -2,11 +2,11 @@ # This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --no-annotate .riot/requirements/1996920.in +# pip-compile --no-annotate .riot/requirements/1bd153a.in # attrs==23.1.0 -coverage[toml]==7.2.7 -httpretty==0.9.7 +coverage[toml]==7.3.0 +httpretty==1.1.4 hypothesis==6.45.0 iniconfig==2.0.0 mock==5.1.0 @@ -17,6 +17,6 @@ pluggy==1.2.0 pytest==7.4.0 pytest-cov==4.1.0 pytest-mock==3.11.1 -six==1.16.0 sortedcontainers==2.4.0 structlog==23.1.0 +wheel==0.41.2 diff --git a/.riot/requirements/1e690e1.txt b/.riot/requirements/1c83510.txt similarity index 73% rename from .riot/requirements/1e690e1.txt rename to .riot/requirements/1c83510.txt index 9fcf20f8e42..f7a32d8f727 100644 --- a/.riot/requirements/1e690e1.txt +++ b/.riot/requirements/1c83510.txt @@ -2,11 +2,11 @@ # This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --no-annotate .riot/requirements/1e690e1.in +# pip-compile --no-annotate .riot/requirements/1c83510.in # attrs==23.1.0 -coverage[toml]==7.2.7 -httpretty==0.9.7 +coverage[toml]==7.3.0 +httpretty==1.1.4 hypothesis==6.45.0 iniconfig==2.0.0 mock==5.1.0 @@ -17,6 +17,6 @@ pluggy==1.2.0 pytest==7.4.0 pytest-cov==4.1.0 pytest-mock==3.11.1 -six==1.16.0 sortedcontainers==2.4.0 structlog==23.1.0 +wheel==0.41.2 diff --git a/.riot/requirements/1c9a3d8.txt b/.riot/requirements/1c9a3d8.txt deleted file mode 100644 index 054c11b50ff..00000000000 --- a/.riot/requirements/1c9a3d8.txt +++ /dev/null @@ -1,68 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/1c9a3d8.in -# -attrs==23.1.0 -aws-sam-translator==1.73.0 -aws-xray-sdk==2.12.0 -boto==2.49.0 -boto3==1.28.23 -botocore==1.31.23 -certifi==2023.7.22 -cffi==1.15.1 -cfn-lint==0.53.1 -charset-normalizer==3.2.0 -coverage[toml]==7.2.7 -cryptography==41.0.3 -docker==6.1.3 -ecdsa==0.14.1 -hypothesis==6.45.0 -idna==2.10 -iniconfig==2.0.0 -jinja2==2.11.3 -jmespath==1.0.1 -jsondiff==2.0.0 -jsonpatch==1.33 -jsonpointer==2.4 -jsonschema==3.2.0 -junit-xml==1.9 -markupsafe==1.1.1 -mock==5.1.0 -more-itertools==10.1.0 -moto==1.3.16 -networkx==2.8.8 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.2.0 -pyasn1==0.5.0 -pycparser==2.21 -pydantic==1.10.12 -pynamodb==5.5.0 -pyrsistent==0.19.3 -pytest==7.4.0 -pytest-cov==4.1.0 -pytest-mock==3.11.1 -python-dateutil==2.8.2 -python-jose[cryptography]==3.3.0 -pytz==2023.3 -pyyaml==6.0.1 -requests==2.31.0 -responses==0.23.3 -rsa==4.9 -s3transfer==0.6.1 -six==1.16.0 -sortedcontainers==2.4.0 -sshpubkeys==3.3.1 -types-pyyaml==6.0.12.11 -typing-extensions==4.7.1 -urllib3==1.26.16 -websocket-client==1.6.1 -werkzeug==2.1.2 -wrapt==1.15.0 -xmltodict==0.13.0 -zipp==3.16.2 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/1ca304d.txt b/.riot/requirements/1ca304d.txt new file mode 100644 index 00000000000..c6685d964ed --- /dev/null +++ b/.riot/requirements/1ca304d.txt @@ -0,0 +1,24 @@ +# +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1ca304d.in +# +attrs==20.1.0 +coverage[toml]==7.3.0 +exceptiongroup==1.1.3 +httpretty==1.1.4 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +msgpack==1.0.5 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +structlog==23.1.0 +tomli==2.0.1 +wheel==0.41.2 diff --git a/.riot/requirements/179d3fd.txt b/.riot/requirements/1cc0457.txt similarity index 73% rename from .riot/requirements/179d3fd.txt rename to .riot/requirements/1cc0457.txt index 95a4c10e25c..90225a668ad 100644 --- a/.riot/requirements/179d3fd.txt +++ b/.riot/requirements/1cc0457.txt @@ -2,11 +2,11 @@ # This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --no-annotate .riot/requirements/179d3fd.in +# pip-compile --no-annotate .riot/requirements/1cc0457.in # attrs==20.1.0 -coverage[toml]==7.2.7 -httpretty==0.9.7 +coverage[toml]==7.3.0 +httpretty==1.1.4 hypothesis==6.45.0 iniconfig==2.0.0 mock==5.1.0 @@ -17,6 +17,6 @@ pluggy==1.2.0 pytest==7.4.0 pytest-cov==4.1.0 pytest-mock==3.11.1 -six==1.16.0 sortedcontainers==2.4.0 structlog==23.1.0 +wheel==0.41.2 diff --git a/.riot/requirements/1d2c37a.txt b/.riot/requirements/1d2c37a.txt deleted file mode 100644 index 9b9b0fec257..00000000000 --- a/.riot/requirements/1d2c37a.txt +++ /dev/null @@ -1,68 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/1d2c37a.in -# -attrs==23.1.0 -aws-sam-translator==1.73.0 -aws-xray-sdk==2.12.0 -boto==2.49.0 -boto3==1.28.23 -botocore==1.31.23 -certifi==2023.7.22 -cffi==1.15.1 -cfn-lint==0.53.1 -charset-normalizer==3.2.0 -coverage[toml]==7.2.7 -cryptography==41.0.3 -docker==6.1.3 -ecdsa==0.14.1 -hypothesis==6.45.0 -idna==2.10 -iniconfig==2.0.0 -jinja2==2.11.3 -jmespath==1.0.1 -jsondiff==2.0.0 -jsonpatch==1.33 -jsonpointer==2.4 -jsonschema==3.2.0 -junit-xml==1.9 -markupsafe==1.1.1 -mock==5.1.0 -more-itertools==10.1.0 -moto==1.3.16 -networkx==2.8.8 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.2.0 -pyasn1==0.5.0 -pycparser==2.21 -pydantic==1.10.12 -pynamodb==5.5.0 -pyrsistent==0.19.3 -pytest==7.4.0 -pytest-cov==4.1.0 -pytest-mock==3.11.1 -python-dateutil==2.8.2 -python-jose[cryptography]==3.3.0 -pytz==2023.3 -pyyaml==6.0.1 -requests==2.31.0 -responses==0.23.3 -rsa==4.9 -s3transfer==0.6.1 -six==1.16.0 -sortedcontainers==2.4.0 -sshpubkeys==3.3.1 -types-pyyaml==6.0.12.11 -typing-extensions==4.7.1 -urllib3==1.26.16 -websocket-client==1.6.1 -werkzeug==2.1.2 -wrapt==1.15.0 -xmltodict==0.13.0 -zipp==3.16.2 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/195f89f.txt b/.riot/requirements/1d5e643.txt similarity index 54% rename from .riot/requirements/195f89f.txt rename to .riot/requirements/1d5e643.txt index 612f7a7c2e5..d8aa18a09a1 100644 --- a/.riot/requirements/195f89f.txt +++ b/.riot/requirements/1d5e643.txt @@ -2,28 +2,27 @@ # This file is autogenerated by pip-compile with Python 3.10 # by the following command: # -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/195f89f.in +# pip-compile --no-annotate .riot/requirements/1d5e643.in # attrs==23.1.0 -coverage[toml]==7.2.5 -exceptiongroup==1.1.1 -gevent==22.10.2 +coverage[toml]==7.3.0 +exceptiongroup==1.1.3 +gevent==23.7.0 greenlet==2.0.2 -httpretty==0.9.7 +httpretty==1.1.4 hypothesis==6.45.0 iniconfig==2.0.0 -mock==5.0.2 +mock==5.1.0 opentracing==2.4.0 packaging==23.1 -pluggy==1.0.0 -pytest==7.3.1 -pytest-asyncio==0.21.0 -pytest-cov==4.0.0 -pytest-mock==3.10.0 -six==1.16.0 +pluggy==1.2.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 sortedcontainers==2.4.0 tomli==2.0.1 -zope-event==4.6 +zope-event==5.0 zope-interface==6.0 # The following packages are considered to be unsafe in a requirements file: diff --git a/.riot/requirements/1d84a29.txt b/.riot/requirements/1d84a29.txt deleted file mode 100644 index 84c769e2513..00000000000 --- a/.riot/requirements/1d84a29.txt +++ /dev/null @@ -1,39 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.8 -# by the following command: -# -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/1d84a29.in -# -attrs==23.1.0 -certifi==2022.12.7 -charset-normalizer==3.1.0 -click==8.1.3 -coverage[toml]==7.2.3 -exceptiongroup==1.1.1 -flask==2.2.3 -gunicorn==20.1.0 -httpretty==0.9.7 -hypothesis==6.45.0 -idna==3.4 -importlib-metadata==6.6.0 -iniconfig==2.0.0 -itsdangerous==2.1.2 -jinja2==3.1.2 -markupsafe==2.1.2 -mock==5.0.2 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.0.0 -pytest==7.3.1 -pytest-cov==4.0.0 -pytest-mock==3.10.0 -requests==2.29.0 -six==1.16.0 -sortedcontainers==2.4.0 -tomli==2.0.1 -urllib3==1.26.15 -werkzeug==2.3.0 -zipp==3.15.0 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/1d9611e.txt b/.riot/requirements/1d9611e.txt deleted file mode 100644 index dc7f27a43f3..00000000000 --- a/.riot/requirements/1d9611e.txt +++ /dev/null @@ -1,31 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/1d9611e.in -# -aiohttp==3.8.5 -aiohttp-jinja2==1.5.1 -aiosignal==1.3.1 -async-timeout==4.0.2 -attrs==23.1.0 -charset-normalizer==3.2.0 -coverage[toml]==7.2.7 -frozenlist==1.4.0 -hypothesis==6.45.0 -idna==3.4 -iniconfig==2.0.0 -jinja2==3.1.2 -markupsafe==2.1.3 -mock==5.1.0 -multidict==6.0.4 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.2.0 -pytest==7.4.0 -pytest-aiohttp==1.0.4 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.11.1 -sortedcontainers==2.4.0 -yarl==1.9.2 diff --git a/.riot/requirements/1da96d1.txt b/.riot/requirements/1da96d1.txt deleted file mode 100644 index 920b7d48499..00000000000 --- a/.riot/requirements/1da96d1.txt +++ /dev/null @@ -1,22 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/1da96d1.in -# -attrs==22.2.0 -coverage[toml]==7.2.2 -httpretty==0.9.7 -hypothesis==6.45.0 -iniconfig==2.0.0 -mock==5.0.1 -msgpack==1.0.5 -opentracing==2.4.0 -packaging==23.0 -pluggy==1.0.0 -pytest==7.2.2 -pytest-cov==4.0.0 -pytest-mock==3.10.0 -six==1.16.0 -sortedcontainers==2.4.0 -structlog==22.3.0 diff --git a/.riot/requirements/1dda3e1.txt b/.riot/requirements/1dda3e1.txt deleted file mode 100644 index 998d7540215..00000000000 --- a/.riot/requirements/1dda3e1.txt +++ /dev/null @@ -1,28 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/1dda3e1.in -# -aiohttp==3.8.5 -aiosignal==1.3.1 -async-timeout==4.0.2 -attrs==23.1.0 -charset-normalizer==3.2.0 -coverage[toml]==7.2.7 -frozenlist==1.4.0 -hypothesis==6.45.0 -idna==3.4 -iniconfig==2.0.0 -mock==5.1.0 -multidict==6.0.4 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.2.0 -pytest==7.4.0 -pytest-aiohttp==1.0.4 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.11.1 -sortedcontainers==2.4.0 -yarl==1.9.2 diff --git a/.riot/requirements/1df06ea.txt b/.riot/requirements/1df06ea.txt deleted file mode 100644 index 812d5834168..00000000000 --- a/.riot/requirements/1df06ea.txt +++ /dev/null @@ -1,20 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/1df06ea.in -# -attrs==23.1.0 -coverage[toml]==7.2.7 -hypothesis==6.45.0 -iniconfig==2.0.0 -mock==5.1.0 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.2.0 -pytest==7.4.0 -pytest-cov==4.1.0 -pytest-mock==3.11.1 -redis==3.5.3 -redis-py-cluster==2.1.3 -sortedcontainers==2.4.0 diff --git a/.riot/requirements/721875d.txt b/.riot/requirements/1e231c4.txt similarity index 55% rename from .riot/requirements/721875d.txt rename to .riot/requirements/1e231c4.txt index 43f07e085f5..c4899bf582a 100644 --- a/.riot/requirements/721875d.txt +++ b/.riot/requirements/1e231c4.txt @@ -2,26 +2,25 @@ # This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/721875d.in +# pip-compile --no-annotate .riot/requirements/1e231c4.in # attrs==23.1.0 -coverage[toml]==7.2.5 -gevent==22.10.2 +coverage[toml]==7.3.0 +gevent==23.7.0 greenlet==2.0.2 -httpretty==0.9.7 +httpretty==1.1.4 hypothesis==6.45.0 iniconfig==2.0.0 -mock==5.0.2 +mock==5.1.0 opentracing==2.4.0 packaging==23.1 -pluggy==1.0.0 -pytest==7.3.1 -pytest-asyncio==0.21.0 -pytest-cov==4.0.0 -pytest-mock==3.10.0 -six==1.16.0 +pluggy==1.2.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 sortedcontainers==2.4.0 -zope-event==4.6 +zope-event==5.0 zope-interface==6.0 # The following packages are considered to be unsafe in a requirements file: diff --git a/.riot/requirements/1e67ccb.txt b/.riot/requirements/1e67ccb.txt new file mode 100644 index 00000000000..20e2b595e68 --- /dev/null +++ b/.riot/requirements/1e67ccb.txt @@ -0,0 +1,22 @@ +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1e67ccb.in +# +attrs==20.1.0 +coverage[toml]==7.3.0 +httpretty==1.1.4 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +msgpack==1.0.5 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +structlog==23.1.0 +wheel==0.41.2 diff --git a/.riot/requirements/1ea78c5.txt b/.riot/requirements/1ea78c5.txt deleted file mode 100644 index 98eb60419d6..00000000000 --- a/.riot/requirements/1ea78c5.txt +++ /dev/null @@ -1,24 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.9 -# by the following command: -# -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/1ea78c5.in -# -attrs==20.1.0 -coverage[toml]==7.2.2 -exceptiongroup==1.1.1 -httpretty==0.9.7 -hypothesis==6.45.0 -iniconfig==2.0.0 -mock==5.0.1 -msgpack==1.0.5 -opentracing==2.4.0 -packaging==23.0 -pluggy==1.0.0 -pytest==7.2.2 -pytest-cov==4.0.0 -pytest-mock==3.10.0 -six==1.16.0 -sortedcontainers==2.4.0 -structlog==22.3.0 -tomli==2.0.1 diff --git a/.riot/requirements/1edfc9b.txt b/.riot/requirements/1edfc9b.txt deleted file mode 100644 index 40747f6c19c..00000000000 --- a/.riot/requirements/1edfc9b.txt +++ /dev/null @@ -1,24 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.10 -# by the following command: -# -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/1edfc9b.in -# -attrs==20.1.0 -coverage[toml]==7.2.2 -exceptiongroup==1.1.1 -httpretty==0.9.7 -hypothesis==6.45.0 -iniconfig==2.0.0 -mock==5.0.1 -msgpack==1.0.5 -opentracing==2.4.0 -packaging==23.0 -pluggy==1.0.0 -pytest==7.2.2 -pytest-cov==4.0.0 -pytest-mock==3.10.0 -six==1.16.0 -sortedcontainers==2.4.0 -structlog==22.3.0 -tomli==2.0.1 diff --git a/.riot/requirements/1ee1d52.txt b/.riot/requirements/1ee1d52.txt deleted file mode 100644 index 74b44a53b32..00000000000 --- a/.riot/requirements/1ee1d52.txt +++ /dev/null @@ -1,23 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/1ee1d52.in -# -attrs==23.1.0 -coverage[toml]==7.2.7 -httpretty==0.9.7 -hypothesis==6.45.0 -iniconfig==2.0.0 -mock==5.0.2 -msgpack==1.0.5 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.2.0 -pytest==7.4.0 -pytest-asyncio==0.21.0 -pytest-cov==4.1.0 -pytest-mock==3.11.1 -six==1.16.0 -sortedcontainers==2.4.0 -typing-extensions==4.7.1 diff --git a/.riot/requirements/1f6511d.txt b/.riot/requirements/1f6511d.txt deleted file mode 100644 index b7924d68159..00000000000 --- a/.riot/requirements/1f6511d.txt +++ /dev/null @@ -1,40 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.7 -# by the following command: -# -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/1f6511d.in -# -attrs==23.1.0 -certifi==2022.12.7 -charset-normalizer==3.1.0 -click==8.1.3 -coverage[toml]==7.2.3 -exceptiongroup==1.1.1 -flask==2.2.3 -gunicorn==20.1.0 -httpretty==0.9.7 -hypothesis==6.45.0 -idna==3.4 -importlib-metadata==6.6.0 -iniconfig==2.0.0 -itsdangerous==2.1.2 -jinja2==3.1.2 -markupsafe==2.1.2 -mock==5.0.2 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.0.0 -pytest==7.3.1 -pytest-cov==4.0.0 -pytest-mock==3.10.0 -requests==2.29.0 -six==1.16.0 -sortedcontainers==2.4.0 -tomli==2.0.1 -typing-extensions==4.7.0 -urllib3==1.26.15 -werkzeug==2.2.3 -zipp==3.15.0 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/2348649.txt b/.riot/requirements/2348649.txt new file mode 100644 index 00000000000..5cd40c8e2e7 --- /dev/null +++ b/.riot/requirements/2348649.txt @@ -0,0 +1,24 @@ +# +# This file is autogenerated by pip-compile with Python 3.9 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/2348649.in +# +attrs==20.1.0 +coverage[toml]==7.3.0 +exceptiongroup==1.1.3 +httpretty==1.1.4 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +msgpack==1.0.5 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +structlog==23.1.0 +tomli==2.0.1 +wheel==0.41.2 diff --git a/.riot/requirements/3a13f7b.txt b/.riot/requirements/3a13f7b.txt deleted file mode 100644 index 7aaad9001a9..00000000000 --- a/.riot/requirements/3a13f7b.txt +++ /dev/null @@ -1,37 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.10 -# by the following command: -# -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/3a13f7b.in -# -attrs==23.1.0 -certifi==2022.12.7 -charset-normalizer==3.1.0 -click==8.1.3 -coverage[toml]==7.2.3 -exceptiongroup==1.1.1 -flask==2.2.3 -gunicorn==20.1.0 -httpretty==0.9.7 -hypothesis==6.45.0 -idna==3.4 -iniconfig==2.0.0 -itsdangerous==2.1.2 -jinja2==3.1.2 -markupsafe==2.1.2 -mock==5.0.2 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.0.0 -pytest==7.3.1 -pytest-cov==4.0.0 -pytest-mock==3.10.0 -requests==2.29.0 -six==1.16.0 -sortedcontainers==2.4.0 -tomli==2.0.1 -urllib3==1.26.15 -werkzeug==2.3.0 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/3af4ac9.txt b/.riot/requirements/3af4ac9.txt deleted file mode 100644 index d4241c1fab2..00000000000 --- a/.riot/requirements/3af4ac9.txt +++ /dev/null @@ -1,22 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/3af4ac9.in -# -attrs==20.1.0 -coverage[toml]==7.2.2 -httpretty==0.9.7 -hypothesis==6.45.0 -iniconfig==2.0.0 -mock==5.0.1 -msgpack==1.0.5 -opentracing==2.4.0 -packaging==23.0 -pluggy==1.0.0 -pytest==7.2.2 -pytest-cov==4.0.0 -pytest-mock==3.10.0 -six==1.16.0 -sortedcontainers==2.4.0 -structlog==22.3.0 diff --git a/.riot/requirements/3e91d07.txt b/.riot/requirements/3e91d07.txt deleted file mode 100644 index 8b4e7de2170..00000000000 --- a/.riot/requirements/3e91d07.txt +++ /dev/null @@ -1,36 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/3e91d07.in -# -aiobotocore==2.5.4 -aiohttp==3.8.5 -aioitertools==0.11.0 -aiosignal==1.3.1 -async-generator==1.10 -async-timeout==4.0.2 -attrs==23.1.0 -botocore==1.31.17 -charset-normalizer==3.2.0 -coverage[toml]==7.2.7 -frozenlist==1.4.0 -hypothesis==6.45.0 -idna==3.4 -iniconfig==2.0.0 -jmespath==1.0.1 -mock==5.1.0 -multidict==6.0.4 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.2.0 -pytest==7.4.0 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.11.1 -python-dateutil==2.8.2 -six==1.16.0 -sortedcontainers==2.4.0 -urllib3==1.26.16 -wrapt==1.15.0 -yarl==1.9.2 diff --git a/.riot/requirements/4721305.txt b/.riot/requirements/4721305.txt deleted file mode 100644 index 329138de296..00000000000 --- a/.riot/requirements/4721305.txt +++ /dev/null @@ -1,24 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.9 -# by the following command: -# -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/4721305.in -# -attrs==22.2.0 -coverage[toml]==7.2.2 -exceptiongroup==1.1.1 -httpretty==0.9.7 -hypothesis==6.45.0 -iniconfig==2.0.0 -mock==5.0.1 -msgpack==1.0.5 -opentracing==2.4.0 -packaging==23.0 -pluggy==1.0.0 -pytest==7.2.2 -pytest-cov==4.0.0 -pytest-mock==3.10.0 -six==1.16.0 -sortedcontainers==2.4.0 -structlog==22.3.0 -tomli==2.0.1 diff --git a/.riot/requirements/4c0dd57.txt b/.riot/requirements/4c0dd57.txt deleted file mode 100644 index 1e6537d5349..00000000000 --- a/.riot/requirements/4c0dd57.txt +++ /dev/null @@ -1,24 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.8 -# by the following command: -# -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/4c0dd57.in -# -attrs==22.2.0 -coverage[toml]==7.2.2 -exceptiongroup==1.1.1 -httpretty==0.9.7 -hypothesis==6.45.0 -iniconfig==2.0.0 -mock==5.0.1 -msgpack==1.0.5 -opentracing==2.4.0 -packaging==23.0 -pluggy==1.0.0 -pytest==7.2.2 -pytest-cov==4.0.0 -pytest-mock==3.10.0 -six==1.16.0 -sortedcontainers==2.4.0 -structlog==22.3.0 -tomli==2.0.1 diff --git a/.riot/requirements/4fad0fb.txt b/.riot/requirements/4fad0fb.txt deleted file mode 100644 index edc55769473..00000000000 --- a/.riot/requirements/4fad0fb.txt +++ /dev/null @@ -1,36 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/4fad0fb.in -# -aiobotocore==2.0.1 -aiohttp==3.8.5 -aioitertools==0.11.0 -aiosignal==1.3.1 -async-generator==1.10 -async-timeout==4.0.2 -attrs==23.1.0 -botocore==1.22.8 -charset-normalizer==3.2.0 -coverage[toml]==7.2.7 -frozenlist==1.4.0 -hypothesis==6.45.0 -idna==3.4 -iniconfig==2.0.0 -jmespath==0.10.0 -mock==5.1.0 -multidict==6.0.4 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.2.0 -pytest==7.4.0 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.11.1 -python-dateutil==2.8.2 -six==1.16.0 -sortedcontainers==2.4.0 -urllib3==1.26.16 -wrapt==1.15.0 -yarl==1.9.2 diff --git a/.riot/requirements/574c1b1.txt b/.riot/requirements/574c1b1.txt new file mode 100644 index 00000000000..3300df94981 --- /dev/null +++ b/.riot/requirements/574c1b1.txt @@ -0,0 +1,36 @@ +# +# 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/574c1b1.in +# +attrs==23.1.0 +certifi==2023.7.22 +charset-normalizer==3.2.0 +click==8.1.7 +coverage[toml]==7.2.7 +exceptiongroup==1.1.3 +flask==2.2.3 +gunicorn==21.2.0 +httpretty==1.1.4 +hypothesis==6.45.0 +idna==3.4 +importlib-metadata==6.7.0 +iniconfig==2.0.0 +itsdangerous==2.1.2 +jinja2==3.1.2 +markupsafe==2.1.3 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +requests==2.31.0 +sortedcontainers==2.4.0 +tomli==2.0.1 +typing-extensions==4.7.1 +urllib3==2.0.4 +werkzeug==2.2.3 +zipp==3.15.0 diff --git a/.riot/requirements/58d0b7f.txt b/.riot/requirements/58d0b7f.txt new file mode 100644 index 00000000000..82516314d4f --- /dev/null +++ b/.riot/requirements/58d0b7f.txt @@ -0,0 +1,33 @@ +# +# This file is autogenerated by pip-compile with Python 3.10 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/58d0b7f.in +# +attrs==23.1.0 +certifi==2023.7.22 +charset-normalizer==3.2.0 +click==8.1.7 +coverage[toml]==7.3.0 +exceptiongroup==1.1.3 +flask==2.2.3 +gunicorn==21.2.0 +httpretty==1.1.4 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +itsdangerous==2.1.2 +jinja2==3.1.2 +markupsafe==2.1.3 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +requests==2.31.0 +sortedcontainers==2.4.0 +tomli==2.0.1 +urllib3==2.0.4 +werkzeug==2.3.7 diff --git a/.riot/requirements/5c95c1a.txt b/.riot/requirements/5c95c1a.txt new file mode 100644 index 00000000000..52169e753cf --- /dev/null +++ b/.riot/requirements/5c95c1a.txt @@ -0,0 +1,24 @@ +# +# This file is autogenerated by pip-compile with Python 3.9 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/5c95c1a.in +# +attrs==23.1.0 +coverage[toml]==7.3.0 +exceptiongroup==1.1.3 +httpretty==1.1.4 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +msgpack==1.0.5 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +tomli==2.0.1 +typing-extensions==4.7.1 diff --git a/.riot/requirements/5e10a2d.txt b/.riot/requirements/5e10a2d.txt deleted file mode 100644 index a51ce535a9a..00000000000 --- a/.riot/requirements/5e10a2d.txt +++ /dev/null @@ -1,24 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.10 -# by the following command: -# -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/5e10a2d.in -# -attrs==22.2.0 -coverage[toml]==7.2.2 -exceptiongroup==1.1.1 -httpretty==0.9.7 -hypothesis==6.45.0 -iniconfig==2.0.0 -mock==5.0.1 -msgpack==1.0.5 -opentracing==2.4.0 -packaging==23.0 -pluggy==1.0.0 -pytest==7.2.2 -pytest-cov==4.0.0 -pytest-mock==3.10.0 -six==1.16.0 -sortedcontainers==2.4.0 -structlog==22.3.0 -tomli==2.0.1 diff --git a/.riot/requirements/6126a3f.txt b/.riot/requirements/6126a3f.txt new file mode 100644 index 00000000000..395add1fcbe --- /dev/null +++ b/.riot/requirements/6126a3f.txt @@ -0,0 +1,22 @@ +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/6126a3f.in +# +attrs==23.1.0 +coverage[toml]==7.3.0 +httpretty==1.1.4 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +msgpack==1.0.5 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +structlog==23.1.0 +wheel==0.41.2 diff --git a/.riot/requirements/63bcee1.txt b/.riot/requirements/63bcee1.txt deleted file mode 100644 index 1b639c74663..00000000000 --- a/.riot/requirements/63bcee1.txt +++ /dev/null @@ -1,66 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/63bcee1.in -# -ai21==1.2.4 -aiohttp==3.8.5 -aiosignal==1.3.1 -async-timeout==4.0.2 -attrs==23.1.0 -backoff==2.2.1 -certifi==2023.7.22 -charset-normalizer==3.2.0 -cohere==4.19.2 -coverage[toml]==7.2.7 -dataclasses-json==0.5.14 -dnspython==2.4.2 -exceptiongroup==1.1.2 -fastavro==1.8.2 -filelock==3.12.2 -frozenlist==1.4.0 -fsspec==2023.6.0 -huggingface-hub==0.16.4 -hypothesis==6.45.0 -idna==3.4 -importlib-metadata==6.8.0 -iniconfig==2.0.0 -langchain==0.0.192 -langchainplus-sdk==0.0.4 -loguru==0.7.0 -marshmallow==3.20.1 -mock==5.1.0 -multidict==6.0.4 -mypy-extensions==1.0.0 -numexpr==2.8.5 -numpy==1.25.2 -openai==0.27.8 -openapi-schema-pydantic==1.2.4 -opentracing==2.4.0 -packaging==23.1 -pinecone-client==2.2.2 -pluggy==1.2.0 -psutil==5.9.5 -pydantic==1.10.12 -pytest==7.4.0 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.11.1 -python-dateutil==2.8.2 -pyyaml==6.0.1 -regex==2023.8.8 -requests==2.31.0 -six==1.16.0 -sortedcontainers==2.4.0 -sqlalchemy==2.0.19 -tenacity==8.2.2 -tiktoken==0.4.0 -tqdm==4.66.1 -typing-extensions==4.7.1 -typing-inspect==0.9.0 -urllib3==2.0.4 -vcrpy==5.1.0 -wrapt==1.15.0 -yarl==1.9.2 -zipp==3.16.2 diff --git a/.riot/requirements/640620a.txt b/.riot/requirements/640620a.txt new file mode 100644 index 00000000000..9d0f744d62a --- /dev/null +++ b/.riot/requirements/640620a.txt @@ -0,0 +1,24 @@ +# +# This file is autogenerated by pip-compile with Python 3.9 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/640620a.in +# +attrs==23.1.0 +coverage[toml]==7.3.0 +exceptiongroup==1.1.3 +httpretty==1.1.4 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +msgpack==1.0.5 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +structlog==23.1.0 +tomli==2.0.1 +wheel==0.41.2 diff --git a/.riot/requirements/699389a.txt b/.riot/requirements/699389a.txt new file mode 100644 index 00000000000..a7d15de42af --- /dev/null +++ b/.riot/requirements/699389a.txt @@ -0,0 +1,31 @@ +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/699389a.in +# +attrs==23.1.0 +certifi==2023.7.22 +charset-normalizer==3.2.0 +click==8.1.7 +coverage[toml]==7.3.0 +flask==2.2.3 +gunicorn==21.2.0 +httpretty==1.1.4 +hypothesis==6.45.0 +idna==3.4 +iniconfig==2.0.0 +itsdangerous==2.1.2 +jinja2==3.1.2 +markupsafe==2.1.3 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +requests==2.31.0 +sortedcontainers==2.4.0 +urllib3==2.0.4 +werkzeug==2.3.7 diff --git a/.riot/requirements/ef1f1a4.txt b/.riot/requirements/72b2f21.txt similarity index 80% rename from .riot/requirements/ef1f1a4.txt rename to .riot/requirements/72b2f21.txt index 63a0996c00d..6929ee1c2db 100644 --- a/.riot/requirements/ef1f1a4.txt +++ b/.riot/requirements/72b2f21.txt @@ -2,13 +2,13 @@ # This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --no-annotate .riot/requirements/ef1f1a4.in +# pip-compile --no-annotate .riot/requirements/72b2f21.in # attrs==23.1.0 -coverage[toml]==7.2.7 +coverage[toml]==7.3.0 gevent==23.7.0 greenlet==3.0.0a1 -httpretty==0.9.7 +httpretty==1.1.4 hypothesis==6.45.0 iniconfig==2.0.0 mock==5.1.0 @@ -19,7 +19,6 @@ pytest==7.4.0 pytest-asyncio==0.21.1 pytest-cov==4.1.0 pytest-mock==3.11.1 -six==1.16.0 sortedcontainers==2.4.0 zope-event==5.0 zope-interface==6.0 diff --git a/.riot/requirements/72f9106.txt b/.riot/requirements/72f9106.txt new file mode 100644 index 00000000000..13a4c0ea281 --- /dev/null +++ b/.riot/requirements/72f9106.txt @@ -0,0 +1,24 @@ +# +# This file is autogenerated by pip-compile with Python 3.10 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/72f9106.in +# +attrs==23.1.0 +coverage[toml]==7.3.0 +exceptiongroup==1.1.3 +httpretty==1.1.4 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +msgpack==1.0.5 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +structlog==23.1.0 +tomli==2.0.1 +wheel==0.41.2 diff --git a/.riot/requirements/78a356f.txt b/.riot/requirements/78a356f.txt deleted file mode 100644 index 189f5f76bcc..00000000000 --- a/.riot/requirements/78a356f.txt +++ /dev/null @@ -1,35 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/78a356f.in -# -attrs==23.1.0 -certifi==2022.12.7 -charset-normalizer==3.1.0 -click==8.1.3 -coverage[toml]==7.2.3 -flask==2.2.3 -gunicorn==20.1.0 -httpretty==0.9.7 -hypothesis==6.45.0 -idna==3.4 -iniconfig==2.0.0 -itsdangerous==2.1.2 -jinja2==3.1.2 -markupsafe==2.1.2 -mock==5.0.2 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.0.0 -pytest==7.3.1 -pytest-cov==4.0.0 -pytest-mock==3.10.0 -requests==2.29.0 -six==1.16.0 -sortedcontainers==2.4.0 -urllib3==1.26.15 -werkzeug==2.3.0 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/80f0844.txt b/.riot/requirements/80f0844.txt deleted file mode 100644 index faec6426cb0..00000000000 --- a/.riot/requirements/80f0844.txt +++ /dev/null @@ -1,24 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.8 -# by the following command: -# -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/80f0844.in -# -attrs==20.1.0 -coverage[toml]==7.2.2 -exceptiongroup==1.1.1 -httpretty==0.9.7 -hypothesis==6.45.0 -iniconfig==2.0.0 -mock==5.0.1 -msgpack==1.0.5 -opentracing==2.4.0 -packaging==23.0 -pluggy==1.0.0 -pytest==7.2.2 -pytest-cov==4.0.0 -pytest-mock==3.10.0 -six==1.16.0 -sortedcontainers==2.4.0 -structlog==22.3.0 -tomli==2.0.1 diff --git a/.riot/requirements/8606bf2.txt b/.riot/requirements/8606bf2.txt deleted file mode 100644 index d118c7f5418..00000000000 --- a/.riot/requirements/8606bf2.txt +++ /dev/null @@ -1,31 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/8606bf2.in -# -aiohttp==3.8.5 -aiohttp-jinja2==1.5.1 -aiosignal==1.3.1 -async-timeout==4.0.2 -attrs==23.1.0 -charset-normalizer==3.2.0 -coverage[toml]==7.2.7 -frozenlist==1.4.0 -hypothesis==6.45.0 -idna==3.4 -iniconfig==2.0.0 -jinja2==3.1.2 -markupsafe==2.1.3 -mock==5.1.0 -multidict==6.0.4 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.2.0 -pytest==7.4.0 -pytest-aiohttp==1.0.4 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.11.1 -sortedcontainers==2.4.0 -yarl==1.9.2 diff --git a/.riot/requirements/9070b25.txt b/.riot/requirements/9070b25.txt new file mode 100644 index 00000000000..f555bd5edd0 --- /dev/null +++ b/.riot/requirements/9070b25.txt @@ -0,0 +1,24 @@ +# +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/9070b25.in +# +attrs==23.1.0 +coverage[toml]==7.3.0 +exceptiongroup==1.1.3 +httpretty==1.1.4 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +msgpack==1.0.5 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +structlog==23.1.0 +tomli==2.0.1 +wheel==0.41.2 diff --git a/.riot/requirements/9b47f98.txt b/.riot/requirements/9b47f98.txt new file mode 100644 index 00000000000..502d87079c0 --- /dev/null +++ b/.riot/requirements/9b47f98.txt @@ -0,0 +1,24 @@ +# +# This file is autogenerated by pip-compile with Python 3.10 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/9b47f98.in +# +attrs==20.1.0 +coverage[toml]==7.3.0 +exceptiongroup==1.1.3 +httpretty==1.1.4 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +msgpack==1.0.5 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +structlog==23.1.0 +tomli==2.0.1 +wheel==0.41.2 diff --git a/.riot/requirements/1767260.txt b/.riot/requirements/a1828ca.txt similarity index 73% rename from .riot/requirements/1767260.txt rename to .riot/requirements/a1828ca.txt index 926b92fee68..ea9212958b1 100644 --- a/.riot/requirements/1767260.txt +++ b/.riot/requirements/a1828ca.txt @@ -2,11 +2,11 @@ # This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --no-annotate .riot/requirements/1767260.in +# pip-compile --no-annotate .riot/requirements/a1828ca.in # attrs==23.1.0 -coverage[toml]==7.2.7 -httpretty==0.9.7 +coverage[toml]==7.3.0 +httpretty==1.1.4 hypothesis==6.45.0 iniconfig==2.0.0 mock==5.1.0 @@ -17,6 +17,6 @@ pluggy==1.2.0 pytest==7.4.0 pytest-cov==4.1.0 pytest-mock==3.11.1 -six==1.16.0 sortedcontainers==2.4.0 structlog==23.1.0 +wheel==0.41.2 diff --git a/.riot/requirements/1427229.txt b/.riot/requirements/af3567d.txt similarity index 61% rename from .riot/requirements/1427229.txt rename to .riot/requirements/af3567d.txt index d216f7b1c0c..e6c2256704a 100644 --- a/.riot/requirements/1427229.txt +++ b/.riot/requirements/af3567d.txt @@ -1,25 +1,26 @@ # -# This file is autogenerated by pip-compile with Python 3.9 +# 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/1427229.in +# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/af3567d.in # attrs==23.1.0 coverage[toml]==7.2.7 -exceptiongroup==1.1.2 -httpretty==0.9.7 +exceptiongroup==1.1.3 +httpretty==1.1.4 hypothesis==6.45.0 +importlib-metadata==6.7.0 iniconfig==2.0.0 -mock==5.0.2 +mock==5.1.0 msgpack==1.0.5 opentracing==2.4.0 packaging==23.1 pluggy==1.2.0 pytest==7.4.0 -pytest-asyncio==0.21.0 +pytest-asyncio==0.21.1 pytest-cov==4.1.0 pytest-mock==3.11.1 -six==1.16.0 sortedcontainers==2.4.0 tomli==2.0.1 typing-extensions==4.7.1 +zipp==3.15.0 diff --git a/.riot/requirements/345f42d.txt b/.riot/requirements/c2ee914.txt similarity index 59% rename from .riot/requirements/345f42d.txt rename to .riot/requirements/c2ee914.txt index 2d1dec0ff04..66ce3c49b64 100644 --- a/.riot/requirements/345f42d.txt +++ b/.riot/requirements/c2ee914.txt @@ -2,24 +2,23 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/345f42d.in +# pip-compile --no-annotate .riot/requirements/c2ee914.in # attrs==23.1.0 -coverage[toml]==7.2.7 -exceptiongroup==1.1.2 -httpretty==0.9.7 +coverage[toml]==7.3.0 +exceptiongroup==1.1.3 +httpretty==1.1.4 hypothesis==6.45.0 iniconfig==2.0.0 -mock==5.0.2 +mock==5.1.0 msgpack==1.0.5 opentracing==2.4.0 packaging==23.1 pluggy==1.2.0 pytest==7.4.0 -pytest-asyncio==0.21.0 +pytest-asyncio==0.21.1 pytest-cov==4.1.0 pytest-mock==3.11.1 -six==1.16.0 sortedcontainers==2.4.0 tomli==2.0.1 typing-extensions==4.7.1 diff --git a/.riot/requirements/3eacf0d.txt b/.riot/requirements/c503907.txt similarity index 73% rename from .riot/requirements/3eacf0d.txt rename to .riot/requirements/c503907.txt index daaa945bd48..89f8398753b 100644 --- a/.riot/requirements/3eacf0d.txt +++ b/.riot/requirements/c503907.txt @@ -2,11 +2,11 @@ # This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --no-annotate .riot/requirements/3eacf0d.in +# pip-compile --no-annotate .riot/requirements/c503907.in # attrs==20.1.0 -coverage[toml]==7.2.7 -httpretty==0.9.7 +coverage[toml]==7.3.0 +httpretty==1.1.4 hypothesis==6.45.0 iniconfig==2.0.0 mock==5.1.0 @@ -17,6 +17,6 @@ pluggy==1.2.0 pytest==7.4.0 pytest-cov==4.1.0 pytest-mock==3.11.1 -six==1.16.0 sortedcontainers==2.4.0 structlog==23.1.0 +wheel==0.41.2 diff --git a/.riot/requirements/ca1140c.txt b/.riot/requirements/ca1140c.txt deleted file mode 100644 index f8635bb8e90..00000000000 --- a/.riot/requirements/ca1140c.txt +++ /dev/null @@ -1,27 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.7 -# by the following command: -# -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/ca1140c.in -# -attrs==22.2.0 -coverage[toml]==7.2.2 -exceptiongroup==1.1.1 -httpretty==0.9.7 -hypothesis==6.45.0 -importlib-metadata==6.0.0 -iniconfig==2.0.0 -mock==5.0.1 -msgpack==1.0.5 -opentracing==2.4.0 -packaging==23.0 -pluggy==1.0.0 -pytest==7.2.2 -pytest-cov==4.0.0 -pytest-mock==3.10.0 -six==1.16.0 -sortedcontainers==2.4.0 -structlog==22.3.0 -tomli==2.0.1 -typing-extensions==4.7.0 -zipp==3.15.0 diff --git a/.riot/requirements/cb5c806.txt b/.riot/requirements/cb5c806.txt deleted file mode 100644 index cfdc2a56471..00000000000 --- a/.riot/requirements/cb5c806.txt +++ /dev/null @@ -1,21 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/cb5c806.in -# -amqp==5.1.1 -attrs==23.1.0 -coverage[toml]==7.2.7 -hypothesis==6.45.0 -iniconfig==2.0.0 -kombu==5.2.4 -mock==5.1.0 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.2.0 -pytest==7.4.0 -pytest-cov==4.1.0 -pytest-mock==3.11.1 -sortedcontainers==2.4.0 -vine==5.0.0 diff --git a/.riot/requirements/1342cf6.txt b/.riot/requirements/d9c952b.txt similarity index 73% rename from .riot/requirements/1342cf6.txt rename to .riot/requirements/d9c952b.txt index 45d92b9dc26..1e1f5a50f54 100644 --- a/.riot/requirements/1342cf6.txt +++ b/.riot/requirements/d9c952b.txt @@ -2,11 +2,11 @@ # This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --no-annotate .riot/requirements/1342cf6.in +# pip-compile --no-annotate .riot/requirements/d9c952b.in # attrs==23.1.0 -coverage[toml]==7.2.7 -httpretty==0.9.7 +coverage[toml]==7.3.0 +httpretty==1.1.4 hypothesis==6.45.0 iniconfig==2.0.0 mock==5.1.0 @@ -17,6 +17,6 @@ pluggy==1.2.0 pytest==7.4.0 pytest-cov==4.1.0 pytest-mock==3.11.1 -six==1.16.0 sortedcontainers==2.4.0 structlog==23.1.0 +wheel==0.41.2 diff --git a/.riot/requirements/df77164.txt b/.riot/requirements/df77164.txt deleted file mode 100644 index 0863f72ee5a..00000000000 --- a/.riot/requirements/df77164.txt +++ /dev/null @@ -1,20 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/df77164.in -# -attrs==23.1.0 -coverage[toml]==7.2.7 -hypothesis==6.45.0 -iniconfig==2.0.0 -mock==5.1.0 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.2.0 -pytest==7.4.0 -pytest-cov==4.1.0 -pytest-mock==3.11.1 -redis==3.0.1 -redis-py-cluster==2.0.0 -sortedcontainers==2.4.0 diff --git a/.riot/requirements/f7ba2e9.txt b/.riot/requirements/f7ba2e9.txt deleted file mode 100644 index 19ca0d29167..00000000000 --- a/.riot/requirements/f7ba2e9.txt +++ /dev/null @@ -1,46 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/f7ba2e9.in -# -amqp==5.1.1 -attrs==23.1.0 -billiard==3.6.4.0 -celery==5.0.5 -certifi==2023.7.22 -charset-normalizer==3.2.0 -click==7.1.2 -click-didyoumean==0.3.0 -click-plugins==1.1.1 -click-repl==0.3.0 -coverage[toml]==7.2.7 -django==2.2.1 -gevent==23.7.0 -greenlet==3.0.0a1 -hypothesis==6.45.0 -idna==3.4 -iniconfig==2.0.0 -kombu==5.3.1 -mock==5.1.0 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.2.0 -prompt-toolkit==3.0.39 -pytest==7.4.0 -pytest-cov==4.1.0 -pytest-mock==3.11.1 -pytz==2023.3 -requests==2.31.0 -sortedcontainers==2.4.0 -sqlalchemy==1.2.19 -sqlparse==0.4.4 -typing-extensions==4.7.1 -urllib3==2.0.4 -vine==5.0.0 -wcwidth==0.2.6 -zope-event==5.0 -zope-interface==6.0 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/ddtrace/__init__.py b/ddtrace/__init__.py index 399395992e5..bed08f6bb9b 100644 --- a/ddtrace/__init__.py +++ b/ddtrace/__init__.py @@ -18,7 +18,7 @@ from ._logger import configure_ddtrace_logger -# configure ddtrace logger before other modules log +# configure ddtrace logger before other modules log indeed configure_ddtrace_logger() # noqa: E402 from ddtrace.internal import telemetry diff --git a/ddtrace/tracer.py b/ddtrace/tracer.py index c58b5ffe35f..0ab57d85d45 100644 --- a/ddtrace/tracer.py +++ b/ddtrace/tracer.py @@ -77,6 +77,9 @@ from typing import TypeVar +# DELETEME: workaround to get circleci tests working + + log = get_logger(__name__) diff --git a/pyproject.toml b/pyproject.toml index 66b22faf993..cd648161cb9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,29 +21,16 @@ classifiers = [ "Programming Language :: Python :: 3.11", ] dependencies = [ - "attrs>=20,<22; python_version=='2.7'", - "attrs>=20; python_version>'2.7'", + "attrs>=20", "bytecode; python_version>='3.8'", - "bytecode~=0.12.0; python_version=='3.5'", - "bytecode~=0.13.0; python_version=='3.6'", "bytecode~=0.13.0; python_version=='3.7'", - "cattrs; python_version>='3.7'", - "cattrs<1.1; python_version<='3.6'", - "contextlib2<1.0; python_version=='2.7'", + "cattrs", "ddsketch>=2.0.1", - "dead-bytecode; python_version<'3.0'", - "enum34; python_version<'3.4'", "envier", - "funcsigs>=1.0.0; python_version=='2.7'", "importlib_metadata; python_version<'3.8'", - "ipaddress; python_version<'3.7'", - "opentelemetry-api>=1; python_version>='3.7'", - "pathlib2; python_version<'3.5'", - "protobuf>=3,<3.18; python_version<'3.6'", - "protobuf>=3,<4.0; python_version=='3.6'", - "protobuf>=3; python_version>='3.7'", + "opentelemetry-api>=1", + "protobuf>=3", "six>=1.12.0", - "typing; python_version<'3.5'", "typing_extensions", "xmltodict>=0.12", ] diff --git a/riotfile.py b/riotfile.py index cd00af808ca..5770e0f80c9 100644 --- a/riotfile.py +++ b/riotfile.py @@ -160,8 +160,8 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): "coverage": latest, "attrs": ["==20.1.0", latest], "structlog": latest, - # httpretty v1.0 drops python 2.7 support - "httpretty": "==0.9.7", + "httpretty": latest, + "wheel": latest, }, venvs=[ Venv(pys=select_pys()), @@ -193,11 +193,10 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): command="pytest {cmdargs} tests/telemetry/", pys=select_pys(), pkgs={ - # httpretty v1.0 drops python 2.7 support "requests": latest, "gunicorn": latest, "flask": "<=2.2.3", - "httpretty": "==0.9.7", + "httpretty": latest, }, ), Venv( @@ -264,12 +263,11 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): name="internal", command="pytest {cmdargs} tests/internal/", pkgs={ - "httpretty": "==0.9.7", + "httpretty": latest, "gevent": latest, "pytest-asyncio": latest, }, - # FIXME[bytecode-3.11]: internal depends on bytecode, which is not python 3.11 compatible. - pys=select_pys(min_version="3.7"), + pys=select_pys(min_version="3.7", max_version="3.12"), ), Venv( name="gevent", @@ -319,6 +317,7 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): "gevent": ["~=22.10.0", latest], }, ), + # FIXME[python-3.12]: blocked on aiohttp release https://github.com/aio-libs/aiohttp/issues/7229 ], ), ], @@ -346,11 +345,12 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): command="pytest {cmdargs} tests/debugging/", pkgs={ "msgpack": latest, - "httpretty": "==0.9.7", + "httpretty": latest, "typing-extensions": latest, "pytest-asyncio": latest, }, - pys=select_pys(min_version="3.7"), + # FIXME[python-3.12]: blocked on bytecode release https://github.com/MatthieuDartiailh/bytecode/pull/122 + pys=select_pys(min_version="3.7", max_version="3.11"), ), Venv( name="vendor", @@ -701,7 +701,7 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): "requests": latest, "typing-extensions": latest, }, - pys=select_pys(min_version="3.8"), + pys=select_pys(min_version="3.8", max_version="3.11"), ), Venv( name="elasticsearch", @@ -889,7 +889,7 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): ], ), Venv( - pys=select_pys(min_version="3.7"), + pys=select_pys(min_version="3.7", max_version="3.11"), pkgs={ "flask": "~=1.1.0", "flask-caching": ["~=1.10.0", latest], @@ -902,7 +902,7 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): }, ), Venv( - pys=select_pys(min_version="3.7"), + pys=select_pys(min_version="3.7", max_version="3.11"), pkgs={ "flask": [latest], "flask-caching": ["~=1.10.0", latest], @@ -989,7 +989,8 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): command="pytest {cmdargs} tests/contrib/pynamodb", venvs=[ Venv( - pys=select_pys(min_version="3.7"), + # FIXME[python-3.12]: moto test dependency needs to be updated + pys=select_pys(min_version="3.7", max_version="3.11"), pkgs={ "pynamodb": ["~=5.0", "~=5.3", latest], "moto": ">=1.0,<2.0", @@ -1208,7 +1209,8 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): ), Venv( # pyramid added support for Python 3.10/3.11 in 2.1 - pys=select_pys(min_version="3.10"), + # FIXME[python-3.12]: blocked on venusian release https://github.com/Pylons/venusian/issues/85 + pys=select_pys(min_version="3.10", max_version="3.11"), pkgs={ "pyramid": [latest], }, @@ -1223,7 +1225,8 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): # async_generator 1.10 used because @asynccontextmanager was only available in Python 3.6+ # aiobotocore 1.x and higher require Python 3.6 or higher Venv( - pys=select_pys(min_version="3.7"), + # FIXME[python-3.12]: blocked on aiohttp release https://github.com/aio-libs/aiohttp/issues/7229 + pys=select_pys(min_version="3.7", max_version="3.11"), pkgs={ "aiobotocore": ["~=1.4.2", "~=2.0.0", latest], }, @@ -1601,7 +1604,8 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): ], "yarl": "~=1.0", }, - pys=select_pys(min_version="3.7"), + # FIXME[python-3.12]: blocked on aiohttp release https://github.com/aio-libs/aiohttp/issues/7229 + pys=select_pys(min_version="3.7", max_version="3.11"), ), Venv( name="aiohttp_jinja2", @@ -1619,7 +1623,8 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): ], "jinja2": latest, }, - pys=select_pys(min_version="3.7"), + # FIXME[python-3.12]: blocked on aiohttp release https://github.com/aio-libs/aiohttp/issues/7229 + pys=select_pys(min_version="3.7", max_version="3.11"), ), Venv( name="jinja2", @@ -1644,7 +1649,7 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): ), Venv( name="rediscluster", - pys=select_pys(), + pys=select_pys(max_version="3.11"), command="pytest {cmdargs} tests/contrib/rediscluster", pkgs={ # deprecated package @@ -1675,6 +1680,7 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): "redis": ["~=4.3", latest], }, ), + # FIXME[python-3.12]: blocked on redis release https://github.com/redis/redis-py/pull/2873 ], ), Venv( @@ -2082,11 +2088,12 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): ), Venv( # kombu added support for Python 3.10 in 5.2.1 - pys=select_pys(min_version="3.10"), + pys=select_pys(min_version="3.10", max_version="3.11"), pkgs={ "kombu": [">=5.2,<5.3", latest], }, ), + Venv(pys="3.12", pkgs={"kombu": latest}), ], ), Venv( @@ -2128,7 +2135,8 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): Venv( name="langchain", command="pytest {cmdargs} tests/contrib/langchain", - pys=select_pys(min_version="3.9"), + # FIXME[python-3.12]: blocked on aiohttp release https://github.com/aio-libs/aiohttp/issues/7229 + pys=select_pys(min_version="3.9", max_version="3.11"), pkgs={ "langchain": ["==0.0.192", latest], "openai": latest, diff --git a/scripts/needs_testrun.py b/scripts/needs_testrun.py index e42e185a7fa..512bae0a210 100755 --- a/scripts/needs_testrun.py +++ b/scripts/needs_testrun.py @@ -102,8 +102,9 @@ def needs_testrun(suite: str, pr_number: int, sha: t.Optional[str] = None) -> bo """ try: patterns = get_patterns(suite) - except Exception: + except Exception as exc: LOGGER.error("Failed to get patterns") + LOGGER.error(exc) return True if not patterns: # We don't have patterns so we run the tests diff --git a/setup.py b/setup.py index 94800004a0b..6dacb968230 100644 --- a/setup.py +++ b/setup.py @@ -499,9 +499,6 @@ def get_ddup_ext(): bytecode = [ - "dead-bytecode; python_version<'3.0'", # backport of bytecode for Python 2.7 - "bytecode~=0.12.0; python_version=='3.5'", - "bytecode~=0.13.0; python_version=='3.6'", "bytecode~=0.13.0; python_version=='3.7'", "bytecode; python_version>='3.8'", ] @@ -538,15 +535,15 @@ def get_ddup_ext(): # funcsigs backport required for vendored debtcollector install_requires=[ "ddsketch>=2.0.1", - "protobuf>=3; python_version>='3.7'", + "protobuf>=3", "attrs>=20", - "cattrs; python_version>='3.7'", + "cattrs", "six>=1.12.0", "typing_extensions", "importlib_metadata; python_version<'3.8'", "xmltodict>=0.12", "envier", - "opentelemetry-api>=1; python_version>='3.7'", + "opentelemetry-api>=1", "setuptools; python_version>='3.12'", ] + bytecode, diff --git a/tests/contrib/aiopg/py35/__init__.py b/tests/contrib/aiopg/py35/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/contrib/aiopg/py35/test.py b/tests/contrib/aiopg/py35/test.py deleted file mode 100644 index 77e4a61f235..00000000000 --- a/tests/contrib/aiopg/py35/test.py +++ /dev/null @@ -1,61 +0,0 @@ -import asyncio - -import aiopg - -# project -from ddtrace import Pin -from ddtrace.contrib.aiopg.patch import patch -from ddtrace.contrib.aiopg.patch import unpatch -from tests.contrib.asyncio.utils import AsyncioTestCase -from tests.contrib.asyncio.utils import mark_asyncio -from tests.contrib.config import POSTGRES_CONFIG - - -TEST_PORT = str(POSTGRES_CONFIG["port"]) - - -class TestPsycopgPatch(AsyncioTestCase): - # default service - TEST_SERVICE = "postgres" - - def setUp(self): - super().setUp() - self._conn = None - patch() - - def tearDown(self): - super().tearDown() - if self._conn and not self._conn.closed: - self._conn.close() - - unpatch() - - @asyncio.coroutine - def _get_conn_and_tracer(self): - conn = self._conn = yield from aiopg.connect(**POSTGRES_CONFIG) - Pin.get_from(conn).clone(tracer=self.tracer).onto(conn) - - return conn, self.tracer - - async def _test_cursor_ctx_manager(self): - conn, tracer = await self._get_conn_and_tracer() - cur = await conn.cursor() - t = type(cur) - - async with conn.cursor() as cur: - assert t == type(cur), "%s != %s" % (t, type(cur)) - await cur.execute(query="select 'blah'") - rows = await cur.fetchall() - assert len(rows) == 1 - assert rows[0][0] == "blah" - - spans = self.pop_spans() - assert len(spans) == 1 - span = spans[0] - assert span.name == "postgres.query" - - @mark_asyncio - def test_cursor_ctx_manager(self): - # ensure cursors work with context managers - # https://github.com/DataDog/dd-trace-py/issues/228 - yield from self._test_cursor_ctx_manager() diff --git a/tests/contrib/psycopg/test_psycopg.py b/tests/contrib/psycopg/test_psycopg.py index ac574be460e..b48b938c78e 100644 --- a/tests/contrib/psycopg/test_psycopg.py +++ b/tests/contrib/psycopg/test_psycopg.py @@ -93,7 +93,7 @@ def assert_conn_is_traced(self, db, service): rows = res.fetchall() end = time.time() - self.assertEquals(rows, [("foobarblah",)]) + self.assertEqual(rows, [("foobarblah",)]) self.assert_structure( dict(name="postgres.query", resource=q, service=service, error=0, span_type="sql"), @@ -158,7 +158,7 @@ def test_opentracing_propagation(self): cursor.execute(query) rows = cursor.fetchall() - self.assertEquals(rows, [("tracing",)]) + self.assertEqual(rows, [("tracing",)]) self.assert_structure( dict(name="db.access", service="psycopg-svc"), @@ -176,7 +176,7 @@ def test_opentracing_propagation(self): cursor.execute(query) rows = cursor.fetchall() - self.assertEquals(rows, [("tracing",)]) + self.assertEqual(rows, [("tracing",)]) self.assert_structure( dict(name="db.access", service="psycopg-svc"), diff --git a/tests/contrib/psycopg2/test_psycopg.py b/tests/contrib/psycopg2/test_psycopg.py index 098443cae18..3a9e28f6a7c 100644 --- a/tests/contrib/psycopg2/test_psycopg.py +++ b/tests/contrib/psycopg2/test_psycopg.py @@ -100,7 +100,7 @@ def assert_conn_is_traced(self, db, service): rows = cursor.fetchall() end = time.time() - self.assertEquals(rows, [("foobarblah",)]) + self.assertEqual(rows, [("foobarblah",)]) self.assert_structure( dict(name="postgres.query", resource=q, service=service, error=0, span_type="sql"), @@ -164,7 +164,7 @@ def test_opentracing_propagation(self): cursor.execute(query) rows = cursor.fetchall() - self.assertEquals(rows, [("tracing",)]) + self.assertEqual(rows, [("tracing",)]) self.assert_structure( dict(name="db.access", service="psycopg-svc"), @@ -182,7 +182,7 @@ def test_opentracing_propagation(self): cursor.execute(query) rows = cursor.fetchall() - self.assertEquals(rows, [("tracing",)]) + self.assertEqual(rows, [("tracing",)]) self.assert_structure( dict(name="db.access", service="psycopg-svc"), diff --git a/tests/contrib/requests/test_requests.py b/tests/contrib/requests/test_requests.py index 711b3621380..08630d2f862 100644 --- a/tests/contrib/requests/test_requests.py +++ b/tests/contrib/requests/test_requests.py @@ -240,8 +240,12 @@ def test_non_existant_url(self): assert s.get_tag("span.kind") == "client" assert s.get_tag("out.host") == "doesnotexist.google.com" assert s.error == 1 - assert "Failed to establish a new connection" in s.get_tag(ERROR_MSG) - assert "Failed to establish a new connection" in s.get_tag(ERROR_STACK) + if sys.version_info >= (3, 12, 0): + assert "Failed to resolve 'doesnotexist.google.com'" in s.get_tag(ERROR_MSG) + assert "Failed to resolve 'doesnotexist.google.com'" in s.get_tag(ERROR_STACK) + else: + assert "Failed to establish a new connection" in s.get_tag(ERROR_MSG) + assert "Failed to establish a new connection" in s.get_tag(ERROR_STACK) assert "Traceback (most recent call last)" in s.get_tag(ERROR_STACK) assert "requests.exception" in s.get_tag(ERROR_TYPE) diff --git a/tests/debugging/py35/__init__.py b/tests/debugging/py35/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/debugging/py35/test_async.py b/tests/debugging/py35/test_async.py deleted file mode 100644 index 25483e596ba..00000000000 --- a/tests/debugging/py35/test_async.py +++ /dev/null @@ -1,47 +0,0 @@ -import pytest - -from ddtrace.debugging._async import dd_coroutine_wrapper - - -class MockSignalContext: - def __init__(self): - self.retval = None - self.exc_info = None - self.duration = None - - def exit(self, retval, exc_info, duration): - self.retval = retval - self.exc_info = exc_info - self.duration = duration - - -@pytest.mark.asyncio -async def test_dd_coroutine_wrapper_return(): - # type: () -> None - contexts = [MockSignalContext() for _ in range(10)] - - async def coro(): - return 1 - - retval = await dd_coroutine_wrapper(coro(), contexts) - - assert retval == 1 - - assert all((context.retval, context.exc_info) == (1, (None, None, None)) for context in contexts) - - -@pytest.mark.asyncio -async def test_dd_coroutine_wrapper_exc(): - # type: () -> None - contexts = [MockSignalContext() for _ in range(10)] - - class MyException(Exception): - pass - - async def coro(): - raise MyException("error") - - with pytest.raises(MyException): - await dd_coroutine_wrapper(coro(), contexts) - - assert all((context.retval, context.exc_info[0]) == (None, MyException) for context in contexts) diff --git a/tests/internal/py35/__init__.py b/tests/internal/py35/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/internal/py35/asyncstuff.py b/tests/internal/py35/asyncstuff.py deleted file mode 100644 index 3e1fa7e7b61..00000000000 --- a/tests/internal/py35/asyncstuff.py +++ /dev/null @@ -1,2 +0,0 @@ -async def async_func(): - return 42 diff --git a/tests/internal/py35/test_wrapping.py b/tests/internal/py35/test_wrapping.py deleted file mode 100644 index 38893cb8c25..00000000000 --- a/tests/internal/py35/test_wrapping.py +++ /dev/null @@ -1,79 +0,0 @@ -from types import CoroutineType - -import pytest - -from ddtrace.internal.wrapping import wrap -from tests.internal.py35.asyncstuff import async_func as asyncfoo - - -def test_wrap_generator_yield_from(): - channel = [] - - def wrapper(f, args, kwargs): - channel[:] = [] - for _ in f(*args, **kwargs): - channel.append(_) - yield _ - - def g(): - yield from range(10) - - wrap(g, wrapper) - - assert list(g()) == list(range(10)) == channel - - -@pytest.mark.asyncio -async def test_wrap_coroutine(): - channel = [] - - def wrapper(f, args, kwargs): - async def _handle_coroutine(c): - retval = await c - channel.append(retval) - return retval - - channel[:] = [] - retval = f(*args, **kwargs) - if isinstance(retval, CoroutineType): - return _handle_coroutine(retval) - else: - channel.append(retval) - return retval - - async def c(): - return await asyncfoo() - - wrap(c, wrapper) - - assert await c() == 42 - - assert channel == [42] - - -def test_wrap_args_kwarg(): - def f(*args, path=None): - return (args, path) - - def wrapper(f, args, kwargs): - return f(*args, **kwargs) - - wrap(f, wrapper) - - assert f(1, 2) == ((1, 2), None) - - -def test_wrap_arg_args_kwarg_kwargs(): - def f(posarg, *args, path=None, **kwargs): - return (posarg, args, path, kwargs) - - def wrapper(f, args, kwargs): - return f(*args, **kwargs) - - wrap(f, wrapper) - - assert f(1, 2) == (1, (2,), None, {}) - assert f(1, 2, 3, foo="bar") == (1, (2, 3), None, {"foo": "bar"}) - assert f(1, 2, 3, path="bar") == (1, (2, 3), "bar", {}) - assert f(1, 2, 3, 4, path="bar", foo="baz") == (1, (2, 3, 4), "bar", {"foo": "baz"}) - assert f(1, path="bar", foo="baz") == (1, (), "bar", {"foo": "baz"}) diff --git a/tests/internal/remoteconfig/test_remoteconfig.py b/tests/internal/remoteconfig/test_remoteconfig.py index 95c7421354d..488e7fd8d1a 100644 --- a/tests/internal/remoteconfig/test_remoteconfig.py +++ b/tests/internal/remoteconfig/test_remoteconfig.py @@ -3,6 +3,7 @@ import datetime import hashlib import json +import sys from time import sleep import mock @@ -143,6 +144,10 @@ def test_remote_config_enable_validate_rc_disabled(): assert remoteconfig_poller.status == ServiceStatus.STOPPED +@pytest.mark.skipif( + sys.version_info >= (3, 12, 0), + reason="Python 3.12 subprocess will raise deprecation warning for forking in a multi-threaded process", +) @pytest.mark.subprocess(env=dict(DD_REMOTE_CONFIGURATION_ENABLED="true")) def test_remote_config_forksafe(): import os diff --git a/tests/tracer/runtime/test_runtime_metrics.py b/tests/tracer/runtime/test_runtime_metrics.py index 4b0296cddf5..a311caae846 100644 --- a/tests/tracer/runtime/test_runtime_metrics.py +++ b/tests/tracer/runtime/test_runtime_metrics.py @@ -172,14 +172,14 @@ def test_tracer_metrics(self): # check to last set of metrics returned to confirm tags were set for gauge in received[-1:]: - self.assertRegexpMatches(gauge, "service:parent") - self.assertRegexpMatches(gauge, "service:child") - self.assertNotRegexpMatches(gauge, "service:db") - self.assertRegexpMatches(gauge, "env:tests.dog") - self.assertRegexpMatches(gauge, "lang_interpreter:CPython") - self.assertRegexpMatches(gauge, "lang_version:") - self.assertRegexpMatches(gauge, "lang:python") - self.assertRegexpMatches(gauge, "tracer_version:") + self.assertRegex(gauge, "service:parent") + self.assertRegex(gauge, "service:child") + self.assertNotRegex(gauge, "service:db") + self.assertRegex(gauge, "env:tests.dog") + self.assertRegex(gauge, "lang_interpreter:CPython") + self.assertRegex(gauge, "lang_version:") + self.assertRegex(gauge, "lang:python") + self.assertRegex(gauge, "tracer_version:") def test_root_and_child_span_runtime_internal_span_types(self): with runtime_metrics_service(tracer=self.tracer): From 78392b109d196161adfe064177d0cf74a984463c Mon Sep 17 00:00:00 2001 From: "Tahir H. Butt" Date: Thu, 24 Aug 2023 11:56:49 -0400 Subject: [PATCH 03/58] fix: start telemetry writer early --- .circleci/config.yml | 2 +- ddtrace/__init__.py | 9 +++++++++ ddtrace/internal/telemetry/__init__.py | 3 --- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1c910518daa..77e7357a30f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,4 +38,4 @@ jobs: workflows: setup: jobs: - - setup \ No newline at end of file + - setup diff --git a/ddtrace/__init__.py b/ddtrace/__init__.py index bed08f6bb9b..df81fc4e37f 100644 --- a/ddtrace/__init__.py +++ b/ddtrace/__init__.py @@ -41,6 +41,15 @@ # a global tracer instance with integration settings tracer = Tracer() + +# The telemetry writer is not started until data is queued but this creates a +# problem for CPython 3.12 which disallows thread creation at interpreter +# finalization. In order to support 3.12, we start the writer upon initialization. +# See https://github.com/python/cpython/pull/104826. +if sys.version_info >= (3, 12): + telemetry.telemetry_writer.enable() + + __all__ = [ "patch", "patch_all", diff --git a/ddtrace/internal/telemetry/__init__.py b/ddtrace/internal/telemetry/__init__.py index b5ba2bc6d90..e178bb874f4 100644 --- a/ddtrace/internal/telemetry/__init__.py +++ b/ddtrace/internal/telemetry/__init__.py @@ -49,9 +49,6 @@ def _excepthook(tp, value, root_traceback): error_msg = "{}:{} {}".format(filename, lineno, str(value)) telemetry_writer.add_integration(integration_name, True, error_msg=error_msg) - telemetry_writer.app_shutdown() - telemetry_writer.disable() - return _ORIGINAL_EXCEPTHOOK(tp, value, root_traceback) From cf8c3c4762d8a616eee28d5ecaee86e43995c732 Mon Sep 17 00:00:00 2001 From: "Tahir H. Butt" Date: Wed, 30 Aug 2023 11:10:45 -0400 Subject: [PATCH 04/58] skip inject hooks --- tests/internal/test_injection.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/internal/test_injection.py b/tests/internal/test_injection.py index 5db1b7491dd..08fdfd7533a 100644 --- a/tests/internal/test_injection.py +++ b/tests/internal/test_injection.py @@ -1,5 +1,6 @@ from contextlib import contextmanager from random import shuffle +import sys import mock import pytest @@ -14,6 +15,10 @@ from ddtrace.internal.utils.inspection import linenos +if sys.version_info[:2] == (3, 12): + pytest.skip("Skipping since inject hooks is not supported for Python 3.12", allow_module_level=True) + + @contextmanager def injected_hook(f, hook, arg, line=None): if PY2 and isinstance(f, UnboundMethodType): From 24fc937bf6e93ff1fccbeb145be2c46dc97955aa Mon Sep 17 00:00:00 2001 From: "Tahir H. Butt" Date: Wed, 30 Aug 2023 16:25:40 -0400 Subject: [PATCH 05/58] disable dynamic instrumentation --- .riot/requirements/13a3198.txt | 19 ++++++++++++++++ .riot/requirements/1540a76.txt | 22 +++++++++++++++++++ .riot/requirements/19535a2.txt | 18 +++++++++++++++ ddtrace/bootstrap/sitecustomize.py | 8 +++++-- ddtrace/debugging/__init__.py | 5 +++++ riotfile.py | 2 +- tests/debugging/function/__init__.py | 7 ++++++ tests/debugging/test_api.py | 11 ++++++++++ tests/debugging/test_debugger.py | 4 ++++ .../test_debugger_span_decoration.py | 6 +++++ tests/debugging/test_expressions.py | 5 +++++ 11 files changed, 104 insertions(+), 3 deletions(-) create mode 100644 .riot/requirements/13a3198.txt create mode 100644 .riot/requirements/1540a76.txt create mode 100644 .riot/requirements/19535a2.txt diff --git a/.riot/requirements/13a3198.txt b/.riot/requirements/13a3198.txt new file mode 100644 index 00000000000..badbc1d8fbe --- /dev/null +++ b/.riot/requirements/13a3198.txt @@ -0,0 +1,19 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/13a3198.in +# +attrs==23.1.0 +coverage[toml]==7.3.0 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +msgpack==1.0.5 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.3.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/1540a76.txt b/.riot/requirements/1540a76.txt new file mode 100644 index 00000000000..af4fd39fcbf --- /dev/null +++ b/.riot/requirements/1540a76.txt @@ -0,0 +1,22 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1540a76.in +# +attrs==23.1.0 +coverage[toml]==7.3.0 +httpretty==1.1.4 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +msgpack==1.0.5 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.3.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +typing-extensions==4.7.1 diff --git a/.riot/requirements/19535a2.txt b/.riot/requirements/19535a2.txt new file mode 100644 index 00000000000..8449cc5dead --- /dev/null +++ b/.riot/requirements/19535a2.txt @@ -0,0 +1,18 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/19535a2.in +# +attrs==23.1.0 +coverage[toml]==7.3.0 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.3.0 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/ddtrace/bootstrap/sitecustomize.py b/ddtrace/bootstrap/sitecustomize.py index a55b5c8b93c..f2816644a86 100644 --- a/ddtrace/bootstrap/sitecustomize.py +++ b/ddtrace/bootstrap/sitecustomize.py @@ -135,9 +135,13 @@ def _(threading): import ddtrace.profiling.auto # noqa: F401 if di_config.enabled or ed_config.enabled: - from ddtrace.debugging import DynamicInstrumentation + # FIXME[python-3.12]: blocked on bytecode release https://github.com/MatthieuDartiailh/bytecode/pull/122 + if not sys.version_info >= (3, 12): + from ddtrace.debugging import DynamicInstrumentation - DynamicInstrumentation.enable() + DynamicInstrumentation.enable() + else: + log.warning("Dynamic Instrumentation is not supported with Python 3.12 and cannot be enabled.") if config._runtime_metrics_enabled: RuntimeWorker.enable() diff --git a/ddtrace/debugging/__init__.py b/ddtrace/debugging/__init__.py index 343bfbb3b59..eb044b07320 100644 --- a/ddtrace/debugging/__init__.py +++ b/ddtrace/debugging/__init__.py @@ -26,6 +26,11 @@ See the :ref:`Configuration` page for more details on how to configure Dynamic Instrumentation. + + +.. note:: + Dynamic Instrumentation is not supported with Python 3.12. + """ from ddtrace.debugging._debugger import Debugger as DynamicInstrumentation diff --git a/riotfile.py b/riotfile.py index 5770e0f80c9..3aaba25f68f 100644 --- a/riotfile.py +++ b/riotfile.py @@ -350,7 +350,7 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): "pytest-asyncio": latest, }, # FIXME[python-3.12]: blocked on bytecode release https://github.com/MatthieuDartiailh/bytecode/pull/122 - pys=select_pys(min_version="3.7", max_version="3.11"), + pys=select_pys(min_version="3.7", max_version="3.12"), ), Venv( name="vendor", diff --git a/tests/debugging/function/__init__.py b/tests/debugging/function/__init__.py index e69de29bb2d..077fd0fa808 100644 --- a/tests/debugging/function/__init__.py +++ b/tests/debugging/function/__init__.py @@ -0,0 +1,7 @@ +import sys + +import pytest + + +if sys.version_info[:2] == (3, 12): + pytest.skip("Dynamic instrumentation is not supported with Python 3.12", allow_module_level=True) diff --git a/tests/debugging/test_api.py b/tests/debugging/test_api.py index 58c8c12a399..1db59b000cd 100644 --- a/tests/debugging/test_api.py +++ b/tests/debugging/test_api.py @@ -1,6 +1,9 @@ +import sys + import pytest +@pytest.mark.skipif(sys.version_info >= (3, 12), reason="Dynamic Instrumentation is not supported with Python 3.11") @pytest.mark.subprocess(ddtrace_run=True, env=dict(DD_DYNAMIC_INSTRUMENTATION_ENABLED="true"), err=None) def test_debugger_enabled_ddtrace_run(): from ddtrace.debugging import DynamicInstrumentation @@ -8,6 +11,14 @@ def test_debugger_enabled_ddtrace_run(): assert DynamicInstrumentation._instance is not None +@pytest.mark.skipif(sys.version_info < (3, 12), reason="Dynamic Instrumentation disabled for Python 3.12") +@pytest.mark.subprocess(ddtrace_run=True, env=dict(DD_DYNAMIC_INSTRUMENTATION_ENABLED="true"), err=None) +def test_debugger_enabled_ddtrace_run_py312(): + from ddtrace.debugging import DynamicInstrumentation + + assert DynamicInstrumentation._instance is None + + @pytest.mark.subprocess(ddtrace_run=True, err=None) def test_debugger_disabled_ddtrace_run(): from ddtrace.debugging import DynamicInstrumentation diff --git a/tests/debugging/test_debugger.py b/tests/debugging/test_debugger.py index ab1e3890345..060d40c4783 100644 --- a/tests/debugging/test_debugger.py +++ b/tests/debugging/test_debugger.py @@ -32,6 +32,10 @@ from tests.utils import call_program +if sys.version_info[:2] == (3, 12): + pytest.skip("Dynamic instrumentation is not supported with Python 3.12", allow_module_level=True) + + def good_probe(): # DEV: We build this on demand to ensure that rate limiting gets reset. return create_snapshot_line_probe( diff --git a/tests/debugging/test_debugger_span_decoration.py b/tests/debugging/test_debugger_span_decoration.py index 7e4f2b53d62..ea3a9f0721f 100644 --- a/tests/debugging/test_debugger_span_decoration.py +++ b/tests/debugging/test_debugger_span_decoration.py @@ -1,6 +1,8 @@ # -*- encoding: utf-8 -*- import sys +import pytest + import ddtrace from ddtrace.debugging._probe.model import ProbeEvaluateTimingForMethod from ddtrace.debugging._probe.model import SpanDecoration @@ -16,6 +18,10 @@ from tests.utils import TracerTestCase +if sys.version_info[:2] == (3, 12): + pytest.skip("Dynamic instrumentation is not supported with Python 3.12", allow_module_level=True) + + class SpanDecorationProbeTestCase(TracerTestCase): def setUp(self): super(SpanDecorationProbeTestCase, self).setUp() diff --git a/tests/debugging/test_expressions.py b/tests/debugging/test_expressions.py index 3c4d96fe66b..11f4a63b787 100644 --- a/tests/debugging/test_expressions.py +++ b/tests/debugging/test_expressions.py @@ -1,4 +1,5 @@ from dis import dis +import sys import pytest @@ -6,6 +7,10 @@ from ddtrace.internal.safety import SafeObjectProxy +if sys.version_info[:2] == (3, 12): + pytest.skip("Dynamic instrumentation is not supported with Python 3.12", allow_module_level=True) + + class SideEffect(Exception): pass From 4baddb4e0709011f6fdeb9dbdc323096d2daa78a Mon Sep 17 00:00:00 2001 From: "Tahir H. Butt" Date: Thu, 31 Aug 2023 14:04:08 -0400 Subject: [PATCH 06/58] fix telemetry writer after fork --- ddtrace/internal/telemetry/writer.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ddtrace/internal/telemetry/writer.py b/ddtrace/internal/telemetry/writer.py index 29946915d48..2cf7d113828 100644 --- a/ddtrace/internal/telemetry/writer.py +++ b/ddtrace/internal/telemetry/writer.py @@ -632,6 +632,11 @@ def _fork_writer(self): self.stop(join=False) + # Enable writer service in child process to avoid interpeter shutdown + # error in Python 3.12 + if sys.version_info >= (3, 12): + self.enable() + def _restart_sequence(self): self._sequence = itertools.count(1) From d4117d16ca88cd2082c9bf76d70f0f8e0b3100b1 Mon Sep 17 00:00:00 2001 From: "Tahir H. Butt" Date: Thu, 31 Aug 2023 14:07:35 -0400 Subject: [PATCH 07/58] fix forking test --- ddtrace/internal/telemetry/writer.py | 2 +- tests/contrib/futures/test_propagation.py | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ddtrace/internal/telemetry/writer.py b/ddtrace/internal/telemetry/writer.py index 2cf7d113828..54c28bb90e2 100644 --- a/ddtrace/internal/telemetry/writer.py +++ b/ddtrace/internal/telemetry/writer.py @@ -632,7 +632,7 @@ def _fork_writer(self): self.stop(join=False) - # Enable writer service in child process to avoid interpeter shutdown + # Enable writer service in child process to avoid interpreter shutdown # error in Python 3.12 if sys.version_info >= (3, 12): self.enable() diff --git a/tests/contrib/futures/test_propagation.py b/tests/contrib/futures/test_propagation.py index 8a2afe29227..fbbebcd95fe 100644 --- a/tests/contrib/futures/test_propagation.py +++ b/tests/contrib/futures/test_propagation.py @@ -359,7 +359,17 @@ def test_concurrent_futures_with_gevent(): import os import sys - pid = os.fork() + # Temporarily suppress warnings for Python 3.12 as os.fork() will generate a + # DeprecationWarning. See https://github.com/python/cpython/pull/100229/ + if sys.version_info >= (3, 12): + import warnings + + with warnings.catch_warnings(): + warnings.simplefilter("ignore") + pid = os.fork() + else: + pid = os.fork() + if pid == 0: from gevent import monkey From ef59df9df03788823bde439cc31e6aedb6475de0 Mon Sep 17 00:00:00 2001 From: "Tahir H. Butt" Date: Thu, 31 Aug 2023 14:43:56 -0400 Subject: [PATCH 08/58] fix telemetry request tests --- .riot/requirements/{58d0b7f.txt => 10fb966.txt} | 6 +++--- .riot/requirements/{114bf3f.txt => 115be7b.txt} | 6 +++--- .riot/requirements/{1156dac.txt => 6b4fe21.txt} | 6 +++--- .riot/requirements/{10f750a.txt => 95440c5.txt} | 6 +++--- .riot/requirements/{574c1b1.txt => a757772.txt} | 4 ++-- .riot/requirements/{699389a.txt => ac2e77a.txt} | 6 +++--- riotfile.py | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) rename .riot/requirements/{58d0b7f.txt => 10fb966.txt} (85%) rename .riot/requirements/{114bf3f.txt => 115be7b.txt} (85%) rename .riot/requirements/{1156dac.txt => 6b4fe21.txt} (84%) rename .riot/requirements/{10f750a.txt => 95440c5.txt} (85%) rename .riot/requirements/{574c1b1.txt => a757772.txt} (91%) rename .riot/requirements/{699389a.txt => ac2e77a.txt} (84%) diff --git a/.riot/requirements/58d0b7f.txt b/.riot/requirements/10fb966.txt similarity index 85% rename from .riot/requirements/58d0b7f.txt rename to .riot/requirements/10fb966.txt index 82516314d4f..4981649a4fe 100644 --- a/.riot/requirements/58d0b7f.txt +++ b/.riot/requirements/10fb966.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.10 # by the following command: # -# pip-compile --no-annotate .riot/requirements/58d0b7f.in +# pip-compile --no-annotate .riot/requirements/10fb966.in # attrs==23.1.0 certifi==2023.7.22 @@ -12,7 +12,7 @@ coverage[toml]==7.3.0 exceptiongroup==1.1.3 flask==2.2.3 gunicorn==21.2.0 -httpretty==1.1.4 +httpretty==1.0.5 hypothesis==6.45.0 idna==3.4 iniconfig==2.0.0 @@ -22,7 +22,7 @@ markupsafe==2.1.3 mock==5.1.0 opentracing==2.4.0 packaging==23.1 -pluggy==1.2.0 +pluggy==1.3.0 pytest==7.4.0 pytest-cov==4.1.0 pytest-mock==3.11.1 diff --git a/.riot/requirements/114bf3f.txt b/.riot/requirements/115be7b.txt similarity index 85% rename from .riot/requirements/114bf3f.txt rename to .riot/requirements/115be7b.txt index 16b6ccb6e59..bb4baf753f0 100644 --- a/.riot/requirements/114bf3f.txt +++ b/.riot/requirements/115be7b.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.9 # by the following command: # -# pip-compile --no-annotate .riot/requirements/114bf3f.in +# pip-compile --no-annotate .riot/requirements/115be7b.in # attrs==23.1.0 certifi==2023.7.22 @@ -12,7 +12,7 @@ coverage[toml]==7.3.0 exceptiongroup==1.1.3 flask==2.2.3 gunicorn==21.2.0 -httpretty==1.1.4 +httpretty==1.0.5 hypothesis==6.45.0 idna==3.4 importlib-metadata==6.8.0 @@ -23,7 +23,7 @@ markupsafe==2.1.3 mock==5.1.0 opentracing==2.4.0 packaging==23.1 -pluggy==1.2.0 +pluggy==1.3.0 pytest==7.4.0 pytest-cov==4.1.0 pytest-mock==3.11.1 diff --git a/.riot/requirements/1156dac.txt b/.riot/requirements/6b4fe21.txt similarity index 84% rename from .riot/requirements/1156dac.txt rename to .riot/requirements/6b4fe21.txt index ed504eab70d..003c48c02fe 100644 --- a/.riot/requirements/1156dac.txt +++ b/.riot/requirements/6b4fe21.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --no-annotate .riot/requirements/1156dac.in +# pip-compile --no-annotate .riot/requirements/6b4fe21.in # attrs==23.1.0 certifi==2023.7.22 @@ -11,7 +11,7 @@ click==8.1.7 coverage[toml]==7.3.0 flask==2.2.3 gunicorn==21.2.0 -httpretty==1.1.4 +httpretty==1.0.5 hypothesis==6.45.0 idna==3.4 iniconfig==2.0.0 @@ -21,7 +21,7 @@ markupsafe==2.1.3 mock==5.1.0 opentracing==2.4.0 packaging==23.1 -pluggy==1.2.0 +pluggy==1.3.0 pytest==7.4.0 pytest-cov==4.1.0 pytest-mock==3.11.1 diff --git a/.riot/requirements/10f750a.txt b/.riot/requirements/95440c5.txt similarity index 85% rename from .riot/requirements/10f750a.txt rename to .riot/requirements/95440c5.txt index ff4d50f45a5..bf0393dc350 100644 --- a/.riot/requirements/10f750a.txt +++ b/.riot/requirements/95440c5.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --no-annotate .riot/requirements/10f750a.in +# pip-compile --no-annotate .riot/requirements/95440c5.in # attrs==23.1.0 certifi==2023.7.22 @@ -12,7 +12,7 @@ coverage[toml]==7.3.0 exceptiongroup==1.1.3 flask==2.2.3 gunicorn==21.2.0 -httpretty==1.1.4 +httpretty==1.0.5 hypothesis==6.45.0 idna==3.4 importlib-metadata==6.8.0 @@ -23,7 +23,7 @@ markupsafe==2.1.3 mock==5.1.0 opentracing==2.4.0 packaging==23.1 -pluggy==1.2.0 +pluggy==1.3.0 pytest==7.4.0 pytest-cov==4.1.0 pytest-mock==3.11.1 diff --git a/.riot/requirements/574c1b1.txt b/.riot/requirements/a757772.txt similarity index 91% rename from .riot/requirements/574c1b1.txt rename to .riot/requirements/a757772.txt index 3300df94981..5fee9520a80 100644 --- a/.riot/requirements/574c1b1.txt +++ b/.riot/requirements/a757772.txt @@ -2,7 +2,7 @@ # 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/574c1b1.in +# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/a757772.in # attrs==23.1.0 certifi==2023.7.22 @@ -12,7 +12,7 @@ coverage[toml]==7.2.7 exceptiongroup==1.1.3 flask==2.2.3 gunicorn==21.2.0 -httpretty==1.1.4 +httpretty==1.0.5 hypothesis==6.45.0 idna==3.4 importlib-metadata==6.7.0 diff --git a/.riot/requirements/699389a.txt b/.riot/requirements/ac2e77a.txt similarity index 84% rename from .riot/requirements/699389a.txt rename to .riot/requirements/ac2e77a.txt index a7d15de42af..b19295490dc 100644 --- a/.riot/requirements/699389a.txt +++ b/.riot/requirements/ac2e77a.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --no-annotate .riot/requirements/699389a.in +# pip-compile --no-annotate .riot/requirements/ac2e77a.in # attrs==23.1.0 certifi==2023.7.22 @@ -11,7 +11,7 @@ click==8.1.7 coverage[toml]==7.3.0 flask==2.2.3 gunicorn==21.2.0 -httpretty==1.1.4 +httpretty==1.0.5 hypothesis==6.45.0 idna==3.4 iniconfig==2.0.0 @@ -21,7 +21,7 @@ markupsafe==2.1.3 mock==5.1.0 opentracing==2.4.0 packaging==23.1 -pluggy==1.2.0 +pluggy==1.3.0 pytest==7.4.0 pytest-cov==4.1.0 pytest-mock==3.11.1 diff --git a/riotfile.py b/riotfile.py index 3aaba25f68f..ce07d9bbad0 100644 --- a/riotfile.py +++ b/riotfile.py @@ -196,7 +196,7 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): "requests": latest, "gunicorn": latest, "flask": "<=2.2.3", - "httpretty": latest, + "httpretty": "<1.1", }, ), Venv( From 2e32e818bfb22abe3c15b3899ce9a3d56d2cf12e Mon Sep 17 00:00:00 2001 From: Yun Kim Date: Thu, 31 Aug 2023 15:16:08 -0400 Subject: [PATCH 09/58] Remove uwsgi dependency for 3.12 profiler testing --- .riot/requirements/1167a5a.txt | 30 +++++++++++++++++++++++++++++ .riot/requirements/1405df5.txt | 26 +++++++++++++++++++++++++ .riot/requirements/1693ec0.txt | 32 +++++++++++++++++++++++++++++++ .riot/requirements/16b0e2d.txt | 30 +++++++++++++++++++++++++++++ .riot/requirements/1786122.txt | 23 ++++++++++++++++++++++ .riot/requirements/1fede5b.txt | 26 +++++++++++++++++++++++++ .riot/requirements/27679b4.txt | 23 ++++++++++++++++++++++ .riot/requirements/34281dc.txt | 26 +++++++++++++++++++++++++ .riot/requirements/41dfea6.txt | 35 ++++++++++++++++++++++++++++++++++ .riot/requirements/50a0fe2.txt | 32 +++++++++++++++++++++++++++++++ .riot/requirements/aabf077.txt | 32 +++++++++++++++++++++++++++++++ .riot/requirements/ada4a05.txt | 32 +++++++++++++++++++++++++++++++ .riot/requirements/af2e1f3.txt | 29 ++++++++++++++++++++++++++++ riotfile.py | 5 ++++- tests/profiling/test_uwsgi.py | 4 ++-- 15 files changed, 382 insertions(+), 3 deletions(-) create mode 100644 .riot/requirements/1167a5a.txt create mode 100644 .riot/requirements/1405df5.txt create mode 100644 .riot/requirements/1693ec0.txt create mode 100644 .riot/requirements/16b0e2d.txt create mode 100644 .riot/requirements/1786122.txt create mode 100644 .riot/requirements/1fede5b.txt create mode 100644 .riot/requirements/27679b4.txt create mode 100644 .riot/requirements/34281dc.txt create mode 100644 .riot/requirements/41dfea6.txt create mode 100644 .riot/requirements/50a0fe2.txt create mode 100644 .riot/requirements/aabf077.txt create mode 100644 .riot/requirements/ada4a05.txt create mode 100644 .riot/requirements/af2e1f3.txt diff --git a/.riot/requirements/1167a5a.txt b/.riot/requirements/1167a5a.txt new file mode 100644 index 00000000000..ca4ce2e69ed --- /dev/null +++ b/.riot/requirements/1167a5a.txt @@ -0,0 +1,30 @@ +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1167a5a.in +# +attrs==23.1.0 +coverage[toml]==7.3.0 +gevent==22.10.2 +greenlet==2.0.2 +gunicorn[gevent]==21.2.0 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.3.0 +py-cpuinfo==8.0.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-benchmark==4.0.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +uwsgi==2.0.22 +zope-event==5.0 +zope-interface==6.0 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/1405df5.txt b/.riot/requirements/1405df5.txt new file mode 100644 index 00000000000..55126e5eb9a --- /dev/null +++ b/.riot/requirements/1405df5.txt @@ -0,0 +1,26 @@ +# +# This file is autogenerated by pip-compile with Python 3.9 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1405df5.in +# +attrs==23.1.0 +coverage[toml]==7.3.0 +exceptiongroup==1.1.3 +gunicorn==21.2.0 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.3.0 +protobuf==3.19.0 +py-cpuinfo==8.0.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-benchmark==4.0.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +tomli==2.0.1 +uwsgi==2.0.22 diff --git a/.riot/requirements/1693ec0.txt b/.riot/requirements/1693ec0.txt new file mode 100644 index 00000000000..911e2ef1a80 --- /dev/null +++ b/.riot/requirements/1693ec0.txt @@ -0,0 +1,32 @@ +# +# This file is autogenerated by pip-compile with Python 3.10 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1693ec0.in +# +attrs==23.1.0 +coverage[toml]==7.3.0 +exceptiongroup==1.1.3 +gevent==21.8.0 +greenlet==1.1.0 +gunicorn[gevent]==21.2.0 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.3.0 +py-cpuinfo==8.0.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-benchmark==4.0.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +tomli==2.0.1 +uwsgi==2.0.22 +zope-event==5.0 +zope-interface==6.0 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/16b0e2d.txt b/.riot/requirements/16b0e2d.txt new file mode 100644 index 00000000000..29576482b27 --- /dev/null +++ b/.riot/requirements/16b0e2d.txt @@ -0,0 +1,30 @@ +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/16b0e2d.in +# +attrs==23.1.0 +coverage[toml]==7.3.0 +gevent==23.7.0 +greenlet==2.0.2 +gunicorn[gevent]==21.2.0 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.3.0 +py-cpuinfo==8.0.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-benchmark==4.0.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +uwsgi==2.0.22 +zope-event==5.0 +zope-interface==6.0 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/1786122.txt b/.riot/requirements/1786122.txt new file mode 100644 index 00000000000..110a7c03d02 --- /dev/null +++ b/.riot/requirements/1786122.txt @@ -0,0 +1,23 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1786122.in +# +attrs==23.1.0 +coverage[toml]==7.3.0 +gunicorn==21.2.0 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.3.0 +protobuf==4.22.0 +py-cpuinfo==8.0.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-benchmark==4.0.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/1fede5b.txt b/.riot/requirements/1fede5b.txt new file mode 100644 index 00000000000..8efac63e05a --- /dev/null +++ b/.riot/requirements/1fede5b.txt @@ -0,0 +1,26 @@ +# +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: +# +# pip-compile --no-annotate --resolver=backtracking .riot/requirements/1fede5b.in +# +attrs==23.1.0 +coverage[toml]==7.3.0 +exceptiongroup==1.1.3 +gunicorn==21.2.0 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.3.0 +protobuf==4.24.2 +py-cpuinfo==8.0.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-benchmark==4.0.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +tomli==2.0.1 +uwsgi==2.0.22 diff --git a/.riot/requirements/27679b4.txt b/.riot/requirements/27679b4.txt new file mode 100644 index 00000000000..e44e391677c --- /dev/null +++ b/.riot/requirements/27679b4.txt @@ -0,0 +1,23 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/27679b4.in +# +attrs==23.1.0 +coverage[toml]==7.3.0 +gunicorn==21.2.0 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.3.0 +protobuf==4.24.2 +py-cpuinfo==8.0.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-benchmark==4.0.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/34281dc.txt b/.riot/requirements/34281dc.txt new file mode 100644 index 00000000000..71723aa97bf --- /dev/null +++ b/.riot/requirements/34281dc.txt @@ -0,0 +1,26 @@ +# +# This file is autogenerated by pip-compile with Python 3.9 +# by the following command: +# +# pip-compile --no-annotate --resolver=backtracking .riot/requirements/34281dc.in +# +attrs==23.1.0 +coverage[toml]==7.3.0 +exceptiongroup==1.1.3 +gunicorn==21.2.0 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.3.0 +protobuf==4.24.2 +py-cpuinfo==8.0.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-benchmark==4.0.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +tomli==2.0.1 +uwsgi==2.0.22 diff --git a/.riot/requirements/41dfea6.txt b/.riot/requirements/41dfea6.txt new file mode 100644 index 00000000000..d1915b8cf19 --- /dev/null +++ b/.riot/requirements/41dfea6.txt @@ -0,0 +1,35 @@ +# +# 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/41dfea6.in +# +attrs==23.1.0 +coverage[toml]==7.2.7 +exceptiongroup==1.1.3 +gevent==22.10.2 +greenlet==2.0.2 +gunicorn[gevent]==21.2.0 +hypothesis==6.45.0 +importlib-metadata==6.7.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.2.0 +py-cpuinfo==8.0.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-benchmark==4.0.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +tomli==2.0.1 +typing-extensions==4.7.1 +uwsgi==2.0.22 +zipp==3.15.0 +zope-event==5.0 +zope-interface==6.0 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/50a0fe2.txt b/.riot/requirements/50a0fe2.txt new file mode 100644 index 00000000000..0d0b82ad93d --- /dev/null +++ b/.riot/requirements/50a0fe2.txt @@ -0,0 +1,32 @@ +# +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/50a0fe2.in +# +attrs==23.1.0 +coverage[toml]==7.3.0 +exceptiongroup==1.1.3 +gevent==23.7.0 +greenlet==2.0.2 +gunicorn[gevent]==21.2.0 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.3.0 +py-cpuinfo==8.0.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-benchmark==4.0.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +tomli==2.0.1 +uwsgi==2.0.22 +zope-event==5.0 +zope-interface==6.0 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/aabf077.txt b/.riot/requirements/aabf077.txt new file mode 100644 index 00000000000..8e373b1075e --- /dev/null +++ b/.riot/requirements/aabf077.txt @@ -0,0 +1,32 @@ +# +# This file is autogenerated by pip-compile with Python 3.10 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/aabf077.in +# +attrs==23.1.0 +coverage[toml]==7.3.0 +exceptiongroup==1.1.3 +gevent==23.7.0 +greenlet==2.0.2 +gunicorn[gevent]==21.2.0 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.3.0 +py-cpuinfo==8.0.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-benchmark==4.0.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +tomli==2.0.1 +uwsgi==2.0.22 +zope-event==5.0 +zope-interface==6.0 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/ada4a05.txt b/.riot/requirements/ada4a05.txt new file mode 100644 index 00000000000..d09da51f140 --- /dev/null +++ b/.riot/requirements/ada4a05.txt @@ -0,0 +1,32 @@ +# +# This file is autogenerated by pip-compile with Python 3.9 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/ada4a05.in +# +attrs==23.1.0 +coverage[toml]==7.3.0 +exceptiongroup==1.1.3 +gevent==23.7.0 +greenlet==2.0.2 +gunicorn[gevent]==21.2.0 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.3.0 +py-cpuinfo==8.0.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-benchmark==4.0.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +tomli==2.0.1 +uwsgi==2.0.22 +zope-event==5.0 +zope-interface==6.0 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/af2e1f3.txt b/.riot/requirements/af2e1f3.txt new file mode 100644 index 00000000000..21525966ba2 --- /dev/null +++ b/.riot/requirements/af2e1f3.txt @@ -0,0 +1,29 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/af2e1f3.in +# +attrs==23.1.0 +coverage[toml]==7.3.0 +gevent==23.7.0 +greenlet==3.0.0a1 +gunicorn[gevent]==21.2.0 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.3.0 +py-cpuinfo==8.0.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-benchmark==4.0.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +zope-event==5.0 +zope-interface==6.0 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/riotfile.py b/riotfile.py index ce07d9bbad0..a73954bf641 100644 --- a/riotfile.py +++ b/riotfile.py @@ -2225,13 +2225,13 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): # See https://github.com/workhorsy/py-cpuinfo/issues/177 "pytest-benchmark": latest, "py-cpuinfo": "~=8.0.0", - "uwsgi": latest, "pytest-asyncio": latest, }, venvs=[ # Python 3.7 Venv( pys="3.7", + pkgs={"uwsgi": latest}, venvs=[ Venv( pkgs={ @@ -2263,6 +2263,7 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): # Python 3.8 + 3.9 Venv( pys=["3.8", "3.9"], + pkgs={"uwsgi": latest}, venvs=[ Venv( pkgs={ @@ -2294,6 +2295,7 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): # Python 3.10 Venv( pys="3.10", + pkgs={"uwsgi": latest}, venvs=[ Venv( pkgs={ @@ -2325,6 +2327,7 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): # Python 3.11 Venv( pys="3.11", + pkgs={"uwsgi": latest}, venvs=[ Venv( pkgs={ diff --git a/tests/profiling/test_uwsgi.py b/tests/profiling/test_uwsgi.py index b99246b43f0..50cbb968d07 100644 --- a/tests/profiling/test_uwsgi.py +++ b/tests/profiling/test_uwsgi.py @@ -13,9 +13,9 @@ from . import utils -# uwsgi does not support Python 3.10 yet +# uwsgi does not support Python 3.12 yet # uwsgi is not available on Windows -if sys.version_info[:2] >= (3, 10) or sys.platform == "win32": +if sys.version_info[:2] >= (3, 12) or sys.platform == "win32": pytestmark = pytest.mark.skip TESTING_GEVENT = os.getenv("DD_PROFILE_TEST_GEVENT", False) From 55a2d6f38d84ae4251ddfa065433e86fac522a8d Mon Sep 17 00:00:00 2001 From: Yun Kim Date: Thu, 31 Aug 2023 15:57:43 -0400 Subject: [PATCH 10/58] appsec iast is not supported --- tests/smoke_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/smoke_test.py b/tests/smoke_test.py index 1a89409c1ed..615171dba31 100644 --- a/tests/smoke_test.py +++ b/tests/smoke_test.py @@ -16,7 +16,7 @@ def mac_supported_iast_version(): if __name__ == "__main__": # ASM IAST smoke test - if sys.version_info >= (3, 6, 0) and system() != "Windows" and mac_supported_iast_version(): + if (3, 6, 0) <= sys.version_info < (3, 12) and system() != "Windows" and mac_supported_iast_version(): from ddtrace.appsec._iast._taint_tracking._native import ops assert ops From 5ef7c26848e041a2a64062bb2ff3d73c6cec3c86 Mon Sep 17 00:00:00 2001 From: Yun Kim Date: Thu, 31 Aug 2023 16:26:56 -0400 Subject: [PATCH 11/58] Update profiler tests to use latest gevent --- .riot/requirements/1085954.txt | 29 --------------- .riot/requirements/12115db.txt | 32 ----------------- .riot/requirements/139c624.txt | 32 ----------------- .riot/requirements/1431312.txt | 29 --------------- .riot/requirements/146a564.txt | 30 ---------------- .riot/requirements/197d9d9.txt | 30 ---------------- .riot/requirements/1f44441.txt | 29 --------------- .riot/requirements/1f7079e.txt | 29 --------------- .riot/requirements/2635fb0.txt | 29 --------------- .riot/requirements/48059c6.txt | 32 ----------------- .riot/requirements/5d6f54d.txt | 35 ------------------- .riot/requirements/5f096ae.txt | 32 ----------------- .riot/requirements/65c8aef.txt | 32 ----------------- .riot/requirements/8fe2e58.txt | 30 ---------------- .riot/requirements/901e08e.txt | 29 --------------- .riot/requirements/a157848.txt | 32 ----------------- .../requirements/{102cf0a.txt => bec60d9.txt} | 11 +++--- .riot/requirements/db592df.txt | 32 ----------------- .../requirements/{eec83eb.txt => e07ee01.txt} | 12 ++++--- .../requirements/{9d5cd76.txt => e50ca93.txt} | 8 ++--- .riot/requirements/f7531b1.txt | 26 ++++++++++++++ .../requirements/{102f5ed.txt => f94d38e.txt} | 12 ++++--- .../requirements/{1d3adbd.txt => fd28b66.txt} | 6 ++-- .../requirements/{8a20a52.txt => ff654ab.txt} | 10 +++--- riotfile.py | 24 ++----------- 25 files changed, 59 insertions(+), 573 deletions(-) delete mode 100644 .riot/requirements/1085954.txt delete mode 100644 .riot/requirements/12115db.txt delete mode 100644 .riot/requirements/139c624.txt delete mode 100644 .riot/requirements/1431312.txt delete mode 100644 .riot/requirements/146a564.txt delete mode 100644 .riot/requirements/197d9d9.txt delete mode 100644 .riot/requirements/1f44441.txt delete mode 100644 .riot/requirements/1f7079e.txt delete mode 100644 .riot/requirements/2635fb0.txt delete mode 100644 .riot/requirements/48059c6.txt delete mode 100644 .riot/requirements/5d6f54d.txt delete mode 100644 .riot/requirements/5f096ae.txt delete mode 100644 .riot/requirements/65c8aef.txt delete mode 100644 .riot/requirements/8fe2e58.txt delete mode 100644 .riot/requirements/901e08e.txt delete mode 100644 .riot/requirements/a157848.txt rename .riot/requirements/{102cf0a.txt => bec60d9.txt} (78%) delete mode 100644 .riot/requirements/db592df.txt rename .riot/requirements/{eec83eb.txt => e07ee01.txt} (59%) rename .riot/requirements/{9d5cd76.txt => e50ca93.txt} (73%) create mode 100644 .riot/requirements/f7531b1.txt rename .riot/requirements/{102f5ed.txt => f94d38e.txt} (59%) rename .riot/requirements/{1d3adbd.txt => fd28b66.txt} (88%) rename .riot/requirements/{8a20a52.txt => ff654ab.txt} (69%) diff --git a/.riot/requirements/1085954.txt b/.riot/requirements/1085954.txt deleted file mode 100644 index 6d71b5d1812..00000000000 --- a/.riot/requirements/1085954.txt +++ /dev/null @@ -1,29 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.10 -# by the following command: -# -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/1085954.in -# -attrs==23.1.0 -coverage[toml]==7.2.7 -exceptiongroup==1.1.1 -gunicorn==20.1.0 -hypothesis==6.45.0 -iniconfig==2.0.0 -mock==5.0.2 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.0.0 -protobuf==3.19.0 -py-cpuinfo==8.0.0 -pytest==7.3.1 -pytest-asyncio==0.21.0 -pytest-benchmark==4.0.0 -pytest-cov==4.1.0 -pytest-mock==3.10.0 -sortedcontainers==2.4.0 -tomli==2.0.1 -uwsgi==2.0.21 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/12115db.txt b/.riot/requirements/12115db.txt deleted file mode 100644 index 6760b1e2241..00000000000 --- a/.riot/requirements/12115db.txt +++ /dev/null @@ -1,32 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.7 -# by the following command: -# -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/12115db.in -# -attrs==23.1.0 -coverage[toml]==7.2.7 -exceptiongroup==1.1.1 -gunicorn==20.1.0 -hypothesis==6.45.0 -importlib-metadata==6.6.0 -iniconfig==2.0.0 -mock==5.0.2 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.0.0 -protobuf==4.23.2 -py-cpuinfo==8.0.0 -pytest==7.3.1 -pytest-asyncio==0.21.0 -pytest-benchmark==4.0.0 -pytest-cov==4.1.0 -pytest-mock==3.10.0 -sortedcontainers==2.4.0 -tomli==2.0.1 -typing-extensions==4.7.0 -uwsgi==2.0.21 -zipp==3.15.0 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/139c624.txt b/.riot/requirements/139c624.txt deleted file mode 100644 index f722d561901..00000000000 --- a/.riot/requirements/139c624.txt +++ /dev/null @@ -1,32 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.8 -# by the following command: -# -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/139c624.in -# -attrs==23.1.0 -coverage[toml]==7.2.3 -exceptiongroup==1.1.1 -gevent==20.6.1 -greenlet==0.4.16 -gunicorn[gevent]==20.1.0 -hypothesis==6.45.0 -iniconfig==2.0.0 -mock==5.0.2 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.0.0 -py-cpuinfo==8.0.0 -pytest==7.3.1 -pytest-asyncio==0.21.0 -pytest-benchmark==4.0.0 -pytest-cov==4.0.0 -pytest-mock==3.10.0 -sortedcontainers==2.4.0 -tomli==2.0.1 -uwsgi==2.0.21 -zope-event==4.6 -zope-interface==6.0 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/1431312.txt b/.riot/requirements/1431312.txt deleted file mode 100644 index dc4a4ec104b..00000000000 --- a/.riot/requirements/1431312.txt +++ /dev/null @@ -1,29 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.9 -# by the following command: -# -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/1431312.in -# -attrs==23.1.0 -coverage[toml]==7.2.7 -exceptiongroup==1.1.1 -gunicorn==20.1.0 -hypothesis==6.45.0 -iniconfig==2.0.0 -mock==5.0.2 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.0.0 -protobuf==4.23.2 -py-cpuinfo==8.0.0 -pytest==7.3.1 -pytest-asyncio==0.21.0 -pytest-benchmark==4.0.0 -pytest-cov==4.1.0 -pytest-mock==3.10.0 -sortedcontainers==2.4.0 -tomli==2.0.1 -uwsgi==2.0.21 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/146a564.txt b/.riot/requirements/146a564.txt deleted file mode 100644 index a8de9e3d53e..00000000000 --- a/.riot/requirements/146a564.txt +++ /dev/null @@ -1,30 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/146a564.in -# -attrs==23.1.0 -coverage[toml]==7.2.7 -gevent==23.7.0 -greenlet==3.0.0a1 -gunicorn[gevent]==21.2.0 -hypothesis==6.45.0 -iniconfig==2.0.0 -mock==5.1.0 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.2.0 -py-cpuinfo==8.0.0 -pytest==7.4.0 -pytest-asyncio==0.21.1 -pytest-benchmark==4.0.0 -pytest-cov==4.1.0 -pytest-mock==3.11.1 -sortedcontainers==2.4.0 -uwsgi==2.0.22 -zope-event==5.0 -zope-interface==6.0 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/197d9d9.txt b/.riot/requirements/197d9d9.txt deleted file mode 100644 index d8370480802..00000000000 --- a/.riot/requirements/197d9d9.txt +++ /dev/null @@ -1,30 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile --config=pyproject.toml --no-annotate .riot/requirements/197d9d9.in -# -attrs==23.1.0 -coverage[toml]==7.2.3 -gevent==22.10.2 -greenlet==2.0.2 -gunicorn[gevent]==20.1.0 -hypothesis==6.45.0 -iniconfig==2.0.0 -mock==5.0.2 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.0.0 -py-cpuinfo==8.0.0 -pytest==7.3.1 -pytest-asyncio==0.21.0 -pytest-benchmark==4.0.0 -pytest-cov==4.0.0 -pytest-mock==3.10.0 -sortedcontainers==2.4.0 -uwsgi==2.0.21 -zope-event==4.6 -zope-interface==6.0 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/1f44441.txt b/.riot/requirements/1f44441.txt deleted file mode 100644 index 8061397ebc5..00000000000 --- a/.riot/requirements/1f44441.txt +++ /dev/null @@ -1,29 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.10 -# by the following command: -# -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/1f44441.in -# -attrs==23.1.0 -coverage[toml]==7.2.7 -exceptiongroup==1.1.1 -gunicorn==20.1.0 -hypothesis==6.45.0 -iniconfig==2.0.0 -mock==5.0.2 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.0.0 -protobuf==4.23.2 -py-cpuinfo==8.0.0 -pytest==7.3.1 -pytest-asyncio==0.21.0 -pytest-benchmark==4.0.0 -pytest-cov==4.1.0 -pytest-mock==3.10.0 -sortedcontainers==2.4.0 -tomli==2.0.1 -uwsgi==2.0.21 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/1f7079e.txt b/.riot/requirements/1f7079e.txt deleted file mode 100644 index 205c689be87..00000000000 --- a/.riot/requirements/1f7079e.txt +++ /dev/null @@ -1,29 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.9 -# by the following command: -# -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/1f7079e.in -# -attrs==23.1.0 -coverage[toml]==7.2.7 -exceptiongroup==1.1.1 -gunicorn==20.1.0 -hypothesis==6.45.0 -iniconfig==2.0.0 -mock==5.0.2 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.0.0 -protobuf==3.19.0 -py-cpuinfo==8.0.0 -pytest==7.3.1 -pytest-asyncio==0.21.0 -pytest-benchmark==4.0.0 -pytest-cov==4.1.0 -pytest-mock==3.10.0 -sortedcontainers==2.4.0 -tomli==2.0.1 -uwsgi==2.0.21 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/2635fb0.txt b/.riot/requirements/2635fb0.txt deleted file mode 100644 index 80c4199d499..00000000000 --- a/.riot/requirements/2635fb0.txt +++ /dev/null @@ -1,29 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.8 -# by the following command: -# -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/2635fb0.in -# -attrs==23.1.0 -coverage[toml]==7.2.7 -exceptiongroup==1.1.1 -gunicorn==20.1.0 -hypothesis==6.45.0 -iniconfig==2.0.0 -mock==5.0.2 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.0.0 -protobuf==3.19.0 -py-cpuinfo==8.0.0 -pytest==7.3.1 -pytest-asyncio==0.21.0 -pytest-benchmark==4.0.0 -pytest-cov==4.1.0 -pytest-mock==3.10.0 -sortedcontainers==2.4.0 -tomli==2.0.1 -uwsgi==2.0.21 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/48059c6.txt b/.riot/requirements/48059c6.txt deleted file mode 100644 index 6a93b09d408..00000000000 --- a/.riot/requirements/48059c6.txt +++ /dev/null @@ -1,32 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.9 -# by the following command: -# -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/48059c6.in -# -attrs==23.1.0 -coverage[toml]==7.2.3 -exceptiongroup==1.1.1 -gevent==20.6.1 -greenlet==0.4.16 -gunicorn[gevent]==20.1.0 -hypothesis==6.45.0 -iniconfig==2.0.0 -mock==5.0.2 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.0.0 -py-cpuinfo==8.0.0 -pytest==7.3.1 -pytest-asyncio==0.21.0 -pytest-benchmark==4.0.0 -pytest-cov==4.0.0 -pytest-mock==3.10.0 -sortedcontainers==2.4.0 -tomli==2.0.1 -uwsgi==2.0.21 -zope-event==4.6 -zope-interface==6.0 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/5d6f54d.txt b/.riot/requirements/5d6f54d.txt deleted file mode 100644 index 9da7cd6aab4..00000000000 --- a/.riot/requirements/5d6f54d.txt +++ /dev/null @@ -1,35 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.7 -# by the following command: -# -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/5d6f54d.in -# -attrs==23.1.0 -coverage[toml]==7.2.3 -exceptiongroup==1.1.1 -gevent==22.10.2 -greenlet==2.0.2 -gunicorn[gevent]==20.1.0 -hypothesis==6.45.0 -importlib-metadata==6.6.0 -iniconfig==2.0.0 -mock==5.0.2 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.0.0 -py-cpuinfo==8.0.0 -pytest==7.3.1 -pytest-asyncio==0.21.0 -pytest-benchmark==4.0.0 -pytest-cov==4.0.0 -pytest-mock==3.10.0 -sortedcontainers==2.4.0 -tomli==2.0.1 -typing-extensions==4.7.0 -uwsgi==2.0.21 -zipp==3.15.0 -zope-event==4.6 -zope-interface==6.0 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/5f096ae.txt b/.riot/requirements/5f096ae.txt deleted file mode 100644 index f72fbcf5fe8..00000000000 --- a/.riot/requirements/5f096ae.txt +++ /dev/null @@ -1,32 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.10 -# by the following command: -# -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/5f096ae.in -# -attrs==23.1.0 -coverage[toml]==7.2.3 -exceptiongroup==1.1.1 -gevent==22.10.2 -greenlet==2.0.2 -gunicorn[gevent]==20.1.0 -hypothesis==6.45.0 -iniconfig==2.0.0 -mock==5.0.2 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.0.0 -py-cpuinfo==8.0.0 -pytest==7.3.1 -pytest-asyncio==0.21.0 -pytest-benchmark==4.0.0 -pytest-cov==4.0.0 -pytest-mock==3.10.0 -sortedcontainers==2.4.0 -tomli==2.0.1 -uwsgi==2.0.21 -zope-event==4.6 -zope-interface==6.0 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/65c8aef.txt b/.riot/requirements/65c8aef.txt deleted file mode 100644 index cb005781016..00000000000 --- a/.riot/requirements/65c8aef.txt +++ /dev/null @@ -1,32 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.10 -# by the following command: -# -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/65c8aef.in -# -attrs==23.1.0 -coverage[toml]==7.2.3 -exceptiongroup==1.1.1 -gevent==21.8.0 -greenlet==1.1.0 -gunicorn[gevent]==20.1.0 -hypothesis==6.45.0 -iniconfig==2.0.0 -mock==5.0.2 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.0.0 -py-cpuinfo==8.0.0 -pytest==7.3.1 -pytest-asyncio==0.21.0 -pytest-benchmark==4.0.0 -pytest-cov==4.0.0 -pytest-mock==3.10.0 -sortedcontainers==2.4.0 -tomli==2.0.1 -uwsgi==2.0.21 -zope-event==4.6 -zope-interface==6.0 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/8fe2e58.txt b/.riot/requirements/8fe2e58.txt deleted file mode 100644 index f481d453ad3..00000000000 --- a/.riot/requirements/8fe2e58.txt +++ /dev/null @@ -1,30 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/8fe2e58.in -# -attrs==23.1.0 -coverage[toml]==7.2.3 -gevent==22.10.2 -greenlet==2.0.2 -gunicorn[gevent]==20.1.0 -hypothesis==6.45.0 -iniconfig==2.0.0 -mock==5.0.2 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.0.0 -py-cpuinfo==8.0.0 -pytest==7.3.1 -pytest-asyncio==0.21.0 -pytest-benchmark==4.0.0 -pytest-cov==4.0.0 -pytest-mock==3.10.0 -sortedcontainers==2.4.0 -uwsgi==2.0.21 -zope-event==4.6 -zope-interface==6.0 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/901e08e.txt b/.riot/requirements/901e08e.txt deleted file mode 100644 index 3af5f0535c4..00000000000 --- a/.riot/requirements/901e08e.txt +++ /dev/null @@ -1,29 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.8 -# by the following command: -# -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/901e08e.in -# -attrs==23.1.0 -coverage[toml]==7.2.7 -exceptiongroup==1.1.1 -gunicorn==20.1.0 -hypothesis==6.45.0 -iniconfig==2.0.0 -mock==5.0.2 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.0.0 -protobuf==4.23.2 -py-cpuinfo==8.0.0 -pytest==7.3.1 -pytest-asyncio==0.21.0 -pytest-benchmark==4.0.0 -pytest-cov==4.1.0 -pytest-mock==3.10.0 -sortedcontainers==2.4.0 -tomli==2.0.1 -uwsgi==2.0.21 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/a157848.txt b/.riot/requirements/a157848.txt deleted file mode 100644 index e335e78f688..00000000000 --- a/.riot/requirements/a157848.txt +++ /dev/null @@ -1,32 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.9 -# by the following command: -# -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/a157848.in -# -attrs==23.1.0 -coverage[toml]==7.2.3 -exceptiongroup==1.1.1 -gevent==22.10.2 -greenlet==2.0.2 -gunicorn[gevent]==20.1.0 -hypothesis==6.45.0 -iniconfig==2.0.0 -mock==5.0.2 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.0.0 -py-cpuinfo==8.0.0 -pytest==7.3.1 -pytest-asyncio==0.21.0 -pytest-benchmark==4.0.0 -pytest-cov==4.0.0 -pytest-mock==3.10.0 -sortedcontainers==2.4.0 -tomli==2.0.1 -uwsgi==2.0.21 -zope-event==4.6 -zope-interface==6.0 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/102cf0a.txt b/.riot/requirements/bec60d9.txt similarity index 78% rename from .riot/requirements/102cf0a.txt rename to .riot/requirements/bec60d9.txt index fd309f83e41..a2c4d3c156d 100644 --- a/.riot/requirements/102cf0a.txt +++ b/.riot/requirements/bec60d9.txt @@ -2,14 +2,12 @@ # 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/102cf0a.in +# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/bec60d9.in # attrs==23.1.0 coverage[toml]==7.2.7 -exceptiongroup==1.1.2 -gevent==1.4.0 -greenlet==0.4.14 -gunicorn[gevent]==21.2.0 +exceptiongroup==1.1.3 +gunicorn==21.2.0 hypothesis==6.45.0 importlib-metadata==6.7.0 iniconfig==2.0.0 @@ -17,6 +15,7 @@ mock==5.1.0 opentracing==2.4.0 packaging==23.1 pluggy==1.2.0 +protobuf==4.24.2 py-cpuinfo==8.0.0 pytest==7.4.0 pytest-asyncio==0.21.1 @@ -26,5 +25,5 @@ pytest-mock==3.11.1 sortedcontainers==2.4.0 tomli==2.0.1 typing-extensions==4.7.1 -uwsgi==2.0.21 +uwsgi==2.0.22 zipp==3.15.0 diff --git a/.riot/requirements/db592df.txt b/.riot/requirements/db592df.txt deleted file mode 100644 index 78bd7959749..00000000000 --- a/.riot/requirements/db592df.txt +++ /dev/null @@ -1,32 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.8 -# by the following command: -# -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/db592df.in -# -attrs==23.1.0 -coverage[toml]==7.2.3 -exceptiongroup==1.1.1 -gevent==22.10.2 -greenlet==2.0.2 -gunicorn[gevent]==20.1.0 -hypothesis==6.45.0 -iniconfig==2.0.0 -mock==5.0.2 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.0.0 -py-cpuinfo==8.0.0 -pytest==7.3.1 -pytest-asyncio==0.21.0 -pytest-benchmark==4.0.0 -pytest-cov==4.0.0 -pytest-mock==3.10.0 -sortedcontainers==2.4.0 -tomli==2.0.1 -uwsgi==2.0.21 -zope-event==4.6 -zope-interface==6.0 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/eec83eb.txt b/.riot/requirements/e07ee01.txt similarity index 59% rename from .riot/requirements/eec83eb.txt rename to .riot/requirements/e07ee01.txt index f4dfc4fd406..867bb7ae82e 100644 --- a/.riot/requirements/eec83eb.txt +++ b/.riot/requirements/e07ee01.txt @@ -1,19 +1,20 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.10 # by the following command: # -# pip-compile --no-annotate .riot/requirements/eec83eb.in +# pip-compile --no-annotate .riot/requirements/e07ee01.in # attrs==23.1.0 -coverage[toml]==7.2.7 +coverage[toml]==7.3.0 +exceptiongroup==1.1.3 gunicorn==21.2.0 hypothesis==6.45.0 iniconfig==2.0.0 mock==5.1.0 opentracing==2.4.0 packaging==23.1 -pluggy==1.2.0 -protobuf==4.24.0 +pluggy==1.3.0 +protobuf==3.19.0 py-cpuinfo==8.0.0 pytest==7.4.0 pytest-asyncio==0.21.1 @@ -21,4 +22,5 @@ pytest-benchmark==4.0.0 pytest-cov==4.1.0 pytest-mock==3.11.1 sortedcontainers==2.4.0 +tomli==2.0.1 uwsgi==2.0.22 diff --git a/.riot/requirements/9d5cd76.txt b/.riot/requirements/e50ca93.txt similarity index 73% rename from .riot/requirements/9d5cd76.txt rename to .riot/requirements/e50ca93.txt index 0cb404627dc..04ccd6a539b 100644 --- a/.riot/requirements/9d5cd76.txt +++ b/.riot/requirements/e50ca93.txt @@ -2,17 +2,17 @@ # This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --config=pyproject.toml --no-annotate .riot/requirements/9d5cd76.in +# pip-compile --no-annotate .riot/requirements/e50ca93.in # attrs==23.1.0 -coverage[toml]==7.2.7 +coverage[toml]==7.3.0 gunicorn==21.2.0 hypothesis==6.45.0 iniconfig==2.0.0 mock==5.1.0 opentracing==2.4.0 packaging==23.1 -pluggy==1.2.0 +pluggy==1.3.0 protobuf==4.22.0 py-cpuinfo==8.0.0 pytest==7.4.0 @@ -21,4 +21,4 @@ pytest-benchmark==4.0.0 pytest-cov==4.1.0 pytest-mock==3.11.1 sortedcontainers==2.4.0 -uwsgi==2.0.21 +uwsgi==2.0.22 diff --git a/.riot/requirements/f7531b1.txt b/.riot/requirements/f7531b1.txt new file mode 100644 index 00000000000..6175db89da4 --- /dev/null +++ b/.riot/requirements/f7531b1.txt @@ -0,0 +1,26 @@ +# +# This file is autogenerated by pip-compile with Python 3.10 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/f7531b1.in +# +attrs==23.1.0 +coverage[toml]==7.3.0 +exceptiongroup==1.1.3 +gunicorn==21.2.0 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.3.0 +protobuf==4.24.2 +py-cpuinfo==8.0.0 +pytest==7.4.0 +pytest-asyncio==0.21.1 +pytest-benchmark==4.0.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +tomli==2.0.1 +uwsgi==2.0.22 diff --git a/.riot/requirements/102f5ed.txt b/.riot/requirements/f94d38e.txt similarity index 59% rename from .riot/requirements/102f5ed.txt rename to .riot/requirements/f94d38e.txt index 4ade8297125..5833753adc4 100644 --- a/.riot/requirements/102f5ed.txt +++ b/.riot/requirements/f94d38e.txt @@ -1,19 +1,20 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --no-annotate .riot/requirements/102f5ed.in +# pip-compile --no-annotate .riot/requirements/f94d38e.in # attrs==23.1.0 -coverage[toml]==7.2.7 +coverage[toml]==7.3.0 +exceptiongroup==1.1.3 gunicorn==21.2.0 hypothesis==6.45.0 iniconfig==2.0.0 mock==5.1.0 opentracing==2.4.0 packaging==23.1 -pluggy==1.2.0 -protobuf==4.22.0 +pluggy==1.3.0 +protobuf==3.19.0 py-cpuinfo==8.0.0 pytest==7.4.0 pytest-asyncio==0.21.1 @@ -21,4 +22,5 @@ pytest-benchmark==4.0.0 pytest-cov==4.1.0 pytest-mock==3.11.1 sortedcontainers==2.4.0 +tomli==2.0.1 uwsgi==2.0.22 diff --git a/.riot/requirements/1d3adbd.txt b/.riot/requirements/fd28b66.txt similarity index 88% rename from .riot/requirements/1d3adbd.txt rename to .riot/requirements/fd28b66.txt index 1ad516ff1ac..529aa4d53aa 100644 --- a/.riot/requirements/1d3adbd.txt +++ b/.riot/requirements/fd28b66.txt @@ -2,11 +2,11 @@ # 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/1d3adbd.in +# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/fd28b66.in # attrs==23.1.0 coverage[toml]==7.2.7 -exceptiongroup==1.1.2 +exceptiongroup==1.1.3 gunicorn==21.2.0 hypothesis==6.45.0 importlib-metadata==6.7.0 @@ -26,7 +26,7 @@ six==1.16.0 sortedcontainers==2.4.0 tomli==2.0.1 typing-extensions==4.7.1 -uwsgi==2.0.21 +uwsgi==2.0.22 zipp==3.15.0 # The following packages are considered to be unsafe in a requirements file: diff --git a/.riot/requirements/8a20a52.txt b/.riot/requirements/ff654ab.txt similarity index 69% rename from .riot/requirements/8a20a52.txt rename to .riot/requirements/ff654ab.txt index f782196ec16..c03c992fc4c 100644 --- a/.riot/requirements/8a20a52.txt +++ b/.riot/requirements/ff654ab.txt @@ -2,18 +2,18 @@ # This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --config=pyproject.toml --no-annotate .riot/requirements/8a20a52.in +# pip-compile --no-annotate .riot/requirements/ff654ab.in # attrs==23.1.0 -coverage[toml]==7.2.7 +coverage[toml]==7.3.0 gunicorn==21.2.0 hypothesis==6.45.0 iniconfig==2.0.0 mock==5.1.0 opentracing==2.4.0 packaging==23.1 -pluggy==1.2.0 -protobuf==4.23.4 +pluggy==1.3.0 +protobuf==4.24.2 py-cpuinfo==8.0.0 pytest==7.4.0 pytest-asyncio==0.21.1 @@ -21,4 +21,4 @@ pytest-benchmark==4.0.0 pytest-cov==4.1.0 pytest-mock==3.11.1 sortedcontainers==2.4.0 -uwsgi==2.0.21 +uwsgi==2.0.22 diff --git a/riotfile.py b/riotfile.py index a73954bf641..c47d14baf5c 100644 --- a/riotfile.py +++ b/riotfile.py @@ -2245,18 +2245,8 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): }, pkgs={ "gunicorn[gevent]": latest, + "gevent": latest, }, - venvs=[ - Venv( - pkgs={ - "gevent": "==1.4.0", - "greenlet": "==0.4.14", - } - ), - Venv( - pkgs={"gevent": latest}, - ), - ], ), ], ), @@ -2277,18 +2267,8 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): }, pkgs={ "gunicorn[gevent]": latest, + "gevent": latest, }, - venvs=[ - Venv( - pkgs={ - "gevent": "==20.6.1", - "greenlet": "==0.4.16", - } - ), - Venv( - pkgs={"gevent": latest}, - ), - ], ), ], ), From 342e4c35f51c8aa4892c908077376ae34e80014d Mon Sep 17 00:00:00 2001 From: "Gabriele N. Tornetta" Date: Mon, 4 Sep 2023 17:05:49 +0100 Subject: [PATCH 12/58] fix profiler tests --- tests/profiling/collector/test_memalloc.py | 79 ++++++++++------------ 1 file changed, 36 insertions(+), 43 deletions(-) diff --git a/tests/profiling/collector/test_memalloc.py b/tests/profiling/collector/test_memalloc.py index 1359d579363..bb84c37cbf0 100644 --- a/tests/profiling/collector/test_memalloc.py +++ b/tests/profiling/collector/test_memalloc.py @@ -1,10 +1,12 @@ # -*- encoding: utf-8 -*- import gc import os +import sys import threading import pytest +from ddtrace.profiling.event import DDFrame from ddtrace.settings.profiling import ProfilingConfig from ddtrace.settings.profiling import _derive_default_heap_sample_size @@ -78,12 +80,16 @@ def test_iter_events(): assert nframe >= len(stack) last_call = stack[0] assert size >= 1 # size depends on the object size - if last_call[2] == "" and last_call[1] == _ALLOC_LINE_NUMBER: + print(last_call) + if last_call == DDFrame( + __file__, + _ALLOC_LINE_NUMBER, + "" if sys.version_info < (3, 12) else "_allocate_1k", + "", + ): assert thread_id == threading.main_thread().ident - assert last_call[0] == __file__ - assert stack[1][0] == __file__ - assert stack[1][1] == _ALLOC_LINE_NUMBER - assert stack[1][2] == "_allocate_1k" + if sys.version_info < (3, 12): + assert stack[1] == (__file__, _ALLOC_LINE_NUMBER, "_allocate_1k", "") object_count += 1 assert object_count >= 1000 @@ -128,18 +134,22 @@ def test_iter_events_multi_thread(): assert nframe >= len(stack) last_call = stack[0] assert size >= 1 # size depends on the object size - if last_call[2] == "" and last_call[1] == _ALLOC_LINE_NUMBER: - assert last_call[0] == __file__ + if last_call == DDFrame( + __file__, + _ALLOC_LINE_NUMBER, + "" if sys.version_info < (3, 12) else "_allocate_1k", + "", + ): if thread_id == threading.main_thread().ident: count_object += 1 - assert stack[1][0] == __file__ - assert stack[1][1] == _ALLOC_LINE_NUMBER - assert stack[1][2] == "_allocate_1k" + if sys.version_info < (3, 12): + assert stack[1] == (__file__, _ALLOC_LINE_NUMBER, "_allocate_1k", "") elif thread_id == t.ident: count_thread += 1 - assert stack[2][0] == threading.__file__ - assert stack[2][1] > 0 - assert stack[2][2] == "run" + entry = 2 if sys.version_info < (3, 12) else 1 + assert stack[entry][0] == threading.__file__ + assert stack[entry][1] > 0 + assert stack[entry][2] == "run" assert count_object >= 1000 assert count_thread >= 1000 @@ -160,13 +170,14 @@ def test_memory_collector(): assert 0 < event.capture_pct <= 100 last_call = event.frames[0] assert event.size > 0 - if last_call[2] == "" and last_call[1] == _ALLOC_LINE_NUMBER: + if last_call == DDFrame( + __file__, _ALLOC_LINE_NUMBER, "" if sys.version_info < (3, 12) else "_allocate_1k", "" + ): assert event.thread_id == threading.main_thread().ident assert event.thread_name == "MainThread" count_object += 1 - assert event.frames[2][0] == __file__ - assert event.frames[2][1] == 152 - assert event.frames[2][2] == "test_memory_collector" + entry = 2 if sys.version_info < (3, 12) else 1 + assert event.frames[entry] == DDFrame(__file__, 162, "test_memory_collector", "") assert count_object > 0 @@ -226,15 +237,8 @@ def test_heap(): if thread_id == threading.main_thread().ident: thread_found = True assert isinstance(thread_id, int) - if ( - stack[0][0] == __file__ - and stack[0][1] == _ALLOC_LINE_NUMBER - and stack[0][2] == "" - and stack[1][0] == __file__ - and stack[1][1] == _ALLOC_LINE_NUMBER - and stack[1][2] == "_allocate_1k" - and stack[2][0] == __file__ - and stack[2][2] == "test_heap" + if stack[0] == DDFrame( + __file__, _ALLOC_LINE_NUMBER, "" if sys.version_info < (3, 12) else "_allocate_1k", "" ): break else: @@ -245,15 +249,8 @@ def test_heap(): assert 0 < len(stack) <= max_nframe assert size > 0 assert isinstance(thread_id, int) - if ( - stack[0][0] == __file__ - and stack[0][1] == _ALLOC_LINE_NUMBER - and stack[0][2] == "" - and stack[1][0] == __file__ - and stack[1][1] == _ALLOC_LINE_NUMBER - and stack[1][2] == "_allocate_1k" - and stack[2][0] == __file__ - and stack[2][2] == "_pre_allocate_1k" + if stack[0] == DDFrame( + __file__, _ALLOC_LINE_NUMBER, "" if sys.version_info < (3, 12) else "_allocate_1k", "" ): break else: @@ -264,15 +261,11 @@ def test_heap(): assert 0 < len(stack) <= max_nframe assert size > 0 assert isinstance(thread_id, int) + entry = 2 if sys.version_info < (3, 12) else 1 if ( - stack[0][0] == __file__ - and stack[0][1] == _ALLOC_LINE_NUMBER - and stack[0][2] == "" - and stack[1][0] == __file__ - and stack[1][1] == _ALLOC_LINE_NUMBER - and stack[1][2] == "_allocate_1k" - and stack[2][0] == __file__ - and stack[2][2] == "test_heap" + stack[0] + == DDFrame(__file__, _ALLOC_LINE_NUMBER, "" if sys.version_info < (3, 12) else "_allocate_1k", "") + and stack[entry].function_name == "test_heap" ): pytest.fail("Allocated memory still in heap") del y From d96207e4f40a7fb5cdc566582571bac1e2d765a7 Mon Sep 17 00:00:00 2001 From: Yun Kim Date: Tue, 5 Sep 2023 11:17:18 -0400 Subject: [PATCH 13/58] Revert "disable dynamic instrumentation", still enable for 3.12 This reverts commit 0d91f94a165e8866e0f01c58989bb8fd7c00d3dc. --- .riot/requirements/13a3198.txt | 19 ---------------- .riot/requirements/1540a76.txt | 22 ------------------- .riot/requirements/19535a2.txt | 18 --------------- ddtrace/bootstrap/sitecustomize.py | 8 ++----- ddtrace/debugging/__init__.py | 4 ---- riotfile.py | 3 +-- tests/debugging/function/__init__.py | 7 ------ tests/debugging/test_api.py | 11 ---------- tests/debugging/test_debugger.py | 4 ---- .../test_debugger_span_decoration.py | 6 ----- tests/debugging/test_expressions.py | 5 ----- 11 files changed, 3 insertions(+), 104 deletions(-) delete mode 100644 .riot/requirements/13a3198.txt delete mode 100644 .riot/requirements/1540a76.txt delete mode 100644 .riot/requirements/19535a2.txt diff --git a/.riot/requirements/13a3198.txt b/.riot/requirements/13a3198.txt deleted file mode 100644 index badbc1d8fbe..00000000000 --- a/.riot/requirements/13a3198.txt +++ /dev/null @@ -1,19 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/13a3198.in -# -attrs==23.1.0 -coverage[toml]==7.3.0 -hypothesis==6.45.0 -iniconfig==2.0.0 -mock==5.1.0 -msgpack==1.0.5 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.3.0 -pytest==7.4.0 -pytest-cov==4.1.0 -pytest-mock==3.11.1 -sortedcontainers==2.4.0 diff --git a/.riot/requirements/1540a76.txt b/.riot/requirements/1540a76.txt deleted file mode 100644 index af4fd39fcbf..00000000000 --- a/.riot/requirements/1540a76.txt +++ /dev/null @@ -1,22 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/1540a76.in -# -attrs==23.1.0 -coverage[toml]==7.3.0 -httpretty==1.1.4 -hypothesis==6.45.0 -iniconfig==2.0.0 -mock==5.1.0 -msgpack==1.0.5 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.3.0 -pytest==7.4.0 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.11.1 -sortedcontainers==2.4.0 -typing-extensions==4.7.1 diff --git a/.riot/requirements/19535a2.txt b/.riot/requirements/19535a2.txt deleted file mode 100644 index 8449cc5dead..00000000000 --- a/.riot/requirements/19535a2.txt +++ /dev/null @@ -1,18 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/19535a2.in -# -attrs==23.1.0 -coverage[toml]==7.3.0 -hypothesis==6.45.0 -iniconfig==2.0.0 -mock==5.1.0 -opentracing==2.4.0 -packaging==23.1 -pluggy==1.3.0 -pytest==7.4.0 -pytest-cov==4.1.0 -pytest-mock==3.11.1 -sortedcontainers==2.4.0 diff --git a/ddtrace/bootstrap/sitecustomize.py b/ddtrace/bootstrap/sitecustomize.py index f2816644a86..a55b5c8b93c 100644 --- a/ddtrace/bootstrap/sitecustomize.py +++ b/ddtrace/bootstrap/sitecustomize.py @@ -135,13 +135,9 @@ def _(threading): import ddtrace.profiling.auto # noqa: F401 if di_config.enabled or ed_config.enabled: - # FIXME[python-3.12]: blocked on bytecode release https://github.com/MatthieuDartiailh/bytecode/pull/122 - if not sys.version_info >= (3, 12): - from ddtrace.debugging import DynamicInstrumentation + from ddtrace.debugging import DynamicInstrumentation - DynamicInstrumentation.enable() - else: - log.warning("Dynamic Instrumentation is not supported with Python 3.12 and cannot be enabled.") + DynamicInstrumentation.enable() if config._runtime_metrics_enabled: RuntimeWorker.enable() diff --git a/ddtrace/debugging/__init__.py b/ddtrace/debugging/__init__.py index eb044b07320..4df2c40b899 100644 --- a/ddtrace/debugging/__init__.py +++ b/ddtrace/debugging/__init__.py @@ -27,10 +27,6 @@ See the :ref:`Configuration` page for more details on how to configure Dynamic Instrumentation. - -.. note:: - Dynamic Instrumentation is not supported with Python 3.12. - """ from ddtrace.debugging._debugger import Debugger as DynamicInstrumentation diff --git a/riotfile.py b/riotfile.py index c47d14baf5c..564d1eac13b 100644 --- a/riotfile.py +++ b/riotfile.py @@ -349,8 +349,7 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): "typing-extensions": latest, "pytest-asyncio": latest, }, - # FIXME[python-3.12]: blocked on bytecode release https://github.com/MatthieuDartiailh/bytecode/pull/122 - pys=select_pys(min_version="3.7", max_version="3.12"), + pys=select_pys(min_version="3.7"), ), Venv( name="vendor", diff --git a/tests/debugging/function/__init__.py b/tests/debugging/function/__init__.py index 077fd0fa808..e69de29bb2d 100644 --- a/tests/debugging/function/__init__.py +++ b/tests/debugging/function/__init__.py @@ -1,7 +0,0 @@ -import sys - -import pytest - - -if sys.version_info[:2] == (3, 12): - pytest.skip("Dynamic instrumentation is not supported with Python 3.12", allow_module_level=True) diff --git a/tests/debugging/test_api.py b/tests/debugging/test_api.py index 1db59b000cd..58c8c12a399 100644 --- a/tests/debugging/test_api.py +++ b/tests/debugging/test_api.py @@ -1,9 +1,6 @@ -import sys - import pytest -@pytest.mark.skipif(sys.version_info >= (3, 12), reason="Dynamic Instrumentation is not supported with Python 3.11") @pytest.mark.subprocess(ddtrace_run=True, env=dict(DD_DYNAMIC_INSTRUMENTATION_ENABLED="true"), err=None) def test_debugger_enabled_ddtrace_run(): from ddtrace.debugging import DynamicInstrumentation @@ -11,14 +8,6 @@ def test_debugger_enabled_ddtrace_run(): assert DynamicInstrumentation._instance is not None -@pytest.mark.skipif(sys.version_info < (3, 12), reason="Dynamic Instrumentation disabled for Python 3.12") -@pytest.mark.subprocess(ddtrace_run=True, env=dict(DD_DYNAMIC_INSTRUMENTATION_ENABLED="true"), err=None) -def test_debugger_enabled_ddtrace_run_py312(): - from ddtrace.debugging import DynamicInstrumentation - - assert DynamicInstrumentation._instance is None - - @pytest.mark.subprocess(ddtrace_run=True, err=None) def test_debugger_disabled_ddtrace_run(): from ddtrace.debugging import DynamicInstrumentation diff --git a/tests/debugging/test_debugger.py b/tests/debugging/test_debugger.py index 060d40c4783..ab1e3890345 100644 --- a/tests/debugging/test_debugger.py +++ b/tests/debugging/test_debugger.py @@ -32,10 +32,6 @@ from tests.utils import call_program -if sys.version_info[:2] == (3, 12): - pytest.skip("Dynamic instrumentation is not supported with Python 3.12", allow_module_level=True) - - def good_probe(): # DEV: We build this on demand to ensure that rate limiting gets reset. return create_snapshot_line_probe( diff --git a/tests/debugging/test_debugger_span_decoration.py b/tests/debugging/test_debugger_span_decoration.py index ea3a9f0721f..7e4f2b53d62 100644 --- a/tests/debugging/test_debugger_span_decoration.py +++ b/tests/debugging/test_debugger_span_decoration.py @@ -1,8 +1,6 @@ # -*- encoding: utf-8 -*- import sys -import pytest - import ddtrace from ddtrace.debugging._probe.model import ProbeEvaluateTimingForMethod from ddtrace.debugging._probe.model import SpanDecoration @@ -18,10 +16,6 @@ from tests.utils import TracerTestCase -if sys.version_info[:2] == (3, 12): - pytest.skip("Dynamic instrumentation is not supported with Python 3.12", allow_module_level=True) - - class SpanDecorationProbeTestCase(TracerTestCase): def setUp(self): super(SpanDecorationProbeTestCase, self).setUp() diff --git a/tests/debugging/test_expressions.py b/tests/debugging/test_expressions.py index 11f4a63b787..3c4d96fe66b 100644 --- a/tests/debugging/test_expressions.py +++ b/tests/debugging/test_expressions.py @@ -1,5 +1,4 @@ from dis import dis -import sys import pytest @@ -7,10 +6,6 @@ from ddtrace.internal.safety import SafeObjectProxy -if sys.version_info[:2] == (3, 12): - pytest.skip("Dynamic instrumentation is not supported with Python 3.12", allow_module_level=True) - - class SideEffect(Exception): pass From 666104f0352b91b0a1be674c253abada71fe85bd Mon Sep 17 00:00:00 2001 From: "Gabriele N. Tornetta" Date: Tue, 5 Sep 2023 16:32:29 +0100 Subject: [PATCH 14/58] re-enable bytecode-based tests --- ddtrace/debugging/_expressions.py | 3 +++ riotfile.py | 2 +- tests/debugging/function/test_store.py | 8 ++++++-- tests/internal/test_injection.py | 5 ----- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ddtrace/debugging/_expressions.py b/ddtrace/debugging/_expressions.py index 1325b0864eb..5406ca267d0 100644 --- a/ddtrace/debugging/_expressions.py +++ b/ddtrace/debugging/_expressions.py @@ -25,6 +25,7 @@ """ # noqa from itertools import chain import re +import sys from types import FunctionType from typing import Any from typing import Callable @@ -67,6 +68,8 @@ def _make_function(ast, args, name): raise ValueError("Invalid predicate: %r" % ast) instrs = compiled + [Instr("RETURN_VALUE")] + if sys.version_info >= (3, 11): + instrs.insert(0, Instr("RESUME", 0)) abstract_code = Bytecode(instrs) abstract_code.argcount = len(args) diff --git a/riotfile.py b/riotfile.py index 564d1eac13b..43d028a2b09 100644 --- a/riotfile.py +++ b/riotfile.py @@ -349,7 +349,7 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): "typing-extensions": latest, "pytest-asyncio": latest, }, - pys=select_pys(min_version="3.7"), + pys=select_pys(), ), Venv( name="vendor", diff --git a/tests/debugging/function/test_store.py b/tests/debugging/function/test_store.py index 19306114095..df3ae065505 100644 --- a/tests/debugging/function/test_store.py +++ b/tests/debugging/function/test_store.py @@ -203,7 +203,9 @@ def test_function_inject_wrap_commutativity(): # Unwrapping store.unwrap(stuff.modulestuff) - assert stuff.modulestuff.__code__ is not code and stuff.modulestuff.__code__ == code + assert stuff.modulestuff.__code__ is not code + if sys.version_info < (3, 12): + assert stuff.modulestuff.__code__ == code def test_function_wrap_inject_commutativity(): @@ -228,4 +230,6 @@ def test_function_wrap_inject_commutativity(): assert stuff.modulestuff.__code__ is not code store.eject_hook(stuff.modulestuff, hook, lo, 42) - assert stuff.modulestuff.__code__ is not code and stuff.modulestuff.__code__ == code + assert stuff.modulestuff.__code__ is not code + if sys.version_info < (3, 12): + assert stuff.modulestuff.__code__ == code diff --git a/tests/internal/test_injection.py b/tests/internal/test_injection.py index 08fdfd7533a..5db1b7491dd 100644 --- a/tests/internal/test_injection.py +++ b/tests/internal/test_injection.py @@ -1,6 +1,5 @@ from contextlib import contextmanager from random import shuffle -import sys import mock import pytest @@ -15,10 +14,6 @@ from ddtrace.internal.utils.inspection import linenos -if sys.version_info[:2] == (3, 12): - pytest.skip("Skipping since inject hooks is not supported for Python 3.12", allow_module_level=True) - - @contextmanager def injected_hook(f, hook, arg, line=None): if PY2 and isinstance(f, UnboundMethodType): From fe670ddc7f3efe78f4b618f794032ccb9ddf68e5 Mon Sep 17 00:00:00 2001 From: Yun Kim Date: Tue, 5 Sep 2023 13:24:43 -0400 Subject: [PATCH 15/58] re-add removed pyXY files as they are still applicable to python X.Y and above --- .riot/requirements/1540a76.txt | 22 ++++++++ tests/contrib/aiopg/py35/__init__.py | 0 tests/contrib/aiopg/py35/test.py | 61 +++++++++++++++++++++ tests/debugging/py35/__init__.py | 0 tests/debugging/py35/test_async.py | 47 +++++++++++++++++ tests/internal/py35/__init__.py | 0 tests/internal/py35/asyncstuff.py | 2 + tests/internal/py35/test_wrapping.py | 79 ++++++++++++++++++++++++++++ 8 files changed, 211 insertions(+) create mode 100644 .riot/requirements/1540a76.txt create mode 100644 tests/contrib/aiopg/py35/__init__.py create mode 100644 tests/contrib/aiopg/py35/test.py create mode 100644 tests/debugging/py35/__init__.py create mode 100644 tests/debugging/py35/test_async.py create mode 100644 tests/internal/py35/__init__.py create mode 100644 tests/internal/py35/asyncstuff.py create mode 100644 tests/internal/py35/test_wrapping.py diff --git a/.riot/requirements/1540a76.txt b/.riot/requirements/1540a76.txt new file mode 100644 index 00000000000..eb8ae8adc31 --- /dev/null +++ b/.riot/requirements/1540a76.txt @@ -0,0 +1,22 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1540a76.in +# +attrs==23.1.0 +coverage[toml]==7.3.0 +httpretty==1.1.4 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +msgpack==1.0.5 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.3.0 +pytest==7.4.1 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 +typing-extensions==4.7.1 diff --git a/tests/contrib/aiopg/py35/__init__.py b/tests/contrib/aiopg/py35/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/contrib/aiopg/py35/test.py b/tests/contrib/aiopg/py35/test.py new file mode 100644 index 00000000000..77e4a61f235 --- /dev/null +++ b/tests/contrib/aiopg/py35/test.py @@ -0,0 +1,61 @@ +import asyncio + +import aiopg + +# project +from ddtrace import Pin +from ddtrace.contrib.aiopg.patch import patch +from ddtrace.contrib.aiopg.patch import unpatch +from tests.contrib.asyncio.utils import AsyncioTestCase +from tests.contrib.asyncio.utils import mark_asyncio +from tests.contrib.config import POSTGRES_CONFIG + + +TEST_PORT = str(POSTGRES_CONFIG["port"]) + + +class TestPsycopgPatch(AsyncioTestCase): + # default service + TEST_SERVICE = "postgres" + + def setUp(self): + super().setUp() + self._conn = None + patch() + + def tearDown(self): + super().tearDown() + if self._conn and not self._conn.closed: + self._conn.close() + + unpatch() + + @asyncio.coroutine + def _get_conn_and_tracer(self): + conn = self._conn = yield from aiopg.connect(**POSTGRES_CONFIG) + Pin.get_from(conn).clone(tracer=self.tracer).onto(conn) + + return conn, self.tracer + + async def _test_cursor_ctx_manager(self): + conn, tracer = await self._get_conn_and_tracer() + cur = await conn.cursor() + t = type(cur) + + async with conn.cursor() as cur: + assert t == type(cur), "%s != %s" % (t, type(cur)) + await cur.execute(query="select 'blah'") + rows = await cur.fetchall() + assert len(rows) == 1 + assert rows[0][0] == "blah" + + spans = self.pop_spans() + assert len(spans) == 1 + span = spans[0] + assert span.name == "postgres.query" + + @mark_asyncio + def test_cursor_ctx_manager(self): + # ensure cursors work with context managers + # https://github.com/DataDog/dd-trace-py/issues/228 + yield from self._test_cursor_ctx_manager() diff --git a/tests/debugging/py35/__init__.py b/tests/debugging/py35/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/debugging/py35/test_async.py b/tests/debugging/py35/test_async.py new file mode 100644 index 00000000000..25483e596ba --- /dev/null +++ b/tests/debugging/py35/test_async.py @@ -0,0 +1,47 @@ +import pytest + +from ddtrace.debugging._async import dd_coroutine_wrapper + + +class MockSignalContext: + def __init__(self): + self.retval = None + self.exc_info = None + self.duration = None + + def exit(self, retval, exc_info, duration): + self.retval = retval + self.exc_info = exc_info + self.duration = duration + + +@pytest.mark.asyncio +async def test_dd_coroutine_wrapper_return(): + # type: () -> None + contexts = [MockSignalContext() for _ in range(10)] + + async def coro(): + return 1 + + retval = await dd_coroutine_wrapper(coro(), contexts) + + assert retval == 1 + + assert all((context.retval, context.exc_info) == (1, (None, None, None)) for context in contexts) + + +@pytest.mark.asyncio +async def test_dd_coroutine_wrapper_exc(): + # type: () -> None + contexts = [MockSignalContext() for _ in range(10)] + + class MyException(Exception): + pass + + async def coro(): + raise MyException("error") + + with pytest.raises(MyException): + await dd_coroutine_wrapper(coro(), contexts) + + assert all((context.retval, context.exc_info[0]) == (None, MyException) for context in contexts) diff --git a/tests/internal/py35/__init__.py b/tests/internal/py35/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/internal/py35/asyncstuff.py b/tests/internal/py35/asyncstuff.py new file mode 100644 index 00000000000..3e1fa7e7b61 --- /dev/null +++ b/tests/internal/py35/asyncstuff.py @@ -0,0 +1,2 @@ +async def async_func(): + return 42 diff --git a/tests/internal/py35/test_wrapping.py b/tests/internal/py35/test_wrapping.py new file mode 100644 index 00000000000..38893cb8c25 --- /dev/null +++ b/tests/internal/py35/test_wrapping.py @@ -0,0 +1,79 @@ +from types import CoroutineType + +import pytest + +from ddtrace.internal.wrapping import wrap +from tests.internal.py35.asyncstuff import async_func as asyncfoo + + +def test_wrap_generator_yield_from(): + channel = [] + + def wrapper(f, args, kwargs): + channel[:] = [] + for _ in f(*args, **kwargs): + channel.append(_) + yield _ + + def g(): + yield from range(10) + + wrap(g, wrapper) + + assert list(g()) == list(range(10)) == channel + + +@pytest.mark.asyncio +async def test_wrap_coroutine(): + channel = [] + + def wrapper(f, args, kwargs): + async def _handle_coroutine(c): + retval = await c + channel.append(retval) + return retval + + channel[:] = [] + retval = f(*args, **kwargs) + if isinstance(retval, CoroutineType): + return _handle_coroutine(retval) + else: + channel.append(retval) + return retval + + async def c(): + return await asyncfoo() + + wrap(c, wrapper) + + assert await c() == 42 + + assert channel == [42] + + +def test_wrap_args_kwarg(): + def f(*args, path=None): + return (args, path) + + def wrapper(f, args, kwargs): + return f(*args, **kwargs) + + wrap(f, wrapper) + + assert f(1, 2) == ((1, 2), None) + + +def test_wrap_arg_args_kwarg_kwargs(): + def f(posarg, *args, path=None, **kwargs): + return (posarg, args, path, kwargs) + + def wrapper(f, args, kwargs): + return f(*args, **kwargs) + + wrap(f, wrapper) + + assert f(1, 2) == (1, (2,), None, {}) + assert f(1, 2, 3, foo="bar") == (1, (2, 3), None, {"foo": "bar"}) + assert f(1, 2, 3, path="bar") == (1, (2, 3), "bar", {}) + assert f(1, 2, 3, 4, path="bar", foo="baz") == (1, (2, 3, 4), "bar", {"foo": "baz"}) + assert f(1, path="bar", foo="baz") == (1, (), "bar", {"foo": "baz"}) From 4df49fcf2d2da1cdc6fe30055e6108aebe8d8ee8 Mon Sep 17 00:00:00 2001 From: Yun Kim Date: Tue, 5 Sep 2023 13:50:00 -0400 Subject: [PATCH 16/58] Fix riot lockfiles, remove debug print line --- tests/profiling/collector/test_memalloc.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/profiling/collector/test_memalloc.py b/tests/profiling/collector/test_memalloc.py index bb84c37cbf0..d3874d8844d 100644 --- a/tests/profiling/collector/test_memalloc.py +++ b/tests/profiling/collector/test_memalloc.py @@ -80,7 +80,6 @@ def test_iter_events(): assert nframe >= len(stack) last_call = stack[0] assert size >= 1 # size depends on the object size - print(last_call) if last_call == DDFrame( __file__, _ALLOC_LINE_NUMBER, From 180a331ec6120a0cb542d852c73f9d79621b811c Mon Sep 17 00:00:00 2001 From: Yun Kim Date: Tue, 5 Sep 2023 13:51:13 -0400 Subject: [PATCH 17/58] Remove indentations in release note --- releasenotes/notes/release-2.0-3af0045e2261bd02.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/releasenotes/notes/release-2.0-3af0045e2261bd02.yaml b/releasenotes/notes/release-2.0-3af0045e2261bd02.yaml index 9b42a5fc422..7d76e7bfe8a 100644 --- a/releasenotes/notes/release-2.0-3af0045e2261bd02.yaml +++ b/releasenotes/notes/release-2.0-3af0045e2261bd02.yaml @@ -5,6 +5,7 @@ prelude: > versions of the ddtrace library, drops support for Python 2.7, 3.5, and 3.6, and adds support for Python 3.12. + .. important:: ddtrace v2.0.0 drops support for Python 2.7, 3.5, and 3.6. Users running these unsupported Python versions should consider upgrading their Python version or continue using ddtrace v1 From 70d45737784d1a73302a66e4c1ffeaba3d7f9451 Mon Sep 17 00:00:00 2001 From: Yun Kim Date: Tue, 5 Sep 2023 15:51:19 -0400 Subject: [PATCH 18/58] profiling merge fix --- tests/profiling/collector/test_memalloc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/profiling/collector/test_memalloc.py b/tests/profiling/collector/test_memalloc.py index d3874d8844d..712f6f93662 100644 --- a/tests/profiling/collector/test_memalloc.py +++ b/tests/profiling/collector/test_memalloc.py @@ -176,7 +176,7 @@ def test_memory_collector(): assert event.thread_name == "MainThread" count_object += 1 entry = 2 if sys.version_info < (3, 12) else 1 - assert event.frames[entry] == DDFrame(__file__, 162, "test_memory_collector", "") + assert event.frames[entry] == DDFrame(__file__, 161, "test_memory_collector", "") assert count_object > 0 From 4c9bacb57d56edf66139994ba9c2f147f0c6d443 Mon Sep 17 00:00:00 2001 From: Yun Kim <35776586+Yun-Kim@users.noreply.github.com> Date: Tue, 5 Sep 2023 16:28:58 -0400 Subject: [PATCH 19/58] chore: remove deprecated items (#6580) This PR adds a note to upgrade to 2.x in `upgrading.rst` and removes all deprecated items slated for removal in 2.0.0. This includes: - `DD_GEVENT_PATCH_ALL`: no special configuration is now necessary to make `ddtrace-run` work with gevent. - `DD_AWS_TAG_ALL_PARAMS`: the boto/botocore/aiobotocore integrations no longer collect all API parameters by default. - `DD_REMOTECONFIG_POLL_SECONDS`: replaced by `DD_REMOTE_CONFIG_POLL_INTERVAL_SECONDS` - ASM deprecated constants including ``APPSEC_ENABLED``, ``APPSEC_JSON``, ``APPSEC_EVENT_RULE_VERSION``, ``APPSEC_EVENT_RULE_ERRORS``, ``APPSEC_EVENT_RULE_LOADED``, ``APPSEC_EVENT_RULE_ERROR_COUNT``, ``APPSEC_WAF_DURATION``, ``APPSEC_WAF_DURATION_EXT``, ``APPSEC_WAF_TIMEOUTS``, ``APPSEC_WAF_VERSION``, ``APPSEC_ORIGIN_VALUE``, ``APPSEC_BLOCKED``, ``IAST_JSON``, ``IAST_ENABLED``, ``IAST_CONTEXT_KEY``. These constants were meant for private use only and should not affect existing code. - ``ddtrace.contrib.grpc.constants.GRPC_PORT_KEY``: replaced by `ddtrace.ext.net.TARGET_PORT` - ``ddtrace.ext.cassandra.ROW_COUNT``, ``ddtrace.ext.mongo.ROW_COUNT``, ``ddtrace.ext.sql.ROW_COUNT``: replaced by `ddtrace.ext.db.ROWCOUNT` - `ddtrace.filters.TraceCiVisibilityFilter`: removed as this was for private use only and does not affect existing code. - `ddtrace.contrib.starlette.get_resource` and `ddtrace.contrib.starlette.span_modifier` and `ddtrace.contrib.fastapi.span_modifier`: the fastapi and starlette integrations now provide the full route and not just mounted route for sub-applications by default. - `ddtrace.contrib.starlette.config['aggregate_resources']` and `ddtrace.contrib.fastapi.config['aggregate_resources']`: the starlette and fastapi integrations no longer have the option to aggregate resources as this occurs by default now. - `DD_TRACE_OBFUSCATION_QUERY_STRING_PATTERN`: replaced by `DD_TRACE_OBFUSCATION_QUERY_STRING_REGEXP`. Additionally, the `pep562` dependency and references to it have been removed as it is no longer needed after dropping support for Python < 3.7. Note that `DD_CALL_BASIC_CONFIG` and `DD_LOG_FORMAT` are removed in - [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)) - [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) --- releasenotes/notes/release-2.0-3af0045e2261bd02.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/releasenotes/notes/release-2.0-3af0045e2261bd02.yaml b/releasenotes/notes/release-2.0-3af0045e2261bd02.yaml index 7d76e7bfe8a..9b42a5fc422 100644 --- a/releasenotes/notes/release-2.0-3af0045e2261bd02.yaml +++ b/releasenotes/notes/release-2.0-3af0045e2261bd02.yaml @@ -5,7 +5,6 @@ prelude: > versions of the ddtrace library, drops support for Python 2.7, 3.5, and 3.6, and adds support for Python 3.12. - .. important:: ddtrace v2.0.0 drops support for Python 2.7, 3.5, and 3.6. Users running these unsupported Python versions should consider upgrading their Python version or continue using ddtrace v1 From 699afc2055faff7cb106a2baed645d618cc7af90 Mon Sep 17 00:00:00 2001 From: "Tahir H. Butt" Date: Wed, 6 Sep 2023 13:50:55 -0400 Subject: [PATCH 20/58] skip iast test --- .riot/requirements/13a3198.txt | 19 +++++++++++++++++++ .riot/requirements/19535a2.txt | 18 ++++++++++++++++++ tests/tracer/test_trace_utils.py | 5 ++++- 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 .riot/requirements/13a3198.txt create mode 100644 .riot/requirements/19535a2.txt diff --git a/.riot/requirements/13a3198.txt b/.riot/requirements/13a3198.txt new file mode 100644 index 00000000000..7eecb08c2de --- /dev/null +++ b/.riot/requirements/13a3198.txt @@ -0,0 +1,19 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/13a3198.in +# +attrs==23.1.0 +coverage[toml]==7.3.1 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +msgpack==1.0.5 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.3.0 +pytest==7.4.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/.riot/requirements/19535a2.txt b/.riot/requirements/19535a2.txt new file mode 100644 index 00000000000..4786a7897be --- /dev/null +++ b/.riot/requirements/19535a2.txt @@ -0,0 +1,18 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/19535a2.in +# +attrs==23.1.0 +coverage[toml]==7.3.1 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.3.0 +pytest==7.4.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +sortedcontainers==2.4.0 diff --git a/tests/tracer/test_trace_utils.py b/tests/tracer/test_trace_utils.py index faf17550d22..b43b2dff53d 100644 --- a/tests/tracer/test_trace_utils.py +++ b/tests/tracer/test_trace_utils.py @@ -490,7 +490,10 @@ def test_set_http_meta_insecure_cookies_iast_disabled(span, int_config): assert not span_report -@pytest.mark.skipif(sys.version_info < (3, 6, 0), reason="Python 3.6+ test") +@pytest.mark.skipif( + sys.version_info < (3, 6, 0) or sys.version_info >= (3, 12), + reason="Python 3.6+ test, IAST not supported with Python 3.12", +) def test_set_http_meta_insecure_cookies_iast_enabled(span, int_config): with override_global_config(dict(_iast_enabled=True, _appsec_enabled=True)): cookies = {"foo": "bar"} From 047304e95b2c2c436107b45f621d7b1b9abf13f7 Mon Sep 17 00:00:00 2001 From: "Tahir H. Butt" Date: Wed, 6 Sep 2023 13:57:38 -0400 Subject: [PATCH 21/58] cleanup py35 and py36 tests --- tests/contrib/aiopg/py35/test.py | 61 ------ tests/debugging/py35/__init__.py | 0 .../aiopg/py35 => debugging/py37}/__init__.py | 0 tests/debugging/{py35 => py37}/test_async.py | 0 tests/internal/py35/__init__.py | 0 tests/internal/py35/asyncstuff.py | 2 - tests/internal/py35/test_wrapping.py | 79 -------- tests/internal/py36/__init__.py | 0 tests/internal/py36/test_wrapping.py | 173 ------------------ 9 files changed, 315 deletions(-) delete mode 100644 tests/contrib/aiopg/py35/test.py delete mode 100644 tests/debugging/py35/__init__.py rename tests/{contrib/aiopg/py35 => debugging/py37}/__init__.py (100%) rename tests/debugging/{py35 => py37}/test_async.py (100%) delete mode 100644 tests/internal/py35/__init__.py delete mode 100644 tests/internal/py35/asyncstuff.py delete mode 100644 tests/internal/py35/test_wrapping.py delete mode 100644 tests/internal/py36/__init__.py delete mode 100644 tests/internal/py36/test_wrapping.py diff --git a/tests/contrib/aiopg/py35/test.py b/tests/contrib/aiopg/py35/test.py deleted file mode 100644 index 77e4a61f235..00000000000 --- a/tests/contrib/aiopg/py35/test.py +++ /dev/null @@ -1,61 +0,0 @@ -import asyncio - -import aiopg - -# project -from ddtrace import Pin -from ddtrace.contrib.aiopg.patch import patch -from ddtrace.contrib.aiopg.patch import unpatch -from tests.contrib.asyncio.utils import AsyncioTestCase -from tests.contrib.asyncio.utils import mark_asyncio -from tests.contrib.config import POSTGRES_CONFIG - - -TEST_PORT = str(POSTGRES_CONFIG["port"]) - - -class TestPsycopgPatch(AsyncioTestCase): - # default service - TEST_SERVICE = "postgres" - - def setUp(self): - super().setUp() - self._conn = None - patch() - - def tearDown(self): - super().tearDown() - if self._conn and not self._conn.closed: - self._conn.close() - - unpatch() - - @asyncio.coroutine - def _get_conn_and_tracer(self): - conn = self._conn = yield from aiopg.connect(**POSTGRES_CONFIG) - Pin.get_from(conn).clone(tracer=self.tracer).onto(conn) - - return conn, self.tracer - - async def _test_cursor_ctx_manager(self): - conn, tracer = await self._get_conn_and_tracer() - cur = await conn.cursor() - t = type(cur) - - async with conn.cursor() as cur: - assert t == type(cur), "%s != %s" % (t, type(cur)) - await cur.execute(query="select 'blah'") - rows = await cur.fetchall() - assert len(rows) == 1 - assert rows[0][0] == "blah" - - spans = self.pop_spans() - assert len(spans) == 1 - span = spans[0] - assert span.name == "postgres.query" - - @mark_asyncio - def test_cursor_ctx_manager(self): - # ensure cursors work with context managers - # https://github.com/DataDog/dd-trace-py/issues/228 - yield from self._test_cursor_ctx_manager() diff --git a/tests/debugging/py35/__init__.py b/tests/debugging/py35/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/contrib/aiopg/py35/__init__.py b/tests/debugging/py37/__init__.py similarity index 100% rename from tests/contrib/aiopg/py35/__init__.py rename to tests/debugging/py37/__init__.py diff --git a/tests/debugging/py35/test_async.py b/tests/debugging/py37/test_async.py similarity index 100% rename from tests/debugging/py35/test_async.py rename to tests/debugging/py37/test_async.py diff --git a/tests/internal/py35/__init__.py b/tests/internal/py35/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/internal/py35/asyncstuff.py b/tests/internal/py35/asyncstuff.py deleted file mode 100644 index 3e1fa7e7b61..00000000000 --- a/tests/internal/py35/asyncstuff.py +++ /dev/null @@ -1,2 +0,0 @@ -async def async_func(): - return 42 diff --git a/tests/internal/py35/test_wrapping.py b/tests/internal/py35/test_wrapping.py deleted file mode 100644 index 38893cb8c25..00000000000 --- a/tests/internal/py35/test_wrapping.py +++ /dev/null @@ -1,79 +0,0 @@ -from types import CoroutineType - -import pytest - -from ddtrace.internal.wrapping import wrap -from tests.internal.py35.asyncstuff import async_func as asyncfoo - - -def test_wrap_generator_yield_from(): - channel = [] - - def wrapper(f, args, kwargs): - channel[:] = [] - for _ in f(*args, **kwargs): - channel.append(_) - yield _ - - def g(): - yield from range(10) - - wrap(g, wrapper) - - assert list(g()) == list(range(10)) == channel - - -@pytest.mark.asyncio -async def test_wrap_coroutine(): - channel = [] - - def wrapper(f, args, kwargs): - async def _handle_coroutine(c): - retval = await c - channel.append(retval) - return retval - - channel[:] = [] - retval = f(*args, **kwargs) - if isinstance(retval, CoroutineType): - return _handle_coroutine(retval) - else: - channel.append(retval) - return retval - - async def c(): - return await asyncfoo() - - wrap(c, wrapper) - - assert await c() == 42 - - assert channel == [42] - - -def test_wrap_args_kwarg(): - def f(*args, path=None): - return (args, path) - - def wrapper(f, args, kwargs): - return f(*args, **kwargs) - - wrap(f, wrapper) - - assert f(1, 2) == ((1, 2), None) - - -def test_wrap_arg_args_kwarg_kwargs(): - def f(posarg, *args, path=None, **kwargs): - return (posarg, args, path, kwargs) - - def wrapper(f, args, kwargs): - return f(*args, **kwargs) - - wrap(f, wrapper) - - assert f(1, 2) == (1, (2,), None, {}) - assert f(1, 2, 3, foo="bar") == (1, (2, 3), None, {"foo": "bar"}) - assert f(1, 2, 3, path="bar") == (1, (2, 3), "bar", {}) - assert f(1, 2, 3, 4, path="bar", foo="baz") == (1, (2, 3, 4), "bar", {"foo": "baz"}) - assert f(1, path="bar", foo="baz") == (1, (), "bar", {"foo": "baz"}) diff --git a/tests/internal/py36/__init__.py b/tests/internal/py36/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/internal/py36/test_wrapping.py b/tests/internal/py36/test_wrapping.py deleted file mode 100644 index ab6e369fa78..00000000000 --- a/tests/internal/py36/test_wrapping.py +++ /dev/null @@ -1,173 +0,0 @@ -import inspect -import sys - -import pytest - -from ddtrace.internal.wrapping import wrap - - -@pytest.mark.asyncio -async def test_async_generator(): - async def stream(): - yield b"hello" - yield b"" - return - - async def body(): - chunks = [] - async for chunk in stream(): - chunks.append(chunk) - _body = b"".join(chunks) - return _body - - wrapper_called = awrapper_called = False - - async def wrapper(f, args, kwargs): - nonlocal wrapper_called - wrapper_called = True - return await f(*args, **kwargs) - - async def agwrapper(f, args, kwargs): - nonlocal awrapper_called - awrapper_called = True - async for _ in f(*args, **kwargs): - yield _ - - wrap(stream, agwrapper) - wrap(body, wrapper) - - assert await body() == b"hello" - assert wrapper_called - assert awrapper_called - - -@pytest.mark.asyncio -async def test_wrap_async_generator_send(): - def wrapper(f, args, kwargs): - return f(*args, **kwargs) - - async def g(): - yield 0 - for _ in range(1, 10): - n = yield _ - assert _ == n - return - - wrap(g, wrapper) - - channel = [] - - async def consume(): - agen = g() - n = await agen.__anext__() - channel.append(n) - try: - while True: - n = await agen.asend(n) - channel.append(n) - except StopAsyncIteration: - pass - - assert list(range(10)) == channel - - await consume() - - -@pytest.mark.asyncio -async def test_double_async_for_with_exception(): - channel = None - - class StreamConsumed(Exception): - pass - - class AsyncIteratorByteStream(object): - def __init__(self, stream): - self._stream = stream - self._is_stream_consumed = False - - async def __aiter__(self): - if self._is_stream_consumed: - raise StreamConsumed() - - self._is_stream_consumed = True - async for part in self._stream: - yield part - - async def wrapper(f, args, kwargs): - nonlocal channel - - channel = [_ async for _ in f(*args, **kwargs)] - for _ in channel: - yield _ - return - - async def stream(): - yield b"hello" - yield b"" - return - - wrap(stream, wrapper) - wrap(AsyncIteratorByteStream.__aiter__, wrapper) - - s = AsyncIteratorByteStream(stream()) - - assert b"".join([_ async for _ in s]) == b"hello" - assert channel == [b"hello", b""] - with pytest.raises(StreamConsumed): - b"".join([_ async for _ in s]) - - -@pytest.mark.asyncio -async def test_wrap_async_generator_throw_close(): - channel = [] - - async def wrapper(f, args, kwargs): - nonlocal channel - - channel.append(True) - - __ddgen = f(*args, **kwargs) - __ddgensend = __ddgen.asend - try: - value = await __ddgen.__anext__() - channel.append(value) - except StopAsyncIteration: - return - while True: - try: - tosend = yield value - except GeneratorExit: - channel.append("GeneratorExit") - await __ddgen.aclose() - raise - except: # noqa - channel.append(sys.exc_info()[0]) - value = await __ddgen.athrow(*sys.exc_info()) - channel.append(value) - else: - try: - value = await __ddgensend(tosend) - channel.append(value) - except StopAsyncIteration: - return - - async def g(): - while True: - try: - yield 0 - except ValueError: - yield 1 - - wrap(g, wrapper) - assert inspect.isasyncgenfunction(g) - - gen = g() - assert inspect.isasyncgen(gen) - - for _ in range(10): - assert await gen.__anext__() == 0 - assert await gen.athrow(ValueError) == 1 - - await gen.aclose() - - assert channel == [True] + [0, ValueError, 1] * 10 + ["GeneratorExit"] From 149937b784d1fa184be53dd158e1ebd749c54479 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Thu, 7 Sep 2023 10:38:02 -0700 Subject: [PATCH 22/58] skip failing appsec iast test --- tests/appsec/iast/test_iast_entrypoint_patches.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/appsec/iast/test_iast_entrypoint_patches.py b/tests/appsec/iast/test_iast_entrypoint_patches.py index f423fd877d2..d62daf352f1 100644 --- a/tests/appsec/iast/test_iast_entrypoint_patches.py +++ b/tests/appsec/iast/test_iast_entrypoint_patches.py @@ -9,6 +9,7 @@ @pytest.mark.skipif(sys.version_info[:2] < (3, 7), reason="dis is different in python <= 3.6") +@pytest.mark.skipif(sys.version_info[:2] > (3, 11), reason="IAST is not supported in Pys later than 3.11") def test_ddtrace_iast_flask_patch(): with override_global_config(dict(_iast_enabled=True)), override_env(dict(DD_IAST_ENABLED="true")): import tests.appsec.iast.fixtures.entrypoint.app_patched as flask_entrypoint From 5defe5333d3a4a9ad9d2a858f0efe8a7cb09edd7 Mon Sep 17 00:00:00 2001 From: Yun Kim Date: Thu, 7 Sep 2023 14:06:29 -0400 Subject: [PATCH 23/58] merge previous pyXY tests into parent test files --- tests/contrib/aiopg/py37/__init__.py | 0 tests/contrib/aiopg/py37/test.py | 51 ------ tests/contrib/aiopg/test.py | 40 ++++ tests/debugging/py37/__init__.py | 0 tests/debugging/py37/test_async.py | 47 ----- tests/internal/py37/__init__.py | 0 tests/internal/py37/test_wrapping.py | 21 --- tests/internal/test_wrapping.py | 264 +++++++++++++++++++++++++++ 8 files changed, 304 insertions(+), 119 deletions(-) delete mode 100644 tests/contrib/aiopg/py37/__init__.py delete mode 100644 tests/contrib/aiopg/py37/test.py delete mode 100644 tests/debugging/py37/__init__.py delete mode 100644 tests/debugging/py37/test_async.py delete mode 100644 tests/internal/py37/__init__.py delete mode 100644 tests/internal/py37/test_wrapping.py diff --git a/tests/contrib/aiopg/py37/__init__.py b/tests/contrib/aiopg/py37/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/contrib/aiopg/py37/test.py b/tests/contrib/aiopg/py37/test.py deleted file mode 100644 index 1cb14983904..00000000000 --- a/tests/contrib/aiopg/py37/test.py +++ /dev/null @@ -1,51 +0,0 @@ -import aiopg - -# project -from ddtrace import Pin -from ddtrace.contrib.aiopg.patch import patch -from ddtrace.contrib.aiopg.patch import unpatch -from tests.contrib.asyncio.utils import AsyncioTestCase -from tests.contrib.asyncio.utils import mark_asyncio -from tests.contrib.config import POSTGRES_CONFIG - - -TEST_PORT = str(POSTGRES_CONFIG["port"]) - - -class AiopgTestCase(AsyncioTestCase): - # default service - TEST_SERVICE = "postgres" - - def setUp(self): - super().setUp() - self._conn = None - patch() - - def tearDown(self): - super().tearDown() - if self._conn and not self._conn.closed: - self._conn.close() - - unpatch() - - async def _get_conn_and_tracer(self): - conn = self._conn = await aiopg.connect(**POSTGRES_CONFIG) - Pin.get_from(conn).clone(tracer=self.tracer).onto(conn) - - return conn, self.tracer - - @mark_asyncio - async def test_async_generator(self): - conn, tracer = await self._get_conn_and_tracer() - cursor = await conn.cursor() - q = "select 'foobarblah'" - await cursor.execute(q) - rows = [] - async for row in cursor: - rows.append(row) - - assert rows == [("foobarblah",)] - spans = self.pop_spans() - assert len(spans) == 1 - span = spans[0] - assert span.name == "postgres.query" diff --git a/tests/contrib/aiopg/test.py b/tests/contrib/aiopg/test.py index e34e459caeb..759180ae0c5 100644 --- a/tests/contrib/aiopg/test.py +++ b/tests/contrib/aiopg/test.py @@ -123,6 +123,22 @@ def assert_conn_is_traced(self, tracer, db, service): assert span.get_tag("component") == "aiopg" assert span.get_tag("span.kind") == "client" + @mark_asyncio + async def test_async_generator(self): + conn, tracer = await self._get_conn_and_tracer() + cursor = await conn.cursor() + q = "select 'foobarblah'" + await cursor.execute(q) + rows = [] + async for row in cursor: + rows.append(row) + + assert rows == [("foobarblah",)] + spans = self.pop_spans() + assert len(spans) == 1 + span = spans[0] + assert span.name == "postgres.query" + @mark_asyncio def test_disabled_execute(self): conn, tracer = yield from self._get_conn_and_tracer() @@ -313,3 +329,27 @@ def test_analytics_without_rate(self): spans = yield from self.trace_spans() self.assertEqual(len(spans), 1) self.assertEqual(spans[0].get_metric(ANALYTICS_SAMPLE_RATE_KEY), 1.0) + + @mark_asyncio + async def _test_cursor_ctx_manager(self): + conn, tracer = await self._get_conn_and_tracer() + cur = await conn.cursor() + t = type(cur) + + async with conn.cursor() as cur: + assert t == type(cur), "%s != %s" % (t, type(cur)) + await cur.execute(query="select 'blah'") + rows = await cur.fetchall() + assert len(rows) == 1 + assert rows[0][0] == "blah" + + spans = self.pop_spans() + assert len(spans) == 1 + span = spans[0] + assert span.name == "postgres.query" + + @mark_asyncio + def test_cursor_ctx_manager(self): + # ensure cursors work with context managers + # https://github.com/DataDog/dd-trace-py/issues/228 + yield from self._test_cursor_ctx_manager() diff --git a/tests/debugging/py37/__init__.py b/tests/debugging/py37/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/debugging/py37/test_async.py b/tests/debugging/py37/test_async.py deleted file mode 100644 index 25483e596ba..00000000000 --- a/tests/debugging/py37/test_async.py +++ /dev/null @@ -1,47 +0,0 @@ -import pytest - -from ddtrace.debugging._async import dd_coroutine_wrapper - - -class MockSignalContext: - def __init__(self): - self.retval = None - self.exc_info = None - self.duration = None - - def exit(self, retval, exc_info, duration): - self.retval = retval - self.exc_info = exc_info - self.duration = duration - - -@pytest.mark.asyncio -async def test_dd_coroutine_wrapper_return(): - # type: () -> None - contexts = [MockSignalContext() for _ in range(10)] - - async def coro(): - return 1 - - retval = await dd_coroutine_wrapper(coro(), contexts) - - assert retval == 1 - - assert all((context.retval, context.exc_info) == (1, (None, None, None)) for context in contexts) - - -@pytest.mark.asyncio -async def test_dd_coroutine_wrapper_exc(): - # type: () -> None - contexts = [MockSignalContext() for _ in range(10)] - - class MyException(Exception): - pass - - async def coro(): - raise MyException("error") - - with pytest.raises(MyException): - await dd_coroutine_wrapper(coro(), contexts) - - assert all((context.retval, context.exc_info[0]) == (None, MyException) for context in contexts) diff --git a/tests/internal/py37/__init__.py b/tests/internal/py37/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/internal/py37/test_wrapping.py b/tests/internal/py37/test_wrapping.py deleted file mode 100644 index a1f94e1dae4..00000000000 --- a/tests/internal/py37/test_wrapping.py +++ /dev/null @@ -1,21 +0,0 @@ -from contextlib import asynccontextmanager - -import pytest - -from ddtrace.internal.wrapping import wrap - - -@pytest.mark.asyncio -async def test_wrap_async_context_manager_exception_on_exit(): - def wrapper(f, args, kwargs): - return f(*args, **kwargs) - - @asynccontextmanager - async def g(): - yield 0 - - wrap(g.__wrapped__, wrapper) - - acm = g() - assert 0 == await acm.__aenter__() - await acm.__aexit__(ValueError, None, None) diff --git a/tests/internal/test_wrapping.py b/tests/internal/test_wrapping.py index 70628aa1cba..b70be8fd94f 100644 --- a/tests/internal/test_wrapping.py +++ b/tests/internal/test_wrapping.py @@ -1,10 +1,18 @@ +from contextlib import asynccontextmanager import inspect import sys +from types import CoroutineType + +import pytest from ddtrace.internal.wrapping import unwrap from ddtrace.internal.wrapping import wrap +async def async_func(): + return 42 + + def test_wrap_unwrap(): channel = [] @@ -190,3 +198,259 @@ def f(): wrap(f, wrapper) assert [frame.f_code.co_name for frame in f()[:4]] == ["f", "wrapper", "f", "test_wrap_stack"] + + +@pytest.mark.asyncio +async def test_wrap_async_context_manager_exception_on_exit(): + def wrapper(f, args, kwargs): + return f(*args, **kwargs) + + @asynccontextmanager + async def g(): + yield 0 + + wrap(g.__wrapped__, wrapper) + + acm = g() + assert 0 == await acm.__aenter__() + await acm.__aexit__(ValueError, None, None) + + +def test_wrap_generator_yield_from(): + channel = [] + + def wrapper(f, args, kwargs): + channel[:] = [] + for _ in f(*args, **kwargs): + channel.append(_) + yield _ + + def g(): + yield from range(10) + + wrap(g, wrapper) + + assert list(g()) == list(range(10)) == channel + + +@pytest.mark.asyncio +async def test_wrap_coroutine(): + channel = [] + + def wrapper(f, args, kwargs): + async def _handle_coroutine(c): + retval = await c + channel.append(retval) + return retval + + channel[:] = [] + retval = f(*args, **kwargs) + if isinstance(retval, CoroutineType): + return _handle_coroutine(retval) + else: + channel.append(retval) + return retval + + async def c(): + return await async_func() + + wrap(c, wrapper) + + assert await c() == 42 + + assert channel == [42] + + +def test_wrap_args_kwarg(): + def f(*args, path=None): + return (args, path) + + def wrapper(f, args, kwargs): + return f(*args, **kwargs) + + wrap(f, wrapper) + + assert f(1, 2) == ((1, 2), None) + + +def test_wrap_arg_args_kwarg_kwargs(): + def f(posarg, *args, path=None, **kwargs): + return (posarg, args, path, kwargs) + + def wrapper(f, args, kwargs): + return f(*args, **kwargs) + + wrap(f, wrapper) + + assert f(1, 2) == (1, (2,), None, {}) + assert f(1, 2, 3, foo="bar") == (1, (2, 3), None, {"foo": "bar"}) + assert f(1, 2, 3, path="bar") == (1, (2, 3), "bar", {}) + assert f(1, 2, 3, 4, path="bar", foo="baz") == (1, (2, 3, 4), "bar", {"foo": "baz"}) + assert f(1, path="bar", foo="baz") == (1, (), "bar", {"foo": "baz"}) + + +@pytest.mark.asyncio +async def test_async_generator(): + async def stream(): + yield b"hello" + yield b"" + return + + async def body(): + chunks = [] + async for chunk in stream(): + chunks.append(chunk) + _body = b"".join(chunks) + return _body + + wrapper_called = awrapper_called = False + + async def wrapper(f, args, kwargs): + nonlocal wrapper_called + wrapper_called = True + return await f(*args, **kwargs) + + async def agwrapper(f, args, kwargs): + nonlocal awrapper_called + awrapper_called = True + async for _ in f(*args, **kwargs): + yield _ + + wrap(stream, agwrapper) + wrap(body, wrapper) + + assert await body() == b"hello" + assert wrapper_called + assert awrapper_called + + +@pytest.mark.asyncio +async def test_wrap_async_generator_send(): + def wrapper(f, args, kwargs): + return f(*args, **kwargs) + + async def g(): + yield 0 + for _ in range(1, 10): + n = yield _ + assert _ == n + return + + wrap(g, wrapper) + + channel = [] + + async def consume(): + agen = g() + n = await agen.__anext__() + channel.append(n) + try: + while True: + n = await agen.asend(n) + channel.append(n) + except StopAsyncIteration: + pass + + assert list(range(10)) == channel + + await consume() + + +@pytest.mark.asyncio +async def test_double_async_for_with_exception(): + channel = None + + class StreamConsumed(Exception): + pass + + class AsyncIteratorByteStream(object): + def __init__(self, stream): + self._stream = stream + self._is_stream_consumed = False + + async def __aiter__(self): + if self._is_stream_consumed: + raise StreamConsumed() + + self._is_stream_consumed = True + async for part in self._stream: + yield part + + async def wrapper(f, args, kwargs): + nonlocal channel + + channel = [_ async for _ in f(*args, **kwargs)] + for _ in channel: + yield _ + return + + async def stream(): + yield b"hello" + yield b"" + return + + wrap(stream, wrapper) + wrap(AsyncIteratorByteStream.__aiter__, wrapper) + + s = AsyncIteratorByteStream(stream()) + + assert b"".join([_ async for _ in s]) == b"hello" + assert channel == [b"hello", b""] + with pytest.raises(StreamConsumed): + b"".join([_ async for _ in s]) + + +@pytest.mark.asyncio +async def test_wrap_async_generator_throw_close(): + channel = [] + + async def wrapper(f, args, kwargs): + nonlocal channel + + channel.append(True) + + __ddgen = f(*args, **kwargs) + __ddgensend = __ddgen.asend + try: + value = await __ddgen.__anext__() + channel.append(value) + except StopAsyncIteration: + return + while True: + try: + tosend = yield value + except GeneratorExit: + channel.append("GeneratorExit") + await __ddgen.aclose() + raise + except: # noqa + channel.append(sys.exc_info()[0]) + value = await __ddgen.athrow(*sys.exc_info()) + channel.append(value) + else: + try: + value = await __ddgensend(tosend) + channel.append(value) + except StopAsyncIteration: + return + + async def g(): + while True: + try: + yield 0 + except ValueError: + yield 1 + + wrap(g, wrapper) + assert inspect.isasyncgenfunction(g) + + gen = g() + assert inspect.isasyncgen(gen) + + for _ in range(10): + assert await gen.__anext__() == 0 + assert await gen.athrow(ValueError) == 1 + + await gen.aclose() + + assert channel == [True] + [0, ValueError, 1] * 10 + ["GeneratorExit"] From 7bec824a0789c4b2cd3f8118dc74cbeb7de3c92e Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Thu, 7 Sep 2023 11:08:51 -0700 Subject: [PATCH 24/58] include setuptools in 3.12 deps --- .riot/requirements/11c167a.txt | 43 ++++++++-------- .riot/requirements/13698ee.txt | 20 ++++---- .../requirements/{1d0d03e.txt => 162dc3a.txt} | 11 ++-- .riot/requirements/1934323.txt | 22 ++++---- .riot/requirements/1ba9802.txt | 51 +++++++++---------- .riot/requirements/1d02c3a.txt | 26 +++++----- .riot/requirements/1f1bd7d.txt | 47 ++++++++--------- .riot/requirements/43c7c81.txt | 22 ++++---- .riot/requirements/5ea5e85.txt | 43 ++++++++-------- .../requirements/{1bc5161.txt => 7a3f46f.txt} | 19 ++++--- .riot/requirements/8b732cf.txt | 41 +++++++-------- .riot/requirements/a8445d3.txt | 22 ++++---- riotfile.py | 18 +++++++ 13 files changed, 197 insertions(+), 188 deletions(-) rename .riot/requirements/{1d0d03e.txt => 162dc3a.txt} (57%) rename .riot/requirements/{1bc5161.txt => 7a3f46f.txt} (67%) diff --git a/.riot/requirements/11c167a.txt b/.riot/requirements/11c167a.txt index b810e084265..93413ec4d1f 100644 --- a/.riot/requirements/11c167a.txt +++ b/.riot/requirements/11c167a.txt @@ -2,42 +2,39 @@ # This file is autogenerated by pip-compile with Python 3.10 # by the following command: # -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/11c167a.in +# pip-compile --no-annotate .riot/requirements/11c167a.in # astunparse==1.6.3 attrs==23.1.0 blinker==1.6.2 -certifi==2023.5.7 +certifi==2023.7.22 cffi==1.15.1 -charset-normalizer==3.1.0 -click==8.1.3 -coverage[toml]==7.2.5 -cryptography==40.0.2 -exceptiongroup==1.1.1 -flask==2.3.2 -gunicorn==20.1.0 +charset-normalizer==3.2.0 +click==8.1.7 +coverage[toml]==7.3.1 +cryptography==41.0.3 +exceptiongroup==1.1.3 +flask==2.3.3 +gunicorn==21.2.0 hypothesis==6.45.0 idna==3.4 iniconfig==2.0.0 itsdangerous==2.1.2 jinja2==3.1.2 -markupsafe==2.1.2 -mock==5.0.2 +markupsafe==2.1.3 +mock==5.1.0 opentracing==2.4.0 packaging==23.1 -pluggy==1.0.0 +pluggy==1.3.0 pycparser==2.21 -pycryptodome==3.17 -pytest==7.3.1 -pytest-cov==4.0.0 -pytest-mock==3.10.0 -requests==2.30.0 +pycryptodome==3.18.0 +pytest==7.4.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +requests==2.31.0 six==1.16.0 sortedcontainers==2.4.0 tomli==2.0.1 -urllib3==2.0.2 -werkzeug==2.3.4 -wheel==0.40.0 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools +urllib3==2.0.4 +werkzeug==2.3.7 +wheel==0.41.2 diff --git a/.riot/requirements/13698ee.txt b/.riot/requirements/13698ee.txt index 3a3889daad9..28d0dd0443c 100644 --- a/.riot/requirements/13698ee.txt +++ b/.riot/requirements/13698ee.txt @@ -2,18 +2,18 @@ # This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/13698ee.in +# pip-compile --no-annotate .riot/requirements/13698ee.in # -attrs==22.2.0 -coverage[toml]==7.2.2 +attrs==23.1.0 +coverage[toml]==7.3.1 hypothesis==6.45.0 iniconfig==2.0.0 -mock==5.0.1 +mock==5.1.0 opentracing==2.4.0 -packaging==23.0 -pluggy==1.0.0 -pytest==7.2.2 -pytest-asyncio==0.20.3 -pytest-cov==4.0.0 -pytest-mock==3.10.0 +packaging==23.1 +pluggy==1.3.0 +pytest==7.4.1 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 sortedcontainers==2.4.0 diff --git a/.riot/requirements/1d0d03e.txt b/.riot/requirements/162dc3a.txt similarity index 57% rename from .riot/requirements/1d0d03e.txt rename to .riot/requirements/162dc3a.txt index 8e2b89a66c3..373583eef44 100644 --- a/.riot/requirements/1d0d03e.txt +++ b/.riot/requirements/162dc3a.txt @@ -2,18 +2,21 @@ # This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --no-annotate .riot/requirements/1d0d03e.in +# pip-compile --no-annotate .riot/requirements/162dc3a.in # attrs==23.1.0 -coverage[toml]==7.2.7 +coverage[toml]==7.3.1 hypothesis==6.45.0 iniconfig==2.0.0 mock==5.1.0 opentracing==2.4.0 packaging==23.1 -pluggy==1.2.0 -pytest==7.4.0 +pluggy==1.3.0 +pytest==7.4.1 pytest-asyncio==0.21.1 pytest-cov==4.1.0 pytest-mock==3.11.1 sortedcontainers==2.4.0 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/1934323.txt b/.riot/requirements/1934323.txt index 02fd80cffef..466201087ce 100644 --- a/.riot/requirements/1934323.txt +++ b/.riot/requirements/1934323.txt @@ -2,20 +2,20 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/1934323.in +# pip-compile --no-annotate .riot/requirements/1934323.in # -attrs==22.2.0 -coverage[toml]==7.2.2 -exceptiongroup==1.1.1 +attrs==23.1.0 +coverage[toml]==7.3.1 +exceptiongroup==1.1.3 hypothesis==6.45.0 iniconfig==2.0.0 -mock==5.0.1 +mock==5.1.0 opentracing==2.4.0 -packaging==23.0 -pluggy==1.0.0 -pytest==7.2.2 -pytest-asyncio==0.20.3 -pytest-cov==4.0.0 -pytest-mock==3.10.0 +packaging==23.1 +pluggy==1.3.0 +pytest==7.4.1 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 sortedcontainers==2.4.0 tomli==2.0.1 diff --git a/.riot/requirements/1ba9802.txt b/.riot/requirements/1ba9802.txt index 562567b1897..01a077a224b 100644 --- a/.riot/requirements/1ba9802.txt +++ b/.riot/requirements/1ba9802.txt @@ -1,45 +1,42 @@ # -# This file is autogenerated by pip-compile with python 3.9 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.9 +# by the following command: # -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/1ba9802.in +# pip-compile --no-annotate .riot/requirements/1ba9802.in # astunparse==1.6.3 attrs==23.1.0 blinker==1.6.2 -certifi==2023.5.7 +certifi==2023.7.22 cffi==1.15.1 -charset-normalizer==3.1.0 -click==8.1.3 -coverage[toml]==7.2.5 -cryptography==40.0.2 -exceptiongroup==1.1.1 -flask==2.3.2 -gunicorn==20.1.0 +charset-normalizer==3.2.0 +click==8.1.7 +coverage[toml]==7.3.1 +cryptography==41.0.3 +exceptiongroup==1.1.3 +flask==2.3.3 +gunicorn==21.2.0 hypothesis==6.45.0 idna==3.4 -importlib-metadata==6.6.0 +importlib-metadata==6.8.0 iniconfig==2.0.0 itsdangerous==2.1.2 jinja2==3.1.2 -markupsafe==2.1.2 -mock==5.0.2 +markupsafe==2.1.3 +mock==5.1.0 opentracing==2.4.0 packaging==23.1 -pluggy==1.0.0 +pluggy==1.3.0 pycparser==2.21 -pycryptodome==3.17 -pytest==7.3.1 -pytest-cov==4.0.0 -pytest-mock==3.10.0 -requests==2.30.0 +pycryptodome==3.18.0 +pytest==7.4.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +requests==2.31.0 six==1.16.0 sortedcontainers==2.4.0 tomli==2.0.1 -urllib3==2.0.2 -werkzeug==2.3.4 -wheel==0.40.0 -zipp==3.15.0 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools +urllib3==2.0.4 +werkzeug==2.3.7 +wheel==0.41.2 +zipp==3.16.2 diff --git a/.riot/requirements/1d02c3a.txt b/.riot/requirements/1d02c3a.txt index 4bebe747e6c..a1578333e8e 100644 --- a/.riot/requirements/1d02c3a.txt +++ b/.riot/requirements/1d02c3a.txt @@ -2,23 +2,23 @@ # This file is autogenerated by pip-compile with Python 3.7 # by the following command: # -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/1d02c3a.in +# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/1d02c3a.in # -attrs==22.2.0 -coverage[toml]==7.2.2 -exceptiongroup==1.1.1 +attrs==23.1.0 +coverage[toml]==7.2.7 +exceptiongroup==1.1.3 hypothesis==6.45.0 -importlib-metadata==6.0.0 +importlib-metadata==6.7.0 iniconfig==2.0.0 -mock==5.0.1 +mock==5.1.0 opentracing==2.4.0 -packaging==23.0 -pluggy==1.0.0 -pytest==7.2.2 -pytest-asyncio==0.20.3 -pytest-cov==4.0.0 -pytest-mock==3.10.0 +packaging==23.1 +pluggy==1.2.0 +pytest==7.4.1 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 sortedcontainers==2.4.0 tomli==2.0.1 -typing-extensions==4.7.0 +typing-extensions==4.7.1 zipp==3.15.0 diff --git a/.riot/requirements/1f1bd7d.txt b/.riot/requirements/1f1bd7d.txt index f5597daf887..c1dffe7bcfb 100644 --- a/.riot/requirements/1f1bd7d.txt +++ b/.riot/requirements/1f1bd7d.txt @@ -2,44 +2,41 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/1f1bd7d.in +# pip-compile --no-annotate .riot/requirements/1f1bd7d.in # astunparse==1.6.3 attrs==23.1.0 blinker==1.6.2 -certifi==2023.5.7 +certifi==2023.7.22 cffi==1.15.1 -charset-normalizer==3.1.0 -click==8.1.3 -coverage[toml]==7.2.5 -cryptography==40.0.2 -exceptiongroup==1.1.1 -flask==2.3.2 -gunicorn==20.1.0 +charset-normalizer==3.2.0 +click==8.1.7 +coverage[toml]==7.3.1 +cryptography==41.0.3 +exceptiongroup==1.1.3 +flask==2.3.3 +gunicorn==21.2.0 hypothesis==6.45.0 idna==3.4 -importlib-metadata==6.6.0 +importlib-metadata==6.8.0 iniconfig==2.0.0 itsdangerous==2.1.2 jinja2==3.1.2 -markupsafe==2.1.2 -mock==5.0.2 +markupsafe==2.1.3 +mock==5.1.0 opentracing==2.4.0 packaging==23.1 -pluggy==1.0.0 +pluggy==1.3.0 pycparser==2.21 -pycryptodome==3.17 -pytest==7.3.1 -pytest-cov==4.0.0 -pytest-mock==3.10.0 -requests==2.30.0 +pycryptodome==3.18.0 +pytest==7.4.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +requests==2.31.0 six==1.16.0 sortedcontainers==2.4.0 tomli==2.0.1 -urllib3==2.0.2 -werkzeug==2.3.4 -wheel==0.40.0 -zipp==3.15.0 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools +urllib3==2.0.4 +werkzeug==2.3.7 +wheel==0.41.2 +zipp==3.16.2 diff --git a/.riot/requirements/43c7c81.txt b/.riot/requirements/43c7c81.txt index 9339d007a1f..12beefa6a58 100644 --- a/.riot/requirements/43c7c81.txt +++ b/.riot/requirements/43c7c81.txt @@ -2,20 +2,20 @@ # This file is autogenerated by pip-compile with Python 3.9 # by the following command: # -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/43c7c81.in +# pip-compile --no-annotate .riot/requirements/43c7c81.in # -attrs==22.2.0 -coverage[toml]==7.2.2 -exceptiongroup==1.1.1 +attrs==23.1.0 +coverage[toml]==7.3.1 +exceptiongroup==1.1.3 hypothesis==6.45.0 iniconfig==2.0.0 -mock==5.0.1 +mock==5.1.0 opentracing==2.4.0 -packaging==23.0 -pluggy==1.0.0 -pytest==7.2.2 -pytest-asyncio==0.20.3 -pytest-cov==4.0.0 -pytest-mock==3.10.0 +packaging==23.1 +pluggy==1.3.0 +pytest==7.4.1 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 sortedcontainers==2.4.0 tomli==2.0.1 diff --git a/.riot/requirements/5ea5e85.txt b/.riot/requirements/5ea5e85.txt index 9ddc921f5ef..26658e831d3 100644 --- a/.riot/requirements/5ea5e85.txt +++ b/.riot/requirements/5ea5e85.txt @@ -2,44 +2,41 @@ # This file is autogenerated by pip-compile with Python 3.7 # by the following command: # -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/5ea5e85.in +# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/5ea5e85.in # astunparse==1.6.3 attrs==23.1.0 -certifi==2023.5.7 +certifi==2023.7.22 cffi==1.15.1 -charset-normalizer==3.1.0 -click==8.1.3 -coverage[toml]==7.2.5 -cryptography==40.0.2 -exceptiongroup==1.1.1 +charset-normalizer==3.2.0 +click==8.1.7 +coverage[toml]==7.2.7 +cryptography==41.0.3 +exceptiongroup==1.1.3 flask==2.2.5 -gunicorn==20.1.0 +gunicorn==21.2.0 hypothesis==6.45.0 idna==3.4 -importlib-metadata==6.6.0 +importlib-metadata==6.7.0 iniconfig==2.0.0 itsdangerous==2.1.2 jinja2==3.1.2 -markupsafe==2.1.2 -mock==5.0.2 +markupsafe==2.1.3 +mock==5.1.0 opentracing==2.4.0 packaging==23.1 -pluggy==1.0.0 +pluggy==1.2.0 pycparser==2.21 -pycryptodome==3.17 -pytest==7.3.1 -pytest-cov==4.0.0 -pytest-mock==3.10.0 -requests==2.30.0 +pycryptodome==3.18.0 +pytest==7.4.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +requests==2.31.0 six==1.16.0 sortedcontainers==2.4.0 tomli==2.0.1 -typing-extensions==4.7.0 -urllib3==2.0.2 +typing-extensions==4.7.1 +urllib3==2.0.4 werkzeug==2.2.3 -wheel==0.40.0 +wheel==0.41.2 zipp==3.15.0 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/1bc5161.txt b/.riot/requirements/7a3f46f.txt similarity index 67% rename from .riot/requirements/1bc5161.txt rename to .riot/requirements/7a3f46f.txt index 526abfb3adb..5729bfbfac4 100644 --- a/.riot/requirements/1bc5161.txt +++ b/.riot/requirements/7a3f46f.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --no-annotate .riot/requirements/1bc5161.in +# pip-compile --no-annotate .riot/requirements/7a3f46f.in # astunparse==1.6.3 attrs==23.1.0 @@ -10,10 +10,10 @@ blinker==1.6.2 certifi==2023.7.22 cffi==1.15.1 charset-normalizer==3.2.0 -click==8.1.6 -coverage[toml]==7.2.7 +click==8.1.7 +coverage[toml]==7.3.1 cryptography==41.0.3 -flask==2.3.2 +flask==2.3.3 gunicorn==21.2.0 hypothesis==6.45.0 idna==3.4 @@ -24,15 +24,18 @@ markupsafe==2.1.3 mock==5.1.0 opentracing==2.4.0 packaging==23.1 -pluggy==1.2.0 +pluggy==1.3.0 pycparser==2.21 pycryptodome==3.18.0 -pytest==7.4.0 +pytest==7.4.1 pytest-cov==4.1.0 pytest-mock==3.11.1 requests==2.31.0 six==1.16.0 sortedcontainers==2.4.0 urllib3==2.0.4 -werkzeug==2.3.6 -wheel==0.41.1 +werkzeug==2.3.7 +wheel==0.41.2 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/8b732cf.txt b/.riot/requirements/8b732cf.txt index bc4c2185f6f..9ccb1a616f0 100644 --- a/.riot/requirements/8b732cf.txt +++ b/.riot/requirements/8b732cf.txt @@ -2,40 +2,37 @@ # This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/8b732cf.in +# pip-compile --no-annotate .riot/requirements/8b732cf.in # astunparse==1.6.3 attrs==23.1.0 blinker==1.6.2 -certifi==2023.5.7 +certifi==2023.7.22 cffi==1.15.1 -charset-normalizer==3.1.0 -click==8.1.3 -coverage[toml]==7.2.5 -cryptography==40.0.2 -flask==2.3.2 -gunicorn==20.1.0 +charset-normalizer==3.2.0 +click==8.1.7 +coverage[toml]==7.3.1 +cryptography==41.0.3 +flask==2.3.3 +gunicorn==21.2.0 hypothesis==6.45.0 idna==3.4 iniconfig==2.0.0 itsdangerous==2.1.2 jinja2==3.1.2 -markupsafe==2.1.2 -mock==5.0.2 +markupsafe==2.1.3 +mock==5.1.0 opentracing==2.4.0 packaging==23.1 -pluggy==1.0.0 +pluggy==1.3.0 pycparser==2.21 -pycryptodome==3.17 -pytest==7.3.1 -pytest-cov==4.0.0 -pytest-mock==3.10.0 -requests==2.30.0 +pycryptodome==3.18.0 +pytest==7.4.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +requests==2.31.0 six==1.16.0 sortedcontainers==2.4.0 -urllib3==2.0.2 -werkzeug==2.3.4 -wheel==0.40.0 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools +urllib3==2.0.4 +werkzeug==2.3.7 +wheel==0.41.2 diff --git a/.riot/requirements/a8445d3.txt b/.riot/requirements/a8445d3.txt index 0098804d458..84618138e74 100644 --- a/.riot/requirements/a8445d3.txt +++ b/.riot/requirements/a8445d3.txt @@ -2,20 +2,20 @@ # This file is autogenerated by pip-compile with Python 3.10 # by the following command: # -# pip-compile --no-annotate --resolver=backtracking .riot/requirements/a8445d3.in +# pip-compile --no-annotate .riot/requirements/a8445d3.in # -attrs==22.2.0 -coverage[toml]==7.2.2 -exceptiongroup==1.1.1 +attrs==23.1.0 +coverage[toml]==7.3.1 +exceptiongroup==1.1.3 hypothesis==6.45.0 iniconfig==2.0.0 -mock==5.0.1 +mock==5.1.0 opentracing==2.4.0 -packaging==23.0 -pluggy==1.0.0 -pytest==7.2.2 -pytest-asyncio==0.20.3 -pytest-cov==4.0.0 -pytest-mock==3.10.0 +packaging==23.1 +pluggy==1.3.0 +pytest==7.4.1 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 sortedcontainers==2.4.0 tomli==2.0.1 diff --git a/riotfile.py b/riotfile.py index 43d028a2b09..a444f92004a 100644 --- a/riotfile.py +++ b/riotfile.py @@ -142,6 +142,15 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): env={ "DD_IAST_REQUEST_SAMPLING": "100", # Override default 30% to analyze all IAST requests }, + venvs=[ + Venv(pys=select_pys(max_version="3.11")), + Venv( + pys=select_pys(min_version="3.12"), + pkgs={ + "setuptools": latest, + }, + ), + ], ), Venv( name="profile-diff", @@ -1842,6 +1851,15 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): pkgs={ "pytest-asyncio": latest, }, + venvs=[ + Venv(pys=select_pys(max_version="3.11")), + Venv( + pys=select_pys(min_version="3.12"), + pkgs={ + "setuptools": latest, + }, + ), + ], ), Venv( name="futures", From 93eaa0aeb99318411df40aa98d18921aaaaede6b Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Thu, 7 Sep 2023 11:42:38 -0700 Subject: [PATCH 25/58] Revert "include setuptools in 3.12 deps" This reverts commit 81a608cff64276f7d7c585002a54234d1034c09e. --- .riot/requirements/11c167a.txt | 43 ++++++++-------- .riot/requirements/13698ee.txt | 20 ++++---- .riot/requirements/1934323.txt | 22 ++++---- .riot/requirements/1ba9802.txt | 51 ++++++++++--------- .../requirements/{7a3f46f.txt => 1bc5161.txt} | 19 +++---- .riot/requirements/1d02c3a.txt | 26 +++++----- .../requirements/{162dc3a.txt => 1d0d03e.txt} | 11 ++-- .riot/requirements/1f1bd7d.txt | 47 +++++++++-------- .riot/requirements/43c7c81.txt | 22 ++++---- .riot/requirements/5ea5e85.txt | 43 ++++++++-------- .riot/requirements/8b732cf.txt | 41 ++++++++------- .riot/requirements/a8445d3.txt | 22 ++++---- riotfile.py | 18 ------- 13 files changed, 188 insertions(+), 197 deletions(-) rename .riot/requirements/{7a3f46f.txt => 1bc5161.txt} (67%) rename .riot/requirements/{162dc3a.txt => 1d0d03e.txt} (57%) diff --git a/.riot/requirements/11c167a.txt b/.riot/requirements/11c167a.txt index 93413ec4d1f..b810e084265 100644 --- a/.riot/requirements/11c167a.txt +++ b/.riot/requirements/11c167a.txt @@ -2,39 +2,42 @@ # This file is autogenerated by pip-compile with Python 3.10 # by the following command: # -# pip-compile --no-annotate .riot/requirements/11c167a.in +# pip-compile --no-annotate --resolver=backtracking .riot/requirements/11c167a.in # astunparse==1.6.3 attrs==23.1.0 blinker==1.6.2 -certifi==2023.7.22 +certifi==2023.5.7 cffi==1.15.1 -charset-normalizer==3.2.0 -click==8.1.7 -coverage[toml]==7.3.1 -cryptography==41.0.3 -exceptiongroup==1.1.3 -flask==2.3.3 -gunicorn==21.2.0 +charset-normalizer==3.1.0 +click==8.1.3 +coverage[toml]==7.2.5 +cryptography==40.0.2 +exceptiongroup==1.1.1 +flask==2.3.2 +gunicorn==20.1.0 hypothesis==6.45.0 idna==3.4 iniconfig==2.0.0 itsdangerous==2.1.2 jinja2==3.1.2 -markupsafe==2.1.3 -mock==5.1.0 +markupsafe==2.1.2 +mock==5.0.2 opentracing==2.4.0 packaging==23.1 -pluggy==1.3.0 +pluggy==1.0.0 pycparser==2.21 -pycryptodome==3.18.0 -pytest==7.4.1 -pytest-cov==4.1.0 -pytest-mock==3.11.1 -requests==2.31.0 +pycryptodome==3.17 +pytest==7.3.1 +pytest-cov==4.0.0 +pytest-mock==3.10.0 +requests==2.30.0 six==1.16.0 sortedcontainers==2.4.0 tomli==2.0.1 -urllib3==2.0.4 -werkzeug==2.3.7 -wheel==0.41.2 +urllib3==2.0.2 +werkzeug==2.3.4 +wheel==0.40.0 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/13698ee.txt b/.riot/requirements/13698ee.txt index 28d0dd0443c..3a3889daad9 100644 --- a/.riot/requirements/13698ee.txt +++ b/.riot/requirements/13698ee.txt @@ -2,18 +2,18 @@ # This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --no-annotate .riot/requirements/13698ee.in +# pip-compile --no-annotate --resolver=backtracking .riot/requirements/13698ee.in # -attrs==23.1.0 -coverage[toml]==7.3.1 +attrs==22.2.0 +coverage[toml]==7.2.2 hypothesis==6.45.0 iniconfig==2.0.0 -mock==5.1.0 +mock==5.0.1 opentracing==2.4.0 -packaging==23.1 -pluggy==1.3.0 -pytest==7.4.1 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.11.1 +packaging==23.0 +pluggy==1.0.0 +pytest==7.2.2 +pytest-asyncio==0.20.3 +pytest-cov==4.0.0 +pytest-mock==3.10.0 sortedcontainers==2.4.0 diff --git a/.riot/requirements/1934323.txt b/.riot/requirements/1934323.txt index 466201087ce..02fd80cffef 100644 --- a/.riot/requirements/1934323.txt +++ b/.riot/requirements/1934323.txt @@ -2,20 +2,20 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --no-annotate .riot/requirements/1934323.in +# pip-compile --no-annotate --resolver=backtracking .riot/requirements/1934323.in # -attrs==23.1.0 -coverage[toml]==7.3.1 -exceptiongroup==1.1.3 +attrs==22.2.0 +coverage[toml]==7.2.2 +exceptiongroup==1.1.1 hypothesis==6.45.0 iniconfig==2.0.0 -mock==5.1.0 +mock==5.0.1 opentracing==2.4.0 -packaging==23.1 -pluggy==1.3.0 -pytest==7.4.1 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.11.1 +packaging==23.0 +pluggy==1.0.0 +pytest==7.2.2 +pytest-asyncio==0.20.3 +pytest-cov==4.0.0 +pytest-mock==3.10.0 sortedcontainers==2.4.0 tomli==2.0.1 diff --git a/.riot/requirements/1ba9802.txt b/.riot/requirements/1ba9802.txt index 01a077a224b..562567b1897 100644 --- a/.riot/requirements/1ba9802.txt +++ b/.riot/requirements/1ba9802.txt @@ -1,42 +1,45 @@ # -# This file is autogenerated by pip-compile with Python 3.9 -# by the following command: +# This file is autogenerated by pip-compile with python 3.9 +# To update, run: # -# pip-compile --no-annotate .riot/requirements/1ba9802.in +# pip-compile --no-annotate --resolver=backtracking .riot/requirements/1ba9802.in # astunparse==1.6.3 attrs==23.1.0 blinker==1.6.2 -certifi==2023.7.22 +certifi==2023.5.7 cffi==1.15.1 -charset-normalizer==3.2.0 -click==8.1.7 -coverage[toml]==7.3.1 -cryptography==41.0.3 -exceptiongroup==1.1.3 -flask==2.3.3 -gunicorn==21.2.0 +charset-normalizer==3.1.0 +click==8.1.3 +coverage[toml]==7.2.5 +cryptography==40.0.2 +exceptiongroup==1.1.1 +flask==2.3.2 +gunicorn==20.1.0 hypothesis==6.45.0 idna==3.4 -importlib-metadata==6.8.0 +importlib-metadata==6.6.0 iniconfig==2.0.0 itsdangerous==2.1.2 jinja2==3.1.2 -markupsafe==2.1.3 -mock==5.1.0 +markupsafe==2.1.2 +mock==5.0.2 opentracing==2.4.0 packaging==23.1 -pluggy==1.3.0 +pluggy==1.0.0 pycparser==2.21 -pycryptodome==3.18.0 -pytest==7.4.1 -pytest-cov==4.1.0 -pytest-mock==3.11.1 -requests==2.31.0 +pycryptodome==3.17 +pytest==7.3.1 +pytest-cov==4.0.0 +pytest-mock==3.10.0 +requests==2.30.0 six==1.16.0 sortedcontainers==2.4.0 tomli==2.0.1 -urllib3==2.0.4 -werkzeug==2.3.7 -wheel==0.41.2 -zipp==3.16.2 +urllib3==2.0.2 +werkzeug==2.3.4 +wheel==0.40.0 +zipp==3.15.0 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/7a3f46f.txt b/.riot/requirements/1bc5161.txt similarity index 67% rename from .riot/requirements/7a3f46f.txt rename to .riot/requirements/1bc5161.txt index 5729bfbfac4..526abfb3adb 100644 --- a/.riot/requirements/7a3f46f.txt +++ b/.riot/requirements/1bc5161.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --no-annotate .riot/requirements/7a3f46f.in +# pip-compile --no-annotate .riot/requirements/1bc5161.in # astunparse==1.6.3 attrs==23.1.0 @@ -10,10 +10,10 @@ blinker==1.6.2 certifi==2023.7.22 cffi==1.15.1 charset-normalizer==3.2.0 -click==8.1.7 -coverage[toml]==7.3.1 +click==8.1.6 +coverage[toml]==7.2.7 cryptography==41.0.3 -flask==2.3.3 +flask==2.3.2 gunicorn==21.2.0 hypothesis==6.45.0 idna==3.4 @@ -24,18 +24,15 @@ markupsafe==2.1.3 mock==5.1.0 opentracing==2.4.0 packaging==23.1 -pluggy==1.3.0 +pluggy==1.2.0 pycparser==2.21 pycryptodome==3.18.0 -pytest==7.4.1 +pytest==7.4.0 pytest-cov==4.1.0 pytest-mock==3.11.1 requests==2.31.0 six==1.16.0 sortedcontainers==2.4.0 urllib3==2.0.4 -werkzeug==2.3.7 -wheel==0.41.2 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools +werkzeug==2.3.6 +wheel==0.41.1 diff --git a/.riot/requirements/1d02c3a.txt b/.riot/requirements/1d02c3a.txt index a1578333e8e..4bebe747e6c 100644 --- a/.riot/requirements/1d02c3a.txt +++ b/.riot/requirements/1d02c3a.txt @@ -2,23 +2,23 @@ # 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/1d02c3a.in +# pip-compile --no-annotate --resolver=backtracking .riot/requirements/1d02c3a.in # -attrs==23.1.0 -coverage[toml]==7.2.7 -exceptiongroup==1.1.3 +attrs==22.2.0 +coverage[toml]==7.2.2 +exceptiongroup==1.1.1 hypothesis==6.45.0 -importlib-metadata==6.7.0 +importlib-metadata==6.0.0 iniconfig==2.0.0 -mock==5.1.0 +mock==5.0.1 opentracing==2.4.0 -packaging==23.1 -pluggy==1.2.0 -pytest==7.4.1 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.11.1 +packaging==23.0 +pluggy==1.0.0 +pytest==7.2.2 +pytest-asyncio==0.20.3 +pytest-cov==4.0.0 +pytest-mock==3.10.0 sortedcontainers==2.4.0 tomli==2.0.1 -typing-extensions==4.7.1 +typing-extensions==4.7.0 zipp==3.15.0 diff --git a/.riot/requirements/162dc3a.txt b/.riot/requirements/1d0d03e.txt similarity index 57% rename from .riot/requirements/162dc3a.txt rename to .riot/requirements/1d0d03e.txt index 373583eef44..8e2b89a66c3 100644 --- a/.riot/requirements/162dc3a.txt +++ b/.riot/requirements/1d0d03e.txt @@ -2,21 +2,18 @@ # This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --no-annotate .riot/requirements/162dc3a.in +# pip-compile --no-annotate .riot/requirements/1d0d03e.in # attrs==23.1.0 -coverage[toml]==7.3.1 +coverage[toml]==7.2.7 hypothesis==6.45.0 iniconfig==2.0.0 mock==5.1.0 opentracing==2.4.0 packaging==23.1 -pluggy==1.3.0 -pytest==7.4.1 +pluggy==1.2.0 +pytest==7.4.0 pytest-asyncio==0.21.1 pytest-cov==4.1.0 pytest-mock==3.11.1 sortedcontainers==2.4.0 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/1f1bd7d.txt b/.riot/requirements/1f1bd7d.txt index c1dffe7bcfb..f5597daf887 100644 --- a/.riot/requirements/1f1bd7d.txt +++ b/.riot/requirements/1f1bd7d.txt @@ -2,41 +2,44 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --no-annotate .riot/requirements/1f1bd7d.in +# pip-compile --no-annotate --resolver=backtracking .riot/requirements/1f1bd7d.in # astunparse==1.6.3 attrs==23.1.0 blinker==1.6.2 -certifi==2023.7.22 +certifi==2023.5.7 cffi==1.15.1 -charset-normalizer==3.2.0 -click==8.1.7 -coverage[toml]==7.3.1 -cryptography==41.0.3 -exceptiongroup==1.1.3 -flask==2.3.3 -gunicorn==21.2.0 +charset-normalizer==3.1.0 +click==8.1.3 +coverage[toml]==7.2.5 +cryptography==40.0.2 +exceptiongroup==1.1.1 +flask==2.3.2 +gunicorn==20.1.0 hypothesis==6.45.0 idna==3.4 -importlib-metadata==6.8.0 +importlib-metadata==6.6.0 iniconfig==2.0.0 itsdangerous==2.1.2 jinja2==3.1.2 -markupsafe==2.1.3 -mock==5.1.0 +markupsafe==2.1.2 +mock==5.0.2 opentracing==2.4.0 packaging==23.1 -pluggy==1.3.0 +pluggy==1.0.0 pycparser==2.21 -pycryptodome==3.18.0 -pytest==7.4.1 -pytest-cov==4.1.0 -pytest-mock==3.11.1 -requests==2.31.0 +pycryptodome==3.17 +pytest==7.3.1 +pytest-cov==4.0.0 +pytest-mock==3.10.0 +requests==2.30.0 six==1.16.0 sortedcontainers==2.4.0 tomli==2.0.1 -urllib3==2.0.4 -werkzeug==2.3.7 -wheel==0.41.2 -zipp==3.16.2 +urllib3==2.0.2 +werkzeug==2.3.4 +wheel==0.40.0 +zipp==3.15.0 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/43c7c81.txt b/.riot/requirements/43c7c81.txt index 12beefa6a58..9339d007a1f 100644 --- a/.riot/requirements/43c7c81.txt +++ b/.riot/requirements/43c7c81.txt @@ -2,20 +2,20 @@ # This file is autogenerated by pip-compile with Python 3.9 # by the following command: # -# pip-compile --no-annotate .riot/requirements/43c7c81.in +# pip-compile --no-annotate --resolver=backtracking .riot/requirements/43c7c81.in # -attrs==23.1.0 -coverage[toml]==7.3.1 -exceptiongroup==1.1.3 +attrs==22.2.0 +coverage[toml]==7.2.2 +exceptiongroup==1.1.1 hypothesis==6.45.0 iniconfig==2.0.0 -mock==5.1.0 +mock==5.0.1 opentracing==2.4.0 -packaging==23.1 -pluggy==1.3.0 -pytest==7.4.1 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.11.1 +packaging==23.0 +pluggy==1.0.0 +pytest==7.2.2 +pytest-asyncio==0.20.3 +pytest-cov==4.0.0 +pytest-mock==3.10.0 sortedcontainers==2.4.0 tomli==2.0.1 diff --git a/.riot/requirements/5ea5e85.txt b/.riot/requirements/5ea5e85.txt index 26658e831d3..9ddc921f5ef 100644 --- a/.riot/requirements/5ea5e85.txt +++ b/.riot/requirements/5ea5e85.txt @@ -2,41 +2,44 @@ # 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/5ea5e85.in +# pip-compile --no-annotate --resolver=backtracking .riot/requirements/5ea5e85.in # astunparse==1.6.3 attrs==23.1.0 -certifi==2023.7.22 +certifi==2023.5.7 cffi==1.15.1 -charset-normalizer==3.2.0 -click==8.1.7 -coverage[toml]==7.2.7 -cryptography==41.0.3 -exceptiongroup==1.1.3 +charset-normalizer==3.1.0 +click==8.1.3 +coverage[toml]==7.2.5 +cryptography==40.0.2 +exceptiongroup==1.1.1 flask==2.2.5 -gunicorn==21.2.0 +gunicorn==20.1.0 hypothesis==6.45.0 idna==3.4 -importlib-metadata==6.7.0 +importlib-metadata==6.6.0 iniconfig==2.0.0 itsdangerous==2.1.2 jinja2==3.1.2 -markupsafe==2.1.3 -mock==5.1.0 +markupsafe==2.1.2 +mock==5.0.2 opentracing==2.4.0 packaging==23.1 -pluggy==1.2.0 +pluggy==1.0.0 pycparser==2.21 -pycryptodome==3.18.0 -pytest==7.4.1 -pytest-cov==4.1.0 -pytest-mock==3.11.1 -requests==2.31.0 +pycryptodome==3.17 +pytest==7.3.1 +pytest-cov==4.0.0 +pytest-mock==3.10.0 +requests==2.30.0 six==1.16.0 sortedcontainers==2.4.0 tomli==2.0.1 -typing-extensions==4.7.1 -urllib3==2.0.4 +typing-extensions==4.7.0 +urllib3==2.0.2 werkzeug==2.2.3 -wheel==0.41.2 +wheel==0.40.0 zipp==3.15.0 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/8b732cf.txt b/.riot/requirements/8b732cf.txt index 9ccb1a616f0..bc4c2185f6f 100644 --- a/.riot/requirements/8b732cf.txt +++ b/.riot/requirements/8b732cf.txt @@ -2,37 +2,40 @@ # This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --no-annotate .riot/requirements/8b732cf.in +# pip-compile --no-annotate --resolver=backtracking .riot/requirements/8b732cf.in # astunparse==1.6.3 attrs==23.1.0 blinker==1.6.2 -certifi==2023.7.22 +certifi==2023.5.7 cffi==1.15.1 -charset-normalizer==3.2.0 -click==8.1.7 -coverage[toml]==7.3.1 -cryptography==41.0.3 -flask==2.3.3 -gunicorn==21.2.0 +charset-normalizer==3.1.0 +click==8.1.3 +coverage[toml]==7.2.5 +cryptography==40.0.2 +flask==2.3.2 +gunicorn==20.1.0 hypothesis==6.45.0 idna==3.4 iniconfig==2.0.0 itsdangerous==2.1.2 jinja2==3.1.2 -markupsafe==2.1.3 -mock==5.1.0 +markupsafe==2.1.2 +mock==5.0.2 opentracing==2.4.0 packaging==23.1 -pluggy==1.3.0 +pluggy==1.0.0 pycparser==2.21 -pycryptodome==3.18.0 -pytest==7.4.1 -pytest-cov==4.1.0 -pytest-mock==3.11.1 -requests==2.31.0 +pycryptodome==3.17 +pytest==7.3.1 +pytest-cov==4.0.0 +pytest-mock==3.10.0 +requests==2.30.0 six==1.16.0 sortedcontainers==2.4.0 -urllib3==2.0.4 -werkzeug==2.3.7 -wheel==0.41.2 +urllib3==2.0.2 +werkzeug==2.3.4 +wheel==0.40.0 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/a8445d3.txt b/.riot/requirements/a8445d3.txt index 84618138e74..0098804d458 100644 --- a/.riot/requirements/a8445d3.txt +++ b/.riot/requirements/a8445d3.txt @@ -2,20 +2,20 @@ # This file is autogenerated by pip-compile with Python 3.10 # by the following command: # -# pip-compile --no-annotate .riot/requirements/a8445d3.in +# pip-compile --no-annotate --resolver=backtracking .riot/requirements/a8445d3.in # -attrs==23.1.0 -coverage[toml]==7.3.1 -exceptiongroup==1.1.3 +attrs==22.2.0 +coverage[toml]==7.2.2 +exceptiongroup==1.1.1 hypothesis==6.45.0 iniconfig==2.0.0 -mock==5.1.0 +mock==5.0.1 opentracing==2.4.0 -packaging==23.1 -pluggy==1.3.0 -pytest==7.4.1 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.11.1 +packaging==23.0 +pluggy==1.0.0 +pytest==7.2.2 +pytest-asyncio==0.20.3 +pytest-cov==4.0.0 +pytest-mock==3.10.0 sortedcontainers==2.4.0 tomli==2.0.1 diff --git a/riotfile.py b/riotfile.py index a444f92004a..43d028a2b09 100644 --- a/riotfile.py +++ b/riotfile.py @@ -142,15 +142,6 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): env={ "DD_IAST_REQUEST_SAMPLING": "100", # Override default 30% to analyze all IAST requests }, - venvs=[ - Venv(pys=select_pys(max_version="3.11")), - Venv( - pys=select_pys(min_version="3.12"), - pkgs={ - "setuptools": latest, - }, - ), - ], ), Venv( name="profile-diff", @@ -1851,15 +1842,6 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): pkgs={ "pytest-asyncio": latest, }, - venvs=[ - Venv(pys=select_pys(max_version="3.11")), - Venv( - pys=select_pys(min_version="3.12"), - pkgs={ - "setuptools": latest, - }, - ), - ], ), Venv( name="futures", From 3c3388e54f77edc5b0e8b63b1de2611364eb815b Mon Sep 17 00:00:00 2001 From: Yun Kim Date: Thu, 7 Sep 2023 15:09:50 -0400 Subject: [PATCH 26/58] Fix merging pyXY files to parent test files (aiopg, debugger, internal) add setuptools dep to 3.12 debugger suite --- .../requirements/{1540a76.txt => 174460f.txt} | 9 ++-- riotfile.py | 5 +- tests/contrib/aiopg/test.py | 1 - tests/debugging/test_async.py | 47 +++++++++++++++++++ 4 files changed, 57 insertions(+), 5 deletions(-) rename .riot/requirements/{1540a76.txt => 174460f.txt} (64%) create mode 100644 tests/debugging/test_async.py diff --git a/.riot/requirements/1540a76.txt b/.riot/requirements/174460f.txt similarity index 64% rename from .riot/requirements/1540a76.txt rename to .riot/requirements/174460f.txt index eb8ae8adc31..d761cbf94b1 100644 --- a/.riot/requirements/1540a76.txt +++ b/.riot/requirements/174460f.txt @@ -2,10 +2,10 @@ # This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --no-annotate .riot/requirements/1540a76.in +# pip-compile --no-annotate .riot/requirements/174460f.in # attrs==23.1.0 -coverage[toml]==7.3.0 +coverage[toml]==7.3.1 httpretty==1.1.4 hypothesis==6.45.0 iniconfig==2.0.0 @@ -14,9 +14,12 @@ msgpack==1.0.5 opentracing==2.4.0 packaging==23.1 pluggy==1.3.0 -pytest==7.4.1 +pytest==7.4.2 pytest-asyncio==0.21.1 pytest-cov==4.1.0 pytest-mock==3.11.1 sortedcontainers==2.4.0 typing-extensions==4.7.1 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/riotfile.py b/riotfile.py index 43d028a2b09..a02b8c3f6eb 100644 --- a/riotfile.py +++ b/riotfile.py @@ -349,7 +349,10 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): "typing-extensions": latest, "pytest-asyncio": latest, }, - pys=select_pys(), + venvs=[ + Venv(pys=select_pys(max_version="3.11")), + Venv(pys=select_pys(min_version="3.12"), pkgs={"setuptools": latest}), + ], ), Venv( name="vendor", diff --git a/tests/contrib/aiopg/test.py b/tests/contrib/aiopg/test.py index 759180ae0c5..34a83a9cc6e 100644 --- a/tests/contrib/aiopg/test.py +++ b/tests/contrib/aiopg/test.py @@ -330,7 +330,6 @@ def test_analytics_without_rate(self): self.assertEqual(len(spans), 1) self.assertEqual(spans[0].get_metric(ANALYTICS_SAMPLE_RATE_KEY), 1.0) - @mark_asyncio async def _test_cursor_ctx_manager(self): conn, tracer = await self._get_conn_and_tracer() cur = await conn.cursor() diff --git a/tests/debugging/test_async.py b/tests/debugging/test_async.py new file mode 100644 index 00000000000..25483e596ba --- /dev/null +++ b/tests/debugging/test_async.py @@ -0,0 +1,47 @@ +import pytest + +from ddtrace.debugging._async import dd_coroutine_wrapper + + +class MockSignalContext: + def __init__(self): + self.retval = None + self.exc_info = None + self.duration = None + + def exit(self, retval, exc_info, duration): + self.retval = retval + self.exc_info = exc_info + self.duration = duration + + +@pytest.mark.asyncio +async def test_dd_coroutine_wrapper_return(): + # type: () -> None + contexts = [MockSignalContext() for _ in range(10)] + + async def coro(): + return 1 + + retval = await dd_coroutine_wrapper(coro(), contexts) + + assert retval == 1 + + assert all((context.retval, context.exc_info) == (1, (None, None, None)) for context in contexts) + + +@pytest.mark.asyncio +async def test_dd_coroutine_wrapper_exc(): + # type: () -> None + contexts = [MockSignalContext() for _ in range(10)] + + class MyException(Exception): + pass + + async def coro(): + raise MyException("error") + + with pytest.raises(MyException): + await dd_coroutine_wrapper(coro(), contexts) + + assert all((context.retval, context.exc_info[0]) == (None, MyException) for context in contexts) From 4d94f9c03423f912dc822785f40cf23fd225ea83 Mon Sep 17 00:00:00 2001 From: "Tahir H. Butt" Date: Thu, 7 Sep 2023 16:02:13 -0400 Subject: [PATCH 27/58] add setuptools to pyproject --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index cd648161cb9..70b98969a45 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,6 +30,7 @@ dependencies = [ "importlib_metadata; python_version<'3.8'", "opentelemetry-api>=1", "protobuf>=3", + "setuptools; python_version>='3.12'", "six>=1.12.0", "typing_extensions", "xmltodict>=0.12", From 61c0fd28b15c529015fd829fceeb186b4cd1cf94 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Thu, 7 Sep 2023 13:27:29 -0700 Subject: [PATCH 28/58] skip test that uses dis in 3.12 --- tests/internal/test_wrapping.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/internal/test_wrapping.py b/tests/internal/test_wrapping.py index b70be8fd94f..085a15dab8d 100644 --- a/tests/internal/test_wrapping.py +++ b/tests/internal/test_wrapping.py @@ -273,6 +273,7 @@ def wrapper(f, args, kwargs): assert f(1, 2) == ((1, 2), None) +@pytest.mark.skipif(sys.version_info[:2] > (3, 11), reason="dis is different in python >= 3.12") def test_wrap_arg_args_kwarg_kwargs(): def f(posarg, *args, path=None, **kwargs): return (posarg, args, path, kwargs) From 25dd83eb7584abb3e1748f72666bebfa6711b2c8 Mon Sep 17 00:00:00 2001 From: Yun Kim Date: Thu, 7 Sep 2023 16:35:17 -0400 Subject: [PATCH 29/58] Revert setuptools being added as manual dep in debugger venv --- .riot/requirements/{174460f.txt => 1540a76.txt} | 5 +---- riotfile.py | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) rename .riot/requirements/{174460f.txt => 1540a76.txt} (71%) diff --git a/.riot/requirements/174460f.txt b/.riot/requirements/1540a76.txt similarity index 71% rename from .riot/requirements/174460f.txt rename to .riot/requirements/1540a76.txt index d761cbf94b1..077ec4693fe 100644 --- a/.riot/requirements/174460f.txt +++ b/.riot/requirements/1540a76.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --no-annotate .riot/requirements/174460f.in +# pip-compile --no-annotate .riot/requirements/1540a76.in # attrs==23.1.0 coverage[toml]==7.3.1 @@ -20,6 +20,3 @@ pytest-cov==4.1.0 pytest-mock==3.11.1 sortedcontainers==2.4.0 typing-extensions==4.7.1 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/riotfile.py b/riotfile.py index a02b8c3f6eb..43d028a2b09 100644 --- a/riotfile.py +++ b/riotfile.py @@ -349,10 +349,7 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): "typing-extensions": latest, "pytest-asyncio": latest, }, - venvs=[ - Venv(pys=select_pys(max_version="3.11")), - Venv(pys=select_pys(min_version="3.12"), pkgs={"setuptools": latest}), - ], + pys=select_pys(), ), Venv( name="vendor", From a6ea4f146081f2ba7011d3abbb5feb0811804807 Mon Sep 17 00:00:00 2001 From: "Tahir H. Butt" Date: Thu, 7 Sep 2023 16:37:26 -0400 Subject: [PATCH 30/58] disable for bytecode --- tests/internal/test_injection.py | 6 ++++++ tests/internal/test_wrapping.py | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/tests/internal/test_injection.py b/tests/internal/test_injection.py index 5db1b7491dd..66c1250342a 100644 --- a/tests/internal/test_injection.py +++ b/tests/internal/test_injection.py @@ -1,5 +1,6 @@ from contextlib import contextmanager from random import shuffle +import sys import mock import pytest @@ -14,6 +15,11 @@ from ddtrace.internal.utils.inspection import linenos +# bytecode does not support Python 3.12 yet +if sys.version_info[:2] >= (3, 12): + pytestmark = pytest.mark.skip + + @contextmanager def injected_hook(f, hook, arg, line=None): if PY2 and isinstance(f, UnboundMethodType): diff --git a/tests/internal/test_wrapping.py b/tests/internal/test_wrapping.py index 085a15dab8d..0aa4c38cabb 100644 --- a/tests/internal/test_wrapping.py +++ b/tests/internal/test_wrapping.py @@ -9,6 +9,11 @@ from ddtrace.internal.wrapping import wrap +# bytecode does not support Python 3.12 yet +if sys.version_info[:2] >= (3, 12): + pytestmark = pytest.mark.skip + + async def async_func(): return 42 From becdf3c190cc3cf80a9104a8cd2d7d8fdff2ca71 Mon Sep 17 00:00:00 2001 From: "Tahir H. Butt" Date: Thu, 7 Sep 2023 17:18:40 -0400 Subject: [PATCH 31/58] Revert "disable for bytecode" This reverts commit 423620ee71f75537e7fc5a914ed3fb036a6ab035. --- tests/internal/test_injection.py | 6 ------ tests/internal/test_wrapping.py | 5 ----- 2 files changed, 11 deletions(-) diff --git a/tests/internal/test_injection.py b/tests/internal/test_injection.py index 66c1250342a..5db1b7491dd 100644 --- a/tests/internal/test_injection.py +++ b/tests/internal/test_injection.py @@ -1,6 +1,5 @@ from contextlib import contextmanager from random import shuffle -import sys import mock import pytest @@ -15,11 +14,6 @@ from ddtrace.internal.utils.inspection import linenos -# bytecode does not support Python 3.12 yet -if sys.version_info[:2] >= (3, 12): - pytestmark = pytest.mark.skip - - @contextmanager def injected_hook(f, hook, arg, line=None): if PY2 and isinstance(f, UnboundMethodType): diff --git a/tests/internal/test_wrapping.py b/tests/internal/test_wrapping.py index 0aa4c38cabb..085a15dab8d 100644 --- a/tests/internal/test_wrapping.py +++ b/tests/internal/test_wrapping.py @@ -9,11 +9,6 @@ from ddtrace.internal.wrapping import wrap -# bytecode does not support Python 3.12 yet -if sys.version_info[:2] >= (3, 12): - pytestmark = pytest.mark.skip - - async def async_func(): return 42 From 4575165c6741c40e46e7ed1153fd3315bbf806a1 Mon Sep 17 00:00:00 2001 From: ZStriker19 Date: Thu, 7 Sep 2023 17:44:34 -0400 Subject: [PATCH 32/58] add basic 3.12 support releasenote --- .../notes/3.12_support-422a62d1871877c2.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .riot/requirements/releasenotes/notes/3.12_support-422a62d1871877c2.yaml diff --git a/.riot/requirements/releasenotes/notes/3.12_support-422a62d1871877c2.yaml b/.riot/requirements/releasenotes/notes/3.12_support-422a62d1871877c2.yaml new file mode 100644 index 00000000000..08f5205ade9 --- /dev/null +++ b/.riot/requirements/releasenotes/notes/3.12_support-422a62d1871877c2.yaml @@ -0,0 +1,14 @@ +--- +prelude: > + We added support for Python 3.12 but (add caveats) + +features: + - | + Adds support for Python 3.12 +issues: + - | + List known issues here, or remove this section. All of the list items in + this section are combined when the release notes are rendered, so the text + needs to be worded so that it does not depend on any information only + available in another section, such as the prelude. This may mean repeating + some details. From 51f3bac6fccad73dfd203e0dbdc9769fe1050805 Mon Sep 17 00:00:00 2001 From: Munir Abdinur Date: Fri, 8 Sep 2023 12:30:48 -0400 Subject: [PATCH 33/58] chore(telemetry): ensure instrumentation telemetry is compatible with python 3.12 (#6859) ## Motivation - Make the instrumentation telemetry client compatible with python3.12: https://github.com/python/cpython/pull/104826 ## Description - Start telemetry worker thread as early as possible. - Delays sending all telemetry events until app-started is queued. - Refactors tests to align with this new logic. ## Risk - Telemetry events (metrics/logs/integrations) are queued as early as possible but these events are only sent when the trace agent writer is started. This **may** result in a memory leak if high cardinality telemetry metrics and logs are added in the future. This is not a concern right now. ## 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) - [x] If this PR touches code that signs or publishes builds or packages, or handles credentials of any kind, I've requested a review from `@DataDog/security-design-and-guidance`. - [x] This PR doesn't touch any of that. --------- Co-authored-by: Yun Kim Co-authored-by: Tahir H. Butt Co-authored-by: Gabriele N. Tornetta Co-authored-by: Yun Kim <35776586+Yun-Kim@users.noreply.github.com> Co-authored-by: Emmett Butler Co-authored-by: ZStriker19 --- .circleci/config.yml | 2 +- ddtrace/__init__.py | 5 ++ ddtrace/internal/telemetry/__init__.py | 7 ++ ddtrace/internal/telemetry/data.py | 6 +- ddtrace/internal/telemetry/writer.py | 21 ++--- ddtrace/internal/writer/writer.py | 3 +- tests/telemetry/test_telemetry.py | 82 ++++++++++--------- tests/telemetry/test_telemetry_metrics_e2e.py | 11 +-- tests/telemetry/test_writer.py | 11 ++- 9 files changed, 77 insertions(+), 71 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 77e7357a30f..1c910518daa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,4 +38,4 @@ jobs: workflows: setup: jobs: - - setup + - setup \ No newline at end of file diff --git a/ddtrace/__init__.py b/ddtrace/__init__.py index df81fc4e37f..2f96bed64d2 100644 --- a/ddtrace/__init__.py +++ b/ddtrace/__init__.py @@ -25,6 +25,11 @@ telemetry.install_excepthook() +# In order to support 3.12, we start the writer upon initialization. +# See https://github.com/python/cpython/pull/104826. +# Telemetry events will only be sent after the `app-started` is queued. +# This will occur when the agent writer starts. +telemetry.telemetry_writer.enable() from ._monkey import patch # noqa: E402 from ._monkey import patch_all # noqa: E402 diff --git a/ddtrace/internal/telemetry/__init__.py b/ddtrace/internal/telemetry/__init__.py index e178bb874f4..e8d4395a90c 100644 --- a/ddtrace/internal/telemetry/__init__.py +++ b/ddtrace/internal/telemetry/__init__.py @@ -49,6 +49,13 @@ def _excepthook(tp, value, root_traceback): error_msg = "{}:{} {}".format(filename, lineno, str(value)) telemetry_writer.add_integration(integration_name, True, error_msg=error_msg) + if telemetry_writer.started is False: + telemetry_writer._app_started_event(False) + telemetry_writer._app_dependencies_loaded_event() + + telemetry_writer.app_shutdown() + telemetry_writer.disable() + return _ORIGINAL_EXCEPTHOOK(tp, value, root_traceback) diff --git a/ddtrace/internal/telemetry/data.py b/ddtrace/internal/telemetry/data.py index 2afe96bc5f3..bd334c7bc29 100644 --- a/ddtrace/internal/telemetry/data.py +++ b/ddtrace/internal/telemetry/data.py @@ -4,12 +4,12 @@ from typing import List from typing import Tuple -import ddtrace from ddtrace.internal.compat import PY3 from ddtrace.internal.constants import DEFAULT_SERVICE_NAME from ddtrace.internal.packages import get_distributions from ddtrace.internal.runtime.container import get_container_info from ddtrace.internal.utils.cache import cached +from ddtrace.version import get_version from ...settings import _config as config from ..hostname import get_hostname @@ -63,7 +63,7 @@ def _get_application(key): "env": env or "", "language_name": "python", "language_version": _format_version_info(sys.version_info), - "tracer_version": ddtrace.__version__, + "tracer_version": get_version(), "runtime_name": platform.python_implementation(), "runtime_version": _format_version_info(sys.implementation.version) if PY3 else "", "products": _get_products(), @@ -88,7 +88,7 @@ def get_application(service, version, env): def _get_products(): # type: () -> Dict return { - "appsec": {"version": ddtrace.__version__, "enabled": config._appsec_enabled}, + "appsec": {"version": get_version(), "enabled": config._appsec_enabled}, } diff --git a/ddtrace/internal/telemetry/writer.py b/ddtrace/internal/telemetry/writer.py index 54c28bb90e2..a6b29f2e298 100644 --- a/ddtrace/internal/telemetry/writer.py +++ b/ddtrace/internal/telemetry/writer.py @@ -216,7 +216,6 @@ def enable(self): if self._is_periodic: self.start() - atexit.register(self.app_shutdown) return True self.status = ServiceStatus.RUNNING @@ -290,14 +289,18 @@ def add_error(self, code, msg, filename, line_number): msg = "%s:%s: %s" % (filename, line_number, msg) self._error = (code, msg) - def _app_started_event(self): - # type: () -> None + def _app_started_event(self, register_app_shutdown=True): + # type: (bool) -> None """Sent when TelemetryWriter is enabled or forks""" if self._forked: # app-started events should only be sent by the main process return # List of configurations to be collected + self.started = True + if register_app_shutdown: + atexit.register(self.app_shutdown) + self.add_configurations( [ (TELEMETRY_TRACING_ENABLED, config._tracing_enabled, "unknown"), @@ -593,15 +596,6 @@ def periodic(self, force_flush=False): for telemetry_event in telemetry_events: self._client.send_event(telemetry_event) - def start(self, *args, **kwargs): - # type: (...) -> None - super(TelemetryWriter, self).start(*args, **kwargs) - # Queue app-started event after the telemetry worker thread is running - if self.started is False: - self._app_started_event() - self._app_dependencies_loaded_event() - self.started = True - def app_shutdown(self): self._app_closing_event() self.periodic(force_flush=True) @@ -634,8 +628,7 @@ def _fork_writer(self): # Enable writer service in child process to avoid interpreter shutdown # error in Python 3.12 - if sys.version_info >= (3, 12): - self.enable() + self.enable() def _restart_sequence(self): self._sequence = itertools.count(1) diff --git a/ddtrace/internal/writer/writer.py b/ddtrace/internal/writer/writer.py index 63580f0cd28..19b7a66fc8f 100644 --- a/ddtrace/internal/writer/writer.py +++ b/ddtrace/internal/writer/writer.py @@ -627,7 +627,8 @@ def _send_payload(self, payload, count, client): def start(self): super(AgentWriter, self).start() try: - telemetry_writer.enable() + telemetry_writer._app_started_event() + telemetry_writer._app_dependencies_loaded_event() # appsec remote config should be enabled/started after the global tracer and configs # are initialized diff --git a/tests/telemetry/test_telemetry.py b/tests/telemetry/test_telemetry.py index 8e3aa8bea77..bc7ee6b2b7b 100644 --- a/tests/telemetry/test_telemetry.py +++ b/tests/telemetry/test_telemetry.py @@ -8,7 +8,12 @@ def test_enable(test_agent_session, run_python_code_in_subprocess): code = """ from ddtrace.internal.telemetry import telemetry_writer +from ddtrace.internal.service import ServiceStatus + telemetry_writer.enable() + +assert telemetry_writer.status == ServiceStatus.RUNNING +assert telemetry_writer._worker is not None """ stdout, stderr, status, _ = run_python_code_in_subprocess(code) @@ -17,26 +22,10 @@ def test_enable(test_agent_session, run_python_code_in_subprocess): assert stdout == b"", stderr assert stderr == b"" - events = test_agent_session.get_events() - assert len(events) == 3 - - # Same runtime id is used - assert events[0]["runtime_id"] == events[1]["runtime_id"] - assert events[0]["request_type"] == "app-closing" - assert events[1]["request_type"] == "app-dependencies-loaded" - assert events[2]["request_type"] == "app-started" - assert events[2]["payload"]["error"] == {"code": 0, "message": ""} - @pytest.mark.snapshot def test_telemetry_enabled_on_first_tracer_flush(test_agent_session, ddtrace_run_python_code_in_subprocess): """assert telemetry events are generated after the first trace is flushed to the agent""" - # Using ddtrace-run and/or importing ddtrace alone should not enable telemetry - # Telemetry data should only be sent after the first trace to the agent - _, stderr, status, _ = ddtrace_run_python_code_in_subprocess("import ddtrace") - assert status == 0, stderr - # No trace and No Telemetry - assert len(test_agent_session.get_events()) == 0 # Submit a trace to the agent in a subprocess code = 'from ddtrace import tracer; span = tracer.trace("test-telemetry"); span.finish()' @@ -58,6 +47,11 @@ def test_telemetry_enabled_on_first_tracer_flush(test_agent_session, ddtrace_run def test_enable_fork(test_agent_session, run_python_code_in_subprocess): """assert app-started/app-closing events are only sent in parent process""" code = """ +import warnings +# This test logs the following warning in py3.12: +# This process (pid=402) is multi-threaded, use of fork() may lead to deadlocks in the child +warnings.filterwarnings("ignore", category=DeprecationWarning) + import os from ddtrace.internal.runtime import get_runtime_id @@ -65,6 +59,7 @@ def test_enable_fork(test_agent_session, run_python_code_in_subprocess): # We have to start before forking since fork hooks are not enabled until after enabling telemetry_writer.enable() +telemetry_writer._app_started_event() if os.fork() == 0: # Send multiple started events to confirm none get sent @@ -78,27 +73,29 @@ def test_enable_fork(test_agent_session, run_python_code_in_subprocess): stdout, stderr, status, _ = run_python_code_in_subprocess(code) assert status == 0, stderr - assert stderr == b"" + assert stderr == b"", stderr runtime_id = stdout.strip().decode("utf-8") requests = test_agent_session.get_requests() # We expect 2 events from the parent process to get sent, but none from the child process - assert len(requests) == 3 + assert len(requests) == 2 # Validate that the runtime id sent for every event is the parent processes runtime id assert requests[0]["body"]["runtime_id"] == runtime_id assert requests[0]["body"]["request_type"] == "app-closing" assert requests[1]["body"]["runtime_id"] == runtime_id - assert requests[1]["body"]["request_type"] == "app-dependencies-loaded" - assert requests[1]["body"]["runtime_id"] == runtime_id - assert requests[2]["body"]["request_type"] == "app-started" - assert requests[2]["body"]["runtime_id"] == runtime_id + assert requests[1]["body"]["request_type"] == "app-started" def test_enable_fork_heartbeat(test_agent_session, run_python_code_in_subprocess): """assert app-heartbeat events are only sent in parent process when no other events are queued""" code = """ +import warnings +# This test logs the following warning in py3.12: +# This process (pid=402) is multi-threaded, use of fork() may lead to deadlocks in the child +warnings.filterwarnings("ignore", category=DeprecationWarning) + import os from ddtrace.internal.runtime import get_runtime_id @@ -120,7 +117,7 @@ def test_enable_fork_heartbeat(test_agent_session, run_python_code_in_subprocess stdout, stderr, status, _ = run_python_code_in_subprocess(code) assert status == 0, stderr - assert stderr == b"" + assert stderr == b"", stderr runtime_id = stdout.strip().decode("utf-8") @@ -138,6 +135,11 @@ def test_heartbeat_interval_configuration(run_python_code_in_subprocess): env = os.environ.copy() env["DD_TELEMETRY_HEARTBEAT_INTERVAL"] = "61" code = """ +import warnings +# This test logs the following warning in py3.12: +# This process (pid=402) is multi-threaded, use of fork() may lead to deadlocks in the child +warnings.filterwarnings("ignore", category=DeprecationWarning) + from ddtrace import config assert config._telemetry_heartbeat_interval == 61 @@ -156,6 +158,11 @@ def test_logs_after_fork(run_python_code_in_subprocess): # Regression test: telemetry writer should not log an error when a process forks _, err, status, _ = run_python_code_in_subprocess( """ +import warnings +# This test logs the following warning in py3.12: +# This process (pid=402) is multi-threaded, use of fork() may lead to deadlocks in the child +warnings.filterwarnings("ignore", category=DeprecationWarning) + import ddtrace import logging import os @@ -167,7 +174,7 @@ def test_logs_after_fork(run_python_code_in_subprocess): ) assert status == 0, err - assert err == b"" + assert err == b"", err def test_app_started_error_handled_exception(test_agent_session, run_python_code_in_subprocess): @@ -250,6 +257,9 @@ def test_handled_integration_error(test_agent_session, run_python_code_in_subpro from ddtrace import patch, tracer patch(raise_errors=False, sqlite3=True) + +# Create a span to start the telemetry writer +tracer.trace("hi").finish() """ _, stderr, status, _ = run_python_code_in_subprocess(code) @@ -260,15 +270,11 @@ def test_handled_integration_error(test_agent_session, run_python_code_in_subpro events = test_agent_session.get_events() - assert len(events) == 5 - # Same runtime id is used - assert ( - events[0]["runtime_id"] - == events[1]["runtime_id"] - == events[2]["runtime_id"] - == events[3]["runtime_id"] - == events[4]["runtime_id"] - ) + assert len(events) > 1 + for event in events: + # Same runtime id is used + assert event["runtime_id"] == events[0]["runtime_id"] + integrations_events = [event for event in events if event["request_type"] == "app-integrations-change"] assert len(integrations_events) == 1 @@ -277,12 +283,14 @@ def test_handled_integration_error(test_agent_session, run_python_code_in_subpro == "failed to import ddtrace module 'ddtrace.contrib.sqlite3' when patching on import" ) - metric_events = [event for event in events if event["request_type"] == "generate-metrics"] - + metric_events = [ + event + for event in events + if event["request_type"] == "generate-metrics" + and event["payload"]["series"][0]["metric"] == "integration_errors" + ] assert len(metric_events) == 1 - assert metric_events[0]["payload"]["namespace"] == "tracers" assert len(metric_events[0]["payload"]["series"]) == 1 - assert metric_events[0]["payload"]["series"][0]["metric"] == "integration_errors" assert metric_events[0]["payload"]["series"][0]["type"] == "count" assert len(metric_events[0]["payload"]["series"][0]["points"]) == 1 assert metric_events[0]["payload"]["series"][0]["points"][0][1] == 1 diff --git a/tests/telemetry/test_telemetry_metrics_e2e.py b/tests/telemetry/test_telemetry_metrics_e2e.py index 6755e387255..55f62589247 100644 --- a/tests/telemetry/test_telemetry_metrics_e2e.py +++ b/tests/telemetry/test_telemetry_metrics_e2e.py @@ -3,7 +3,6 @@ import os import subprocess import sys -import time import pytest @@ -28,8 +27,6 @@ def _build_env(): def gunicorn_server(telemetry_metrics_enabled="true", token=None): cmd = ["ddtrace-run", "gunicorn", "-w", "1", "-b", "0.0.0.0:8000", "tests.telemetry.app:app"] env = _build_env() - env["DD_TELEMETRY_METRICS_ENABLED"] = telemetry_metrics_enabled - env["DD_TELEMETRY_HEARTBEAT_INTERVAL"] = "1.0" env["_DD_TRACE_WRITER_ADDITIONAL_HEADERS"] = "X-Datadog-Test-Session-Token:{}".format(token) env["DD_TRACE_AGENT_URL"] = os.environ.get("DD_TRACE_AGENT_URL", "") env["DD_TRACE_DEBUG"] = "true" @@ -90,19 +87,15 @@ def test_telemetry_metrics_enabled_on_gunicorn_child_process(test_agent_session) gunicorn_client.get("/count_metric") response = gunicorn_client.get("/count_metric") assert response.status_code == 200 - # DD_TELEMETRY_HEARTBEAT_INTERVAL is set to 1 second - time.sleep(1) gunicorn_client.get("/count_metric") response = gunicorn_client.get("/count_metric") assert response.status_code == 200 events = test_agent_session.get_events() metrics = list(filter(lambda event: event["request_type"] == "generate-metrics", events)) - assert len(metrics) == 2 + assert len(metrics) == 1 assert metrics[0]["payload"]["series"][0]["metric"] == "test_metric" - assert metrics[0]["payload"]["series"][0]["points"][0][1] == 2.0 - assert metrics[1]["payload"]["series"][0]["metric"] == "test_metric" - assert metrics[1]["payload"]["series"][0]["points"][0][1] == 3.0 + assert metrics[0]["payload"]["series"][0]["points"][0][1] == 5 def test_span_creation_and_finished_metrics_datadog(test_agent_session, ddtrace_run_python_code_in_subprocess): diff --git a/tests/telemetry/test_writer.py b/tests/telemetry/test_writer.py index 1c8d483f9ba..2f26997e789 100644 --- a/tests/telemetry/test_writer.py +++ b/tests/telemetry/test_writer.py @@ -372,8 +372,8 @@ def test_send_failing_request(mock_status, telemetry_writer): with httpretty.enabled(): httpretty.register_uri(httpretty.POST, telemetry_writer._client.url, status=mock_status) with mock.patch("ddtrace.internal.telemetry.writer.log") as log: - # sends failing app-closing event - telemetry_writer.app_shutdown() + # sends failing app-heartbeat event + telemetry_writer.periodic() # asserts unsuccessful status code was logged log.debug.assert_called_with( "failed to send telemetry to the Datadog Agent at %s. response: %s", @@ -392,13 +392,11 @@ def test_telemetry_graceful_shutdown(telemetry_writer, test_agent_session, mock_ telemetry_writer.app_shutdown() events = test_agent_session.get_events() - assert len(events) == 3 + assert len(events) == 1 # Reverse chronological order assert events[0]["request_type"] == "app-closing" - assert events[0] == _get_request_body({}, "app-closing", 3) - assert events[1]["request_type"] == "app-dependencies-loaded" - assert events[2]["request_type"] == "app-started" + assert events[0] == _get_request_body({}, "app-closing", 1) def test_app_heartbeat_event_periodic(mock_time, telemetry_writer, test_agent_session): @@ -407,6 +405,7 @@ def test_app_heartbeat_event_periodic(mock_time, telemetry_writer, test_agent_se # Ensure telemetry writer is initialized to send periodic events telemetry_writer._is_periodic = True + telemetry_writer.started = True # Assert default telemetry interval is 10 seconds and the expected periodic threshold and counts are set assert telemetry_writer.interval == 10 assert telemetry_writer._periodic_threshold == 5 From b19af026924cafccb1aa20adc5048742f6096950 Mon Sep 17 00:00:00 2001 From: "Tahir H. Butt" Date: Fri, 8 Sep 2023 13:14:34 -0400 Subject: [PATCH 34/58] update cython --- pyproject.toml | 2 +- riotfile.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 70b98969a45..c003f61977e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools_scm[toml]>=4", "cython<3", "cmake>=3.24.2; python_version>='3.6'"] +requires = ["setuptools_scm[toml]>=4", "cython", "cmake>=3.24.2; python_version>='3.6'"] build-backend = "setuptools.build_meta" [project] diff --git a/riotfile.py b/riotfile.py index 43d028a2b09..ce46721327c 100644 --- a/riotfile.py +++ b/riotfile.py @@ -2348,7 +2348,7 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): }, venvs=[ Venv( - pkgs={"gevent": ["==23.7.0"]}, + pkgs={"gevent": ["==23.9.0"]}, ), ], ), diff --git a/setup.py b/setup.py index 6dacb968230..64719ebc175 100644 --- a/setup.py +++ b/setup.py @@ -582,7 +582,7 @@ def get_ddup_ext(): "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", ], - setup_requires=["setuptools_scm[toml]>=4", "cython<3", "cmake>=3.24.2; python_version>='3.6'"], + setup_requires=["setuptools_scm[toml]>=4", "cython", "cmake>=3.24.2; python_version>='3.6'"], ext_modules=ext_modules + cythonize( [ From ee2aea3e98965368cf4ef449496a22b32e4025c6 Mon Sep 17 00:00:00 2001 From: "Tahir H. Butt" Date: Fri, 8 Sep 2023 13:14:34 -0400 Subject: [PATCH 35/58] update cython --- .riot/requirements/{af2e1f3.txt => 8eb275c.txt} | 10 +++++----- ddtrace/profiling/exporter/pprof.pyx | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) rename .riot/requirements/{af2e1f3.txt => 8eb275c.txt} (78%) diff --git a/.riot/requirements/af2e1f3.txt b/.riot/requirements/8eb275c.txt similarity index 78% rename from .riot/requirements/af2e1f3.txt rename to .riot/requirements/8eb275c.txt index 21525966ba2..9cb79b3d6e9 100644 --- a/.riot/requirements/af2e1f3.txt +++ b/.riot/requirements/8eb275c.txt @@ -2,12 +2,12 @@ # This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --no-annotate .riot/requirements/af2e1f3.in +# pip-compile --no-annotate .riot/requirements/8eb275c.in # attrs==23.1.0 -coverage[toml]==7.3.0 -gevent==23.7.0 -greenlet==3.0.0a1 +coverage[toml]==7.3.1 +gevent==23.9.0 +greenlet==3.0.0rc1 gunicorn[gevent]==21.2.0 hypothesis==6.45.0 iniconfig==2.0.0 @@ -16,7 +16,7 @@ opentracing==2.4.0 packaging==23.1 pluggy==1.3.0 py-cpuinfo==8.0.0 -pytest==7.4.0 +pytest==7.4.2 pytest-asyncio==0.21.1 pytest-benchmark==4.0.0 pytest-cov==4.1.0 diff --git a/ddtrace/profiling/exporter/pprof.pyx b/ddtrace/profiling/exporter/pprof.pyx index 1f9468cf533..7336894b953 100644 --- a/ddtrace/profiling/exporter/pprof.pyx +++ b/ddtrace/profiling/exporter/pprof.pyx @@ -225,7 +225,7 @@ class _PprofConverter(object): self._locations[(filename, lineno, funcname)] = location return location - def _str(self, string: str) -> int: + def _str(self, string: typing.Optional[str]) -> int: """Convert a string to an id from the string table.""" return self._string_table.index(str(string)) From a9bd03c772d3df23f2a3d55acc4ee88e37627a95 Mon Sep 17 00:00:00 2001 From: "Tahir H. Butt" Date: Fri, 8 Sep 2023 14:53:45 -0400 Subject: [PATCH 36/58] Apply suggestions from code review Co-authored-by: Emmett Butler <723615+emmettbutler@users.noreply.github.com> --- ddtrace/__init__.py | 11 +---------- ddtrace/tracer.py | 3 --- hatch.toml | 2 +- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/ddtrace/__init__.py b/ddtrace/__init__.py index 2f96bed64d2..6e0f8490ae9 100644 --- a/ddtrace/__init__.py +++ b/ddtrace/__init__.py @@ -18,7 +18,7 @@ from ._logger import configure_ddtrace_logger -# configure ddtrace logger before other modules log indeed +# configure ddtrace logger before other modules log configure_ddtrace_logger() # noqa: E402 from ddtrace.internal import telemetry @@ -46,15 +46,6 @@ # a global tracer instance with integration settings tracer = Tracer() - -# The telemetry writer is not started until data is queued but this creates a -# problem for CPython 3.12 which disallows thread creation at interpreter -# finalization. In order to support 3.12, we start the writer upon initialization. -# See https://github.com/python/cpython/pull/104826. -if sys.version_info >= (3, 12): - telemetry.telemetry_writer.enable() - - __all__ = [ "patch", "patch_all", diff --git a/ddtrace/tracer.py b/ddtrace/tracer.py index 0ab57d85d45..c58b5ffe35f 100644 --- a/ddtrace/tracer.py +++ b/ddtrace/tracer.py @@ -77,9 +77,6 @@ from typing import TypeVar -# DELETEME: workaround to get circleci tests working - - log = get_logger(__name__) diff --git a/hatch.toml b/hatch.toml index 6c5bfe29536..eb9a6b2feb3 100644 --- a/hatch.toml +++ b/hatch.toml @@ -29,7 +29,7 @@ dependencies = [ "flake8-rst-docstrings", "flake8-isort", "pygments", - "riot==0.18.0", + "riot==0.19.0", ] [envs.lint.scripts] From da6b2f12be1611d5007c2872f08ac3e662fd72fd Mon Sep 17 00:00:00 2001 From: "Tahir H. Butt" Date: Wed, 13 Sep 2023 11:28:48 -0400 Subject: [PATCH 37/58] Update ddtrace/debugging/__init__.py --- ddtrace/debugging/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/ddtrace/debugging/__init__.py b/ddtrace/debugging/__init__.py index 4df2c40b899..343bfbb3b59 100644 --- a/ddtrace/debugging/__init__.py +++ b/ddtrace/debugging/__init__.py @@ -26,7 +26,6 @@ See the :ref:`Configuration` page for more details on how to configure Dynamic Instrumentation. - """ from ddtrace.debugging._debugger import Debugger as DynamicInstrumentation From a1fef7d05054480453855d233dc3ca618108e19a Mon Sep 17 00:00:00 2001 From: "Tahir H. Butt" Date: Wed, 13 Sep 2023 11:29:53 -0400 Subject: [PATCH 38/58] Delete .riot/requirements/releasenotes/notes/3.12_support-422a62d1871877c2.yaml --- .../notes/3.12_support-422a62d1871877c2.yaml | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 .riot/requirements/releasenotes/notes/3.12_support-422a62d1871877c2.yaml diff --git a/.riot/requirements/releasenotes/notes/3.12_support-422a62d1871877c2.yaml b/.riot/requirements/releasenotes/notes/3.12_support-422a62d1871877c2.yaml deleted file mode 100644 index 08f5205ade9..00000000000 --- a/.riot/requirements/releasenotes/notes/3.12_support-422a62d1871877c2.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -prelude: > - We added support for Python 3.12 but (add caveats) - -features: - - | - Adds support for Python 3.12 -issues: - - | - List known issues here, or remove this section. All of the list items in - this section are combined when the release notes are rendered, so the text - needs to be worded so that it does not depend on any information only - available in another section, such as the prelude. This may mean repeating - some details. From 69192f969d5c9799b23e7159d8a7d4fa9653d947 Mon Sep 17 00:00:00 2001 From: "Tahir H. Butt" Date: Wed, 13 Sep 2023 11:39:13 -0400 Subject: [PATCH 39/58] add release note --- releasenotes/notes/add-312-73857cf79c64c924.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 releasenotes/notes/add-312-73857cf79c64c924.yaml diff --git a/releasenotes/notes/add-312-73857cf79c64c924.yaml b/releasenotes/notes/add-312-73857cf79c64c924.yaml new file mode 100644 index 00000000000..85809820051 --- /dev/null +++ b/releasenotes/notes/add-312-73857cf79c64c924.yaml @@ -0,0 +1,15 @@ +--- +features: + - | + Adds support for Python 3.12. +issues: + - aiohttp: Python 3.12 is not supported. + - aiohttp-jinja: Python 3.12 is not supported. + - aiobotocore: Python 3.12 is not supported. + - flask-caching: Python 3.12 is not supported. + - opentelemetry-api: Python 3.12 is not supported. + - openai/langchain: Python 3.12 is not supported. + - opentracing: Python 3.12 is not supported. + - pynamodb: Python 3.12 is not supported. + - pyramid: Python 3.12 is not supported. + - redis/redis-py-cluster: Python 3.12 is not supported. From e4e0fef5c22848cea5b84570d9dc790426965524 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Wed, 13 Sep 2023 08:58:51 -0700 Subject: [PATCH 40/58] reno formatting --- .../notes/add-312-73857cf79c64c924.yaml | 32 ++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/releasenotes/notes/add-312-73857cf79c64c924.yaml b/releasenotes/notes/add-312-73857cf79c64c924.yaml index 85809820051..83d1609880f 100644 --- a/releasenotes/notes/add-312-73857cf79c64c924.yaml +++ b/releasenotes/notes/add-312-73857cf79c64c924.yaml @@ -1,15 +1,25 @@ --- features: - | - Adds support for Python 3.12. + Adds support for Python 3.12. issues: - - aiohttp: Python 3.12 is not supported. - - aiohttp-jinja: Python 3.12 is not supported. - - aiobotocore: Python 3.12 is not supported. - - flask-caching: Python 3.12 is not supported. - - opentelemetry-api: Python 3.12 is not supported. - - openai/langchain: Python 3.12 is not supported. - - opentracing: Python 3.12 is not supported. - - pynamodb: Python 3.12 is not supported. - - pyramid: Python 3.12 is not supported. - - redis/redis-py-cluster: Python 3.12 is not supported. + - | + aiohttp: Python 3.12 is not supported. + - | + aiohttp-jinja: Python 3.12 is not supported. + - | + aiobotocore: Python 3.12 is not supported. + - | + flask-caching: Python 3.12 is not supported. + - | + opentelemetry-api: Python 3.12 is not supported. + - | + openai/langchain: Python 3.12 is not supported. + - | + opentracing: Python 3.12 is not supported. + - | + pynamodb: Python 3.12 is not supported. + - | + pyramid: Python 3.12 is not supported. + - | + redis/redis-py-cluster: Python 3.12 is not supported. From 8774f18a1bfd455dfe1365f832f6f268585730c0 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Wed, 13 Sep 2023 09:14:04 -0700 Subject: [PATCH 41/58] spelling --- docs/spelling_wordlist.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/spelling_wordlist.txt b/docs/spelling_wordlist.txt index f58b42c461d..498ed5a3bec 100644 --- a/docs/spelling_wordlist.txt +++ b/docs/spelling_wordlist.txt @@ -151,6 +151,7 @@ NeedsAppKey obfuscator openai opensearch +opentelemetry opentracer opentracing otel From 21c6bb8a6cb370de924cff5eddbe19630673c2d6 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Wed, 13 Sep 2023 10:22:17 -0700 Subject: [PATCH 42/58] build 3.12 in injection image --- lib-injection/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/lib-injection/Dockerfile b/lib-injection/Dockerfile index 727896a3ba0..29347595845 100644 --- a/lib-injection/Dockerfile +++ b/lib-injection/Dockerfile @@ -10,6 +10,7 @@ ADD ./dl_wheels.py . # Note that we only get Python >= 3.7. This is to keep the size of the image # as small as possible. RUN python3 dl_wheels.py \ + --python-version=3.12 \ --python-version=3.11 \ --python-version=3.10 \ --python-version=3.9 \ From 6225e4a7147675eff07a39091eea17bab38705d9 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Wed, 13 Sep 2023 10:26:41 -0700 Subject: [PATCH 43/58] Revert "build 3.12 in injection image" This reverts commit 21c6bb8a6cb370de924cff5eddbe19630673c2d6. --- lib-injection/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/lib-injection/Dockerfile b/lib-injection/Dockerfile index 29347595845..727896a3ba0 100644 --- a/lib-injection/Dockerfile +++ b/lib-injection/Dockerfile @@ -10,7 +10,6 @@ ADD ./dl_wheels.py . # Note that we only get Python >= 3.7. This is to keep the size of the image # as small as possible. RUN python3 dl_wheels.py \ - --python-version=3.12 \ --python-version=3.11 \ --python-version=3.10 \ --python-version=3.9 \ From 4df8d7669ccd47e3408c8d4c1e6ed30bab8af422 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Wed, 13 Sep 2023 10:28:37 -0700 Subject: [PATCH 44/58] add 3.12 to supported pys --- lib-injection/Dockerfile | 1 + lib-injection/dl_wheels.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib-injection/Dockerfile b/lib-injection/Dockerfile index 727896a3ba0..29347595845 100644 --- a/lib-injection/Dockerfile +++ b/lib-injection/Dockerfile @@ -10,6 +10,7 @@ ADD ./dl_wheels.py . # Note that we only get Python >= 3.7. This is to keep the size of the image # as small as possible. RUN python3 dl_wheels.py \ + --python-version=3.12 \ --python-version=3.11 \ --python-version=3.10 \ --python-version=3.9 \ diff --git a/lib-injection/dl_wheels.py b/lib-injection/dl_wheels.py index 708e18381e6..8f679362416 100755 --- a/lib-injection/dl_wheels.py +++ b/lib-injection/dl_wheels.py @@ -39,7 +39,7 @@ ) -supported_pythons = ["2.7", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11"] +supported_pythons = ["2.7", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] supported_arches = ["aarch64", "x86_64", "i686"] supported_platforms = ["musllinux_1_1", "manylinux2014"] From f1cd2f8ccbd2c80c126246fb145938d11265dc1d Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Wed, 13 Sep 2023 10:30:16 -0700 Subject: [PATCH 45/58] Revert "add 3.12 to supported pys" This reverts commit 4df8d7669ccd47e3408c8d4c1e6ed30bab8af422. --- lib-injection/Dockerfile | 1 - lib-injection/dl_wheels.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lib-injection/Dockerfile b/lib-injection/Dockerfile index 29347595845..727896a3ba0 100644 --- a/lib-injection/Dockerfile +++ b/lib-injection/Dockerfile @@ -10,7 +10,6 @@ ADD ./dl_wheels.py . # Note that we only get Python >= 3.7. This is to keep the size of the image # as small as possible. RUN python3 dl_wheels.py \ - --python-version=3.12 \ --python-version=3.11 \ --python-version=3.10 \ --python-version=3.9 \ diff --git a/lib-injection/dl_wheels.py b/lib-injection/dl_wheels.py index 8f679362416..708e18381e6 100755 --- a/lib-injection/dl_wheels.py +++ b/lib-injection/dl_wheels.py @@ -39,7 +39,7 @@ ) -supported_pythons = ["2.7", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] +supported_pythons = ["2.7", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11"] supported_arches = ["aarch64", "x86_64", "i686"] supported_platforms = ["musllinux_1_1", "manylinux2014"] From 91ccf0e60ce572b3916c5cf74db20ad60e4fc7a4 Mon Sep 17 00:00:00 2001 From: ZStriker19 Date: Wed, 13 Sep 2023 15:42:01 -0400 Subject: [PATCH 46/58] add debugger and asm IAST not supported to rn --- releasenotes/notes/add-312-73857cf79c64c924.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/releasenotes/notes/add-312-73857cf79c64c924.yaml b/releasenotes/notes/add-312-73857cf79c64c924.yaml index 83d1609880f..33930ebcd00 100644 --- a/releasenotes/notes/add-312-73857cf79c64c924.yaml +++ b/releasenotes/notes/add-312-73857cf79c64c924.yaml @@ -23,3 +23,7 @@ issues: pyramid: Python 3.12 is not supported. - | redis/redis-py-cluster: Python 3.12 is not supported. + - | + debugger: Python 3.12 is not supported. + - | + asm: IAST for Python 3.12 is not supported. From 16ba7249b1ae7e6ebf5f4f7e03fb50df051412a4 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Wed, 13 Sep 2023 12:53:55 -0700 Subject: [PATCH 47/58] deny access through safeobjectproxy.__getattr__ --- ddtrace/internal/safety.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ddtrace/internal/safety.py b/ddtrace/internal/safety.py index 339bdc4f012..8632a89570f 100644 --- a/ddtrace/internal/safety.py +++ b/ddtrace/internal/safety.py @@ -73,6 +73,8 @@ def __getattribute__(self, name): def __getattr__(self, name): # type: (str) -> Any + if name == "__wrapped__": + raise AttributeError("Access denied") return type(self).safe(super(SafeObjectProxy, self).__getattr__(name)) def __getitem__(self, item): From db2e9a9e1ccdeb588e07d98ee1953c9192266710 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Wed, 13 Sep 2023 12:54:10 -0700 Subject: [PATCH 48/58] missed spots in pyproject --- pyproject.toml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index a3e36e71eb2..e8f4aa62f2a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ dynamic = ["version"] description = "Datadog APM client library" readme = "README.md" # license-files = { paths = ["LICENSE.BSD3"] } -requires-python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +requires-python = ">=3.7" authors = [ { name = "Datadog, Inc.", email = "dev@datadoghq.com" }, ] @@ -19,6 +19,7 @@ classifiers = [ "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", ] dependencies = [ "attrs>=20", @@ -28,12 +29,10 @@ dependencies = [ "ddsketch>=2.0.1", "envier", "importlib_metadata; python_version<'3.8'", - "ipaddress; python_version<'3.7'", "opentelemetry-api>=1", - "pathlib2; python_version<'3.5'", "psutil>=5.6.7", "protobuf>=3", - "setuptools; python_version>='3.12'", + "setuptools==68.2.2; python_version>='3.12'", "six>=1.12.0", "typing_extensions", "wrapt>=1.14.1", From 3d3d3a7330138a7b5eed73692e9ad85122a60c48 Mon Sep 17 00:00:00 2001 From: ZStriker19 Date: Wed, 13 Sep 2023 15:55:51 -0400 Subject: [PATCH 49/58] remove debugger not supported from release notes --- releasenotes/notes/add-312-73857cf79c64c924.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/releasenotes/notes/add-312-73857cf79c64c924.yaml b/releasenotes/notes/add-312-73857cf79c64c924.yaml index 33930ebcd00..b067b9fc01e 100644 --- a/releasenotes/notes/add-312-73857cf79c64c924.yaml +++ b/releasenotes/notes/add-312-73857cf79c64c924.yaml @@ -23,7 +23,5 @@ issues: pyramid: Python 3.12 is not supported. - | redis/redis-py-cluster: Python 3.12 is not supported. - - | - debugger: Python 3.12 is not supported. - | asm: IAST for Python 3.12 is not supported. From bc1eec51b16c27b6e22784c657648e38ba93b4b5 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Wed, 13 Sep 2023 13:12:10 -0700 Subject: [PATCH 50/58] fix wrapt dependency --- ddtrace/internal/safety.py | 2 -- pyproject.toml | 2 +- setup.py | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ddtrace/internal/safety.py b/ddtrace/internal/safety.py index 8632a89570f..339bdc4f012 100644 --- a/ddtrace/internal/safety.py +++ b/ddtrace/internal/safety.py @@ -73,8 +73,6 @@ def __getattribute__(self, name): def __getattr__(self, name): # type: (str) -> Any - if name == "__wrapped__": - raise AttributeError("Access denied") return type(self).safe(super(SafeObjectProxy, self).__getattr__(name)) def __getitem__(self, item): diff --git a/pyproject.toml b/pyproject.toml index e8f4aa62f2a..01bc43c08de 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,7 +35,7 @@ dependencies = [ "setuptools==68.2.2; python_version>='3.12'", "six>=1.12.0", "typing_extensions", - "wrapt>=1.14.1", + "wrapt~=1.14.1", "xmltodict>=0.12", ] diff --git a/setup.py b/setup.py index a3f9cb64068..83c46956e99 100644 --- a/setup.py +++ b/setup.py @@ -546,7 +546,7 @@ def get_ddup_ext(): "opentelemetry-api>=1", "psutil==5.6.7", "setuptools; python_version>='3.12'", - "wrapt==14.1.0", + "wrapt==1.14.1", ] + bytecode, extras_require={ From 128061d44958b26b69d6676e1956d56f41720319 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Wed, 13 Sep 2023 13:39:09 -0700 Subject: [PATCH 51/58] pyproject dependency adjustments --- .riot/requirements/9eaca27.txt | 28 +++++++++++++++++++ pyproject.toml | 4 +-- .../notes/add-312-73857cf79c64c924.yaml | 2 +- 3 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 .riot/requirements/9eaca27.txt diff --git a/.riot/requirements/9eaca27.txt b/.riot/requirements/9eaca27.txt new file mode 100644 index 00000000000..592783f0dfb --- /dev/null +++ b/.riot/requirements/9eaca27.txt @@ -0,0 +1,28 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/9eaca27.in +# +attrs==23.1.0 +coverage[toml]==7.3.1 +gevent==23.9.1 +greenlet==3.0.0rc3 +httpretty==1.1.4 +hypothesis==6.45.0 +iniconfig==2.0.0 +mock==5.1.0 +opentracing==2.4.0 +packaging==23.1 +pluggy==1.3.0 +pytest==7.4.2 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +six==1.16.0 +sortedcontainers==2.4.0 +zope-event==5.0 +zope-interface==6.0 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/pyproject.toml b/pyproject.toml index 01bc43c08de..403f8427bde 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,10 +29,10 @@ dependencies = [ "ddsketch>=2.0.1", "envier", "importlib_metadata; python_version<'3.8'", - "opentelemetry-api>=1", + "opentelemetry-api>=1; python_version>='3.7'", "psutil>=5.6.7", "protobuf>=3", - "setuptools==68.2.2; python_version>='3.12'", + "setuptools; python_version>='3.12'", "six>=1.12.0", "typing_extensions", "wrapt~=1.14.1", diff --git a/releasenotes/notes/add-312-73857cf79c64c924.yaml b/releasenotes/notes/add-312-73857cf79c64c924.yaml index b067b9fc01e..68e667b7b4a 100644 --- a/releasenotes/notes/add-312-73857cf79c64c924.yaml +++ b/releasenotes/notes/add-312-73857cf79c64c924.yaml @@ -24,4 +24,4 @@ issues: - | redis/redis-py-cluster: Python 3.12 is not supported. - | - asm: IAST for Python 3.12 is not supported. + ASM: IAST for Python 3.12 is not supported. From 8b4a1a846202a4ae797eccf5d89d2bc72f98fa68 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Wed, 13 Sep 2023 14:06:33 -0700 Subject: [PATCH 52/58] unrestrict otel dependency --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 403f8427bde..c4599daca6a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,13 +29,13 @@ dependencies = [ "ddsketch>=2.0.1", "envier", "importlib_metadata; python_version<'3.8'", - "opentelemetry-api>=1; python_version>='3.7'", + "opentelemetry-api>=1", "psutil>=5.6.7", "protobuf>=3", "setuptools; python_version>='3.12'", "six>=1.12.0", "typing_extensions", - "wrapt~=1.14.1", + "wrapt==1.14.1", "xmltodict>=0.12", ] From 3c406d218526e4c50fc02e3450a31ec783aa9493 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Wed, 13 Sep 2023 14:38:21 -0700 Subject: [PATCH 53/58] ??? --- pyproject.toml | 6 +++--- setup.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index c4599daca6a..37985ab0bf2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools_scm[toml]>=4", "cython", "cmake>=3.24.2; python_version>='3.6'"] +requires = ["setuptools_scm[toml]>=4", "cython", "cmake>=3.24.2; python_version>='3.7'"] build-backend = "setuptools.build_meta" [project] @@ -30,12 +30,12 @@ dependencies = [ "envier", "importlib_metadata; python_version<'3.8'", "opentelemetry-api>=1", - "psutil>=5.6.7", + "psutil~=5.6.7", "protobuf>=3", "setuptools; python_version>='3.12'", "six>=1.12.0", "typing_extensions", - "wrapt==1.14.1", + "wrapt>=1.14.1", "xmltodict>=0.12", ] diff --git a/setup.py b/setup.py index 83c46956e99..3f2669280f2 100644 --- a/setup.py +++ b/setup.py @@ -544,7 +544,7 @@ def get_ddup_ext(): "xmltodict>=0.12", "envier", "opentelemetry-api>=1", - "psutil==5.6.7", + "psutil~=5.6.7", "setuptools; python_version>='3.12'", "wrapt==1.14.1", ] From b747cb5deed3bd353214fe67ea16c06afdb2c753 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Wed, 13 Sep 2023 14:49:39 -0700 Subject: [PATCH 54/58] ??? --- pyproject.toml | 4 ++-- setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 37985ab0bf2..9d86abd3b86 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,12 +30,12 @@ dependencies = [ "envier", "importlib_metadata; python_version<'3.8'", "opentelemetry-api>=1", - "psutil~=5.6.7", + "psutil==5.6.7", "protobuf>=3", "setuptools; python_version>='3.12'", "six>=1.12.0", "typing_extensions", - "wrapt>=1.14.1", + "wrapt==1.14.1", "xmltodict>=0.12", ] diff --git a/setup.py b/setup.py index 3f2669280f2..83c46956e99 100644 --- a/setup.py +++ b/setup.py @@ -544,7 +544,7 @@ def get_ddup_ext(): "xmltodict>=0.12", "envier", "opentelemetry-api>=1", - "psutil~=5.6.7", + "psutil==5.6.7", "setuptools; python_version>='3.12'", "wrapt==1.14.1", ] From 30672204a345dd4f499c2a88217b34585a74db95 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Wed, 13 Sep 2023 17:47:49 -0700 Subject: [PATCH 55/58] make safeobjectproxy work with latest wrapt on py312 --- ddtrace/internal/safety.py | 5 ++++- pyproject.toml | 2 +- setup.py | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ddtrace/internal/safety.py b/ddtrace/internal/safety.py index 339bdc4f012..262845c905b 100644 --- a/ddtrace/internal/safety.py +++ b/ddtrace/internal/safety.py @@ -11,6 +11,7 @@ from ddtrace.internal.compat import BUILTIN from ddtrace.internal.compat import PY3 +from ddtrace.internal.compat import PYTHON_VERSION_INFO from ddtrace.internal.utils.attrdict import AttrDict from ddtrace.internal.utils.cache import cached @@ -66,13 +67,15 @@ def __call__(self, *args, **kwargs): def __getattribute__(self, name): # type: (str) -> Any - if name == "__wrapped__": + if PYTHON_VERSION_INFO[0:2] < (3, 12) and name == "__wrapped__": raise AttributeError("Access denied") return super(SafeObjectProxy, self).__getattribute__(name) def __getattr__(self, name): # type: (str) -> Any + if PYTHON_VERSION_INFO[0:2] >= (3, 12) and name == "__wrapped__": + raise AttributeError("Access denied") return type(self).safe(super(SafeObjectProxy, self).__getattr__(name)) def __getitem__(self, item): diff --git a/pyproject.toml b/pyproject.toml index 9d86abd3b86..c5db5085367 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,7 +35,7 @@ dependencies = [ "setuptools; python_version>='3.12'", "six>=1.12.0", "typing_extensions", - "wrapt==1.14.1", + "wrapt==1.15.0", "xmltodict>=0.12", ] diff --git a/setup.py b/setup.py index 83c46956e99..3b8d2ca9061 100644 --- a/setup.py +++ b/setup.py @@ -546,7 +546,7 @@ def get_ddup_ext(): "opentelemetry-api>=1", "psutil==5.6.7", "setuptools; python_version>='3.12'", - "wrapt==1.14.1", + "wrapt==1.15.0", ] + bytecode, extras_require={ From 3874a0ab0cdc6caea6ffafd0eaa3a62505c3e2d9 Mon Sep 17 00:00:00 2001 From: Emmett Butler <723615+emmettbutler@users.noreply.github.com> Date: Thu, 14 Sep 2023 05:35:13 -0700 Subject: [PATCH 56/58] Update ddtrace/internal/safety.py Co-authored-by: Gabriele N. Tornetta --- ddtrace/internal/safety.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ddtrace/internal/safety.py b/ddtrace/internal/safety.py index 262845c905b..9a566fbded1 100644 --- a/ddtrace/internal/safety.py +++ b/ddtrace/internal/safety.py @@ -67,7 +67,7 @@ def __call__(self, *args, **kwargs): def __getattribute__(self, name): # type: (str) -> Any - if PYTHON_VERSION_INFO[0:2] < (3, 12) and name == "__wrapped__": + if PYTHON_VERSION_INFO < (3, 12) and name == "__wrapped__": raise AttributeError("Access denied") return super(SafeObjectProxy, self).__getattribute__(name) From 6804908f36c36813d84ae6777d6638563b2a1865 Mon Sep 17 00:00:00 2001 From: Emmett Butler <723615+emmettbutler@users.noreply.github.com> Date: Thu, 14 Sep 2023 05:35:35 -0700 Subject: [PATCH 57/58] Update setup.py Co-authored-by: Gabriele N. Tornetta --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 3b8d2ca9061..e1b40e6c999 100644 --- a/setup.py +++ b/setup.py @@ -584,7 +584,7 @@ def get_ddup_ext(): "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", ], - setup_requires=["setuptools_scm[toml]>=4", "cython", "cmake>=3.24.2; python_version>='3.6'"], + setup_requires=["setuptools_scm[toml]>=4", "cython", "cmake>=3.24.2"], ext_modules=ext_modules + cythonize( [ From 411eb74a60b278a363e205a3545b158d8118aa0f Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Thu, 14 Sep 2023 06:26:09 -0700 Subject: [PATCH 58/58] deduplicate --- ddtrace/internal/safety.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ddtrace/internal/safety.py b/ddtrace/internal/safety.py index 9a566fbded1..3371d99d803 100644 --- a/ddtrace/internal/safety.py +++ b/ddtrace/internal/safety.py @@ -52,6 +52,9 @@ def _isinstance(obj, types): return issubclass(type(obj), types) +IS_312_OR_NEWER = PYTHON_VERSION_INFO >= (3, 12) + + class SafeObjectProxy(wrapt.ObjectProxy): """Object proxy to make sure we don't call unsafe code. @@ -67,14 +70,14 @@ def __call__(self, *args, **kwargs): def __getattribute__(self, name): # type: (str) -> Any - if PYTHON_VERSION_INFO < (3, 12) and name == "__wrapped__": + if name == "__wrapped__" and not IS_312_OR_NEWER: raise AttributeError("Access denied") return super(SafeObjectProxy, self).__getattribute__(name) def __getattr__(self, name): # type: (str) -> Any - if PYTHON_VERSION_INFO[0:2] >= (3, 12) and name == "__wrapped__": + if name == "__wrapped__" and IS_312_OR_NEWER: raise AttributeError("Access denied") return type(self).safe(super(SafeObjectProxy, self).__getattr__(name))