From 5081873ccbe42fe972f0f1053498bdf115fd685f Mon Sep 17 00:00:00 2001 From: Yun Kim Date: Thu, 23 Jan 2025 18:13:49 -0500 Subject: [PATCH] Fix incompatible 3.7 riot venvs --- .riot/requirements/179818d.txt | 52 -------------------------------- .riot/requirements/18213af.txt | 47 +++++++++++++++++++++++++++++ .riot/requirements/1825740.txt | 49 ++++++++++++++++++++++++++++++ .riot/requirements/18d588e.txt | 50 ------------------------------- .riot/requirements/3db7151.txt | 54 ---------------------------------- .riot/requirements/900aca5.txt | 54 ---------------------------------- riotfile.py | 9 +++++- 7 files changed, 104 insertions(+), 211 deletions(-) delete mode 100644 .riot/requirements/179818d.txt create mode 100644 .riot/requirements/18213af.txt create mode 100644 .riot/requirements/1825740.txt delete mode 100644 .riot/requirements/18d588e.txt delete mode 100644 .riot/requirements/3db7151.txt delete mode 100644 .riot/requirements/900aca5.txt diff --git a/.riot/requirements/179818d.txt b/.riot/requirements/179818d.txt deleted file mode 100644 index bc6cd83028d..00000000000 --- a/.riot/requirements/179818d.txt +++ /dev/null @@ -1,52 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.10 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/179818d.in -# -annotated-types==0.7.0 -anyio==3.7.1 -attrs==24.3.0 -certifi==2024.12.14 -coverage[toml]==7.6.10 -distro==1.9.0 -exceptiongroup==1.2.2 -h11==0.14.0 -httpcore==1.0.7 -httpx==0.27.2 -hypothesis==6.45.0 -idna==3.10 -iniconfig==2.0.0 -mock==5.1.0 -multidict==6.1.0 -numpy==2.2.2 -openai[datalib,embeddings]==1.1.1 -opentracing==2.4.0 -packaging==24.2 -pandas==2.2.3 -pandas-stubs==2.2.3.241126 -pillow==9.5.0 -pluggy==1.5.0 -propcache==0.2.1 -pydantic==2.10.5 -pydantic-core==2.27.2 -pytest==8.3.4 -pytest-asyncio==0.21.1 -pytest-cov==6.0.0 -pytest-mock==3.14.0 -pytest-randomly==3.16.0 -python-dateutil==2.9.0.post0 -pytz==2024.2 -pyyaml==6.0.2 -six==1.17.0 -sniffio==1.3.1 -sortedcontainers==2.4.0 -tomli==2.2.1 -tqdm==4.67.1 -types-pytz==2024.2.0.20241221 -typing-extensions==4.12.2 -tzdata==2025.1 -urllib3==1.26.20 -vcrpy==4.2.1 -wrapt==1.17.2 -yarl==1.18.3 diff --git a/.riot/requirements/18213af.txt b/.riot/requirements/18213af.txt new file mode 100644 index 00000000000..14ffa58351f --- /dev/null +++ b/.riot/requirements/18213af.txt @@ -0,0 +1,47 @@ +# +# This file is autogenerated by pip-compile with Python 3.7 +# by the following command: +# +# pip-compile --allow-unsafe --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/18213af.in +# +annotated-types==0.5.0 +anyio==3.7.1 +attrs==24.2.0 +cached-property==1.5.2 +certifi==2024.12.14 +coverage[toml]==7.2.7 +distro==1.9.0 +exceptiongroup==1.2.2 +h11==0.14.0 +httpcore==0.17.3 +httpx==0.24.1 +hypothesis==6.45.0 +idna==3.10 +importlib-metadata==6.7.0 +iniconfig==2.0.0 +mock==5.1.0 +multidict==6.0.5 +openai==1.30.1 +opentracing==2.4.0 +packaging==24.0 +pillow==9.5.0 +pluggy==1.2.0 +pydantic==2.5.3 +pydantic-core==2.14.6 +pytest==7.4.4 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +pytest-randomly==3.12.0 +pyyaml==6.0.1 +six==1.17.0 +sniffio==1.3.1 +sortedcontainers==2.4.0 +tomli==2.0.1 +tqdm==4.67.1 +typing-extensions==4.7.1 +urllib3==1.26.20 +vcrpy==4.2.1 +wrapt==1.16.0 +yarl==1.9.4 +zipp==3.15.0 diff --git a/.riot/requirements/1825740.txt b/.riot/requirements/1825740.txt new file mode 100644 index 00000000000..d1ef7a92bc0 --- /dev/null +++ b/.riot/requirements/1825740.txt @@ -0,0 +1,49 @@ +# +# This file is autogenerated by pip-compile with Python 3.7 +# by the following command: +# +# pip-compile --allow-unsafe --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/1825740.in +# +aiohttp==3.8.6 +aiosignal==1.3.1 +async-timeout==4.0.3 +asynctest==0.13.0 +attrs==24.2.0 +certifi==2024.12.14 +charset-normalizer==3.4.1 +coverage[toml]==7.2.7 +exceptiongroup==1.2.2 +frozenlist==1.3.3 +hypothesis==6.45.0 +idna==3.10 +importlib-metadata==6.7.0 +iniconfig==2.0.0 +joblib==1.3.2 +mock==5.1.0 +multidict==6.0.5 +numpy==1.21.6 +openai==0.26.5 +opentracing==2.4.0 +packaging==24.0 +pillow==9.5.0 +pluggy==1.2.0 +pytest==7.4.4 +pytest-asyncio==0.21.1 +pytest-cov==4.1.0 +pytest-mock==3.11.1 +pytest-randomly==3.12.0 +pyyaml==6.0.1 +requests==2.31.0 +scikit-learn==1.0.2 +scipy==1.7.3 +six==1.17.0 +sortedcontainers==2.4.0 +threadpoolctl==3.1.0 +tomli==2.0.1 +tqdm==4.67.1 +typing-extensions==4.7.1 +urllib3==1.26.20 +vcrpy==4.2.1 +wrapt==1.16.0 +yarl==1.9.4 +zipp==3.15.0 diff --git a/.riot/requirements/18d588e.txt b/.riot/requirements/18d588e.txt deleted file mode 100644 index 82bcdf7626f..00000000000 --- a/.riot/requirements/18d588e.txt +++ /dev/null @@ -1,50 +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/18d588e.in -# -annotated-types==0.7.0 -anyio==3.7.1 -attrs==24.3.0 -certifi==2024.12.14 -coverage[toml]==7.6.10 -distro==1.9.0 -h11==0.14.0 -httpcore==1.0.7 -httpx==0.27.2 -hypothesis==6.45.0 -idna==3.10 -iniconfig==2.0.0 -mock==5.1.0 -multidict==6.1.0 -numpy==2.2.2 -openai[datalib,embeddings]==1.1.1 -opentracing==2.4.0 -packaging==24.2 -pandas==2.2.3 -pandas-stubs==2.2.3.241126 -pillow==9.5.0 -pluggy==1.5.0 -propcache==0.2.1 -pydantic==2.10.5 -pydantic-core==2.27.2 -pytest==8.3.4 -pytest-asyncio==0.21.1 -pytest-cov==6.0.0 -pytest-mock==3.14.0 -pytest-randomly==3.16.0 -python-dateutil==2.9.0.post0 -pytz==2024.2 -pyyaml==6.0.2 -six==1.17.0 -sniffio==1.3.1 -sortedcontainers==2.4.0 -tqdm==4.67.1 -types-pytz==2024.2.0.20241221 -typing-extensions==4.12.2 -tzdata==2025.1 -urllib3==1.26.20 -vcrpy==4.2.1 -wrapt==1.17.2 -yarl==1.18.3 diff --git a/.riot/requirements/3db7151.txt b/.riot/requirements/3db7151.txt deleted file mode 100644 index dcd3b85a214..00000000000 --- a/.riot/requirements/3db7151.txt +++ /dev/null @@ -1,54 +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/3db7151.in -# -annotated-types==0.7.0 -anyio==3.7.1 -attrs==24.3.0 -certifi==2024.12.14 -coverage[toml]==7.6.10 -distro==1.9.0 -exceptiongroup==1.2.2 -h11==0.14.0 -httpcore==1.0.7 -httpx==0.27.2 -hypothesis==6.45.0 -idna==3.10 -importlib-metadata==8.6.1 -iniconfig==2.0.0 -mock==5.1.0 -multidict==6.1.0 -numpy==2.0.2 -openai[datalib,embeddings]==1.1.1 -opentracing==2.4.0 -packaging==24.2 -pandas==2.2.3 -pandas-stubs==2.2.2.240807 -pillow==9.5.0 -pluggy==1.5.0 -propcache==0.2.1 -pydantic==2.10.5 -pydantic-core==2.27.2 -pytest==8.3.4 -pytest-asyncio==0.21.1 -pytest-cov==6.0.0 -pytest-mock==3.14.0 -pytest-randomly==3.16.0 -python-dateutil==2.9.0.post0 -pytz==2024.2 -pyyaml==6.0.2 -six==1.17.0 -sniffio==1.3.1 -sortedcontainers==2.4.0 -tomli==2.2.1 -tqdm==4.67.1 -types-pytz==2024.2.0.20241221 -typing-extensions==4.12.2 -tzdata==2025.1 -urllib3==1.26.20 -vcrpy==4.2.1 -wrapt==1.17.2 -yarl==1.18.3 -zipp==3.21.0 diff --git a/.riot/requirements/900aca5.txt b/.riot/requirements/900aca5.txt deleted file mode 100644 index 5aed01fdb62..00000000000 --- a/.riot/requirements/900aca5.txt +++ /dev/null @@ -1,54 +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/900aca5.in -# -annotated-types==0.7.0 -anyio==3.7.1 -attrs==24.3.0 -certifi==2024.12.14 -coverage[toml]==7.6.1 -distro==1.9.0 -exceptiongroup==1.2.2 -h11==0.14.0 -httpcore==1.0.7 -httpx==0.27.2 -hypothesis==6.45.0 -idna==3.10 -importlib-metadata==8.5.0 -iniconfig==2.0.0 -mock==5.1.0 -multidict==6.1.0 -numpy==1.24.4 -openai[datalib,embeddings]==1.1.1 -opentracing==2.4.0 -packaging==24.2 -pandas==2.0.3 -pandas-stubs==2.0.3.230814 -pillow==9.5.0 -pluggy==1.5.0 -propcache==0.2.0 -pydantic==2.10.5 -pydantic-core==2.27.2 -pytest==8.3.4 -pytest-asyncio==0.21.1 -pytest-cov==5.0.0 -pytest-mock==3.14.0 -pytest-randomly==3.15.0 -python-dateutil==2.9.0.post0 -pytz==2024.2 -pyyaml==6.0.2 -six==1.17.0 -sniffio==1.3.1 -sortedcontainers==2.4.0 -tomli==2.2.1 -tqdm==4.67.1 -types-pytz==2024.2.0.20241221 -typing-extensions==4.12.2 -tzdata==2025.1 -urllib3==1.26.20 -vcrpy==4.2.1 -wrapt==1.17.2 -yarl==1.15.2 -zipp==3.20.2 diff --git a/riotfile.py b/riotfile.py index 2ca173ebe48..98912b1c38d 100644 --- a/riotfile.py +++ b/riotfile.py @@ -2504,7 +2504,14 @@ def select_pys(min_version: str = MIN_PYTHON_VERSION, max_version: str = MAX_PYT }, ), Venv( - pys=select_pys(min_version="3.7", max_version="3.11"), + pys="3.7", + pkgs={ + "openai": "==1.30.1", + "pillow": "==9.5.0", + }, + ), + Venv( + pys=select_pys(min_version="3.8", max_version="3.11"), pkgs={ "openai[embeddings,datalib]": "==1.30.1", "pillow": "==9.5.0",