diff --git a/.riot/requirements/5a39ac7.txt b/.riot/requirements/11063bf.txt similarity index 98% rename from .riot/requirements/5a39ac7.txt rename to .riot/requirements/11063bf.txt index 97044200ddc..8a0cf11614c 100644 --- a/.riot/requirements/5a39ac7.txt +++ b/.riot/requirements/11063bf.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --allow-unsafe --no-annotate .riot/requirements/5a39ac7.in +# pip-compile --allow-unsafe --no-annotate .riot/requirements/11063bf.in # ai21==2.9.2 ai21-tokenizer==0.11.2 @@ -65,7 +65,7 @@ psutil==6.0.0 pydantic==2.8.2 pydantic-core==2.20.1 pytest==8.3.2 -pytest-asyncio==0.21.1 +pytest-asyncio==0.23.7 pytest-cov==5.0.0 pytest-mock==3.14.0 pytest-randomly==3.10.1 diff --git a/.riot/requirements/3e5f5f5.txt b/.riot/requirements/16c3b9f.txt similarity index 97% rename from .riot/requirements/3e5f5f5.txt rename to .riot/requirements/16c3b9f.txt index e7fa8a5994b..57391598401 100644 --- a/.riot/requirements/3e5f5f5.txt +++ b/.riot/requirements/16c3b9f.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.10 # by the following command: # -# pip-compile --allow-unsafe --no-annotate .riot/requirements/3e5f5f5.in +# pip-compile --allow-unsafe --no-annotate .riot/requirements/16c3b9f.in # ai21==1.3.4 aiohttp==3.9.5 @@ -51,7 +51,7 @@ pluggy==1.5.0 psutil==6.0.0 pydantic==1.10.17 pytest==8.3.2 -pytest-asyncio==0.21.1 +pytest-asyncio==0.23.7 pytest-cov==5.0.0 pytest-mock==3.14.0 pytest-randomly==3.10.1 diff --git a/.riot/requirements/12a61a5.txt b/.riot/requirements/1761cfc.txt similarity index 98% rename from .riot/requirements/12a61a5.txt rename to .riot/requirements/1761cfc.txt index bd49677e10f..ff5fab8758f 100644 --- a/.riot/requirements/12a61a5.txt +++ b/.riot/requirements/1761cfc.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.10 # by the following command: # -# pip-compile --allow-unsafe --no-annotate .riot/requirements/12a61a5.in +# pip-compile --allow-unsafe --no-annotate .riot/requirements/1761cfc.in # ai21==2.9.2 ai21-tokenizer==0.11.2 @@ -67,7 +67,7 @@ psutil==6.0.0 pydantic==2.8.2 pydantic-core==2.20.1 pytest==8.3.2 -pytest-asyncio==0.21.1 +pytest-asyncio==0.23.7 pytest-cov==5.0.0 pytest-mock==3.14.0 pytest-randomly==3.10.1 diff --git a/.riot/requirements/1255f51.txt b/.riot/requirements/18bc2ac.txt similarity index 98% rename from .riot/requirements/1255f51.txt rename to .riot/requirements/18bc2ac.txt index de946046df2..6648e9e82ae 100644 --- a/.riot/requirements/1255f51.txt +++ b/.riot/requirements/18bc2ac.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --allow-unsafe --no-annotate .riot/requirements/1255f51.in +# pip-compile --allow-unsafe --no-annotate .riot/requirements/18bc2ac.in # ai21==2.9.2 ai21-tokenizer==0.11.2 @@ -70,7 +70,7 @@ psutil==6.0.0 pydantic==2.8.2 pydantic-core==2.20.1 pytest==8.3.2 -pytest-asyncio==0.21.1 +pytest-asyncio==0.23.7 pytest-cov==5.0.0 pytest-mock==3.14.0 pytest-randomly==3.10.1 diff --git a/.riot/requirements/b6cede4.txt b/.riot/requirements/19f2225.txt similarity index 98% rename from .riot/requirements/b6cede4.txt rename to .riot/requirements/19f2225.txt index bddfa431d29..4380e3beb52 100644 --- a/.riot/requirements/b6cede4.txt +++ b/.riot/requirements/19f2225.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.10 # by the following command: # -# pip-compile --allow-unsafe --no-annotate .riot/requirements/b6cede4.in +# pip-compile --allow-unsafe --no-annotate .riot/requirements/19f2225.in # ai21==2.9.2 ai21-tokenizer==0.11.2 @@ -66,7 +66,7 @@ psutil==6.0.0 pydantic==2.8.2 pydantic-core==2.20.1 pytest==8.3.2 -pytest-asyncio==0.21.1 +pytest-asyncio==0.23.7 pytest-cov==5.0.0 pytest-mock==3.14.0 pytest-randomly==3.10.1 diff --git a/.riot/requirements/5c99f2c.txt b/.riot/requirements/1ec1dbf.txt similarity index 98% rename from .riot/requirements/5c99f2c.txt rename to .riot/requirements/1ec1dbf.txt index e75b5ea661f..1914c06f534 100644 --- a/.riot/requirements/5c99f2c.txt +++ b/.riot/requirements/1ec1dbf.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.10 # by the following command: # -# pip-compile --allow-unsafe --no-annotate .riot/requirements/5c99f2c.in +# pip-compile --allow-unsafe --no-annotate .riot/requirements/1ec1dbf.in # ai21==2.9.2 ai21-tokenizer==0.11.2 @@ -71,7 +71,7 @@ psutil==6.0.0 pydantic==2.8.2 pydantic-core==2.20.1 pytest==8.3.2 -pytest-asyncio==0.21.1 +pytest-asyncio==0.23.7 pytest-cov==5.0.0 pytest-mock==3.14.0 pytest-randomly==3.10.1 diff --git a/.riot/requirements/9a8a8ab.txt b/.riot/requirements/457db9b.txt similarity index 98% rename from .riot/requirements/9a8a8ab.txt rename to .riot/requirements/457db9b.txt index e97628194b7..667d1170972 100644 --- a/.riot/requirements/9a8a8ab.txt +++ b/.riot/requirements/457db9b.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --allow-unsafe --no-annotate .riot/requirements/9a8a8ab.in +# pip-compile --allow-unsafe --no-annotate .riot/requirements/457db9b.in # ai21==2.9.2 ai21-tokenizer==0.11.2 @@ -66,7 +66,7 @@ psutil==6.0.0 pydantic==2.8.2 pydantic-core==2.20.1 pytest==8.3.2 -pytest-asyncio==0.21.1 +pytest-asyncio==0.23.7 pytest-cov==5.0.0 pytest-mock==3.14.0 pytest-randomly==3.10.1 diff --git a/.riot/requirements/14dfb71.txt b/.riot/requirements/55a4977.txt similarity index 98% rename from .riot/requirements/14dfb71.txt rename to .riot/requirements/55a4977.txt index 8e0659000c9..f000ca937a2 100644 --- a/.riot/requirements/14dfb71.txt +++ b/.riot/requirements/55a4977.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --allow-unsafe --no-annotate .riot/requirements/14dfb71.in +# pip-compile --allow-unsafe --no-annotate .riot/requirements/55a4977.in # ai21==2.9.2 ai21-tokenizer==0.11.2 @@ -66,7 +66,7 @@ psutil==6.0.0 pydantic==2.8.2 pydantic-core==2.20.1 pytest==8.3.2 -pytest-asyncio==0.21.1 +pytest-asyncio==0.23.7 pytest-cov==5.0.0 pytest-mock==3.14.0 pytest-randomly==3.10.1 diff --git a/.riot/requirements/1054292.txt b/.riot/requirements/585e779.txt similarity index 97% rename from .riot/requirements/1054292.txt rename to .riot/requirements/585e779.txt index bae2d06eb46..c5cf7b77ac5 100644 --- a/.riot/requirements/1054292.txt +++ b/.riot/requirements/585e779.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --allow-unsafe --no-annotate .riot/requirements/1054292.in +# pip-compile --allow-unsafe --no-annotate .riot/requirements/585e779.in # ai21==1.3.4 aiohttp==3.9.5 @@ -50,7 +50,7 @@ pluggy==1.5.0 psutil==6.0.0 pydantic==1.10.17 pytest==8.3.2 -pytest-asyncio==0.21.1 +pytest-asyncio==0.23.7 pytest-cov==5.0.0 pytest-mock==3.14.0 pytest-randomly==3.10.1 diff --git a/.riot/requirements/a664972.txt b/.riot/requirements/a311bc2.txt similarity index 98% rename from .riot/requirements/a664972.txt rename to .riot/requirements/a311bc2.txt index b369cbe3530..d395ab2e7e5 100644 --- a/.riot/requirements/a664972.txt +++ b/.riot/requirements/a311bc2.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.9 # by the following command: # -# pip-compile --allow-unsafe --no-annotate .riot/requirements/a664972.in +# pip-compile --allow-unsafe --no-annotate .riot/requirements/a311bc2.in # ai21==2.9.2 ai21-tokenizer==0.11.2 @@ -72,7 +72,7 @@ psutil==6.0.0 pydantic==2.8.2 pydantic-core==2.20.1 pytest==8.3.2 -pytest-asyncio==0.21.1 +pytest-asyncio==0.23.7 pytest-cov==5.0.0 pytest-mock==3.14.0 pytest-randomly==3.10.1 diff --git a/.riot/requirements/1a1bd67.txt b/.riot/requirements/aa1fe5c.txt similarity index 98% rename from .riot/requirements/1a1bd67.txt rename to .riot/requirements/aa1fe5c.txt index 88d2783ecbc..eab61619140 100644 --- a/.riot/requirements/1a1bd67.txt +++ b/.riot/requirements/aa1fe5c.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.9 # by the following command: # -# pip-compile --allow-unsafe --no-annotate .riot/requirements/1a1bd67.in +# pip-compile --allow-unsafe --no-annotate .riot/requirements/aa1fe5c.in # ai21==2.9.2 ai21-tokenizer==0.11.2 @@ -68,7 +68,7 @@ psutil==6.0.0 pydantic==2.8.2 pydantic-core==2.20.1 pytest==8.3.2 -pytest-asyncio==0.21.1 +pytest-asyncio==0.23.7 pytest-cov==5.0.0 pytest-mock==3.14.0 pytest-randomly==3.10.1 diff --git a/.riot/requirements/1a80f74.txt b/.riot/requirements/cbbb0eb.txt similarity index 98% rename from .riot/requirements/1a80f74.txt rename to .riot/requirements/cbbb0eb.txt index 2b348f1d2cc..e0c9efcaa61 100644 --- a/.riot/requirements/1a80f74.txt +++ b/.riot/requirements/cbbb0eb.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --allow-unsafe --no-annotate .riot/requirements/1a80f74.in +# pip-compile --allow-unsafe --no-annotate .riot/requirements/cbbb0eb.in # ai21==2.9.2 ai21-tokenizer==0.11.2 @@ -70,7 +70,7 @@ psutil==6.0.0 pydantic==2.8.2 pydantic-core==2.20.1 pytest==8.3.2 -pytest-asyncio==0.21.1 +pytest-asyncio==0.23.7 pytest-cov==5.0.0 pytest-mock==3.14.0 pytest-randomly==3.10.1 diff --git a/.riot/requirements/1f75436.txt b/.riot/requirements/cf9bdda.txt similarity index 98% rename from .riot/requirements/1f75436.txt rename to .riot/requirements/cf9bdda.txt index 217262f0e3f..bc04af9682a 100644 --- a/.riot/requirements/1f75436.txt +++ b/.riot/requirements/cf9bdda.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.9 # by the following command: # -# pip-compile --allow-unsafe --no-annotate .riot/requirements/1f75436.in +# pip-compile --allow-unsafe --no-annotate .riot/requirements/cf9bdda.in # ai21==2.9.2 ai21-tokenizer==0.11.2 @@ -67,7 +67,7 @@ psutil==6.0.0 pydantic==2.8.2 pydantic-core==2.20.1 pytest==8.3.2 -pytest-asyncio==0.21.1 +pytest-asyncio==0.23.7 pytest-cov==5.0.0 pytest-mock==3.14.0 pytest-randomly==3.10.1 diff --git a/.riot/requirements/1495066.txt b/.riot/requirements/d39d3de.txt similarity index 97% rename from .riot/requirements/1495066.txt rename to .riot/requirements/d39d3de.txt index de46aa116c0..c7dd3749fae 100644 --- a/.riot/requirements/1495066.txt +++ b/.riot/requirements/d39d3de.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.9 # by the following command: # -# pip-compile --allow-unsafe --no-annotate .riot/requirements/1495066.in +# pip-compile --allow-unsafe --no-annotate .riot/requirements/d39d3de.in # ai21==1.3.4 aiohttp==3.9.5 @@ -51,7 +51,7 @@ pluggy==1.5.0 psutil==6.0.0 pydantic==1.10.17 pytest==8.3.2 -pytest-asyncio==0.21.1 +pytest-asyncio==0.23.7 pytest-cov==5.0.0 pytest-mock==3.14.0 pytest-randomly==3.10.1 diff --git a/riotfile.py b/riotfile.py index ef80ada7fa7..594f6487ce7 100644 --- a/riotfile.py +++ b/riotfile.py @@ -2562,9 +2562,8 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): Venv( name="langchain", command="pytest -v {cmdargs} tests/contrib/langchain", - # FIXME[python-3.12]: blocked on aiohttp release https://github.com/aio-libs/aiohttp/issues/7229 pkgs={ - "pytest-asyncio": "==0.21.1", + "pytest-asyncio": "==0.23.7", "tiktoken": latest, "huggingface-hub": latest, "ai21": latest, diff --git a/tests/contrib/langchain/test_langchain_llmobs.py b/tests/contrib/langchain/test_langchain_llmobs.py index 428da8e8115..ca8ea3d33e2 100644 --- a/tests/contrib/langchain/test_langchain_llmobs.py +++ b/tests/contrib/langchain/test_langchain_llmobs.py @@ -20,7 +20,7 @@ LANGCHAIN_VERSION = parse_version(langchain_.__version__) -PY39 = sys.version_info <= (3, 9) +PY39 = sys.version_info < (3, 10) if LANGCHAIN_VERSION < (0, 1, 0): from langchain.schema import AIMessage