diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 2f82d65906..28b842258a 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -21,7 +21,3 @@ elasticsearch<7.14.0 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected - -# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos. -# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810 -tox<4.0.0 diff --git a/requirements/local.txt b/requirements/local.txt index 4e03c6e1c6..717fc25a0b 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -6,10 +6,6 @@ # accessible-pygments==0.0.4 # via pydata-sphinx-theme -aiohttp==3.8.6 - # via openai -aiosignal==1.3.1 - # via aiohttp alabaster==0.7.13 # via sphinx algoliasearch==1.20.0 @@ -23,6 +19,12 @@ algoliasearch-django==1.7.3 # -r requirements/base.in amqp==5.2.0 # via kombu +annotated-types==0.6.0 + # via pydantic +anyio==3.7.1 + # via + # httpx + # openai asgiref==3.7.2 # via # django @@ -34,12 +36,9 @@ astroid==3.0.1 # pylint # pylint-celery async-timeout==4.0.3 - # via - # aiohttp - # redis + # via redis attrs==21.4.0 # via - # aiohttp # glom # jsonschema # openedx-events @@ -73,29 +72,33 @@ boltons==21.0.0 # face # glom # semgrep -boto3==1.28.78 +boto3==1.28.84 # via django-ses -botocore==1.31.78 +botocore==1.31.84 # via # boto3 # s3transfer bracex==2.4 # via wcmatch cachetools==5.3.2 - # via google-auth + # via + # google-auth + # tox cairocffi==1.4.0 # via # -c requirements/constraints.txt # cairosvg cairosvg==2.7.1 # via -r requirements/base.in -celery==5.3.4 +celery==5.3.5 # via # -c requirements/constraints.txt # taxonomy-connector certifi==2023.7.22 # via # elasticsearch + # httpcore + # httpx # requests # selenium # snowflake-connector-python @@ -105,9 +108,10 @@ cffi==1.16.0 # cryptography # pynacl # snowflake-connector-python +chardet==5.2.0 + # via tox charset-normalizer==3.3.2 # via - # aiohttp # requests # snowflake-connector-python click==8.1.7 @@ -137,7 +141,9 @@ code-annotations==1.5.0 # edx-lint # edx-toggles colorama==0.4.6 - # via semgrep + # via + # semgrep + # tox contentful==2.1.1 # via -r requirements/base.in coverage[toml]==7.3.2 @@ -154,7 +160,7 @@ cryptography==41.0.5 # social-auth-core cssselect2==0.7.0 # via cairosvg -ddt==1.6.0 +ddt==1.7.0 # via -r requirements/test.in defusedxml==0.7.1 # via @@ -168,7 +174,9 @@ dill==0.3.7 distlib==0.3.7 # via virtualenv distro==1.8.0 - # via docker-compose + # via + # docker-compose + # openai # via # -c requirements/constraints.txt # -r requirements/base.in @@ -422,6 +430,7 @@ elasticsearch-dsl==7.4.1 # django-elasticsearch-dsl-drf exceptiongroup==1.1.3 # via + # anyio # pytest # trio # trio-websocket @@ -431,7 +440,7 @@ face==22.0.0 # via glom factory-boy==3.3.0 # via -r requirements/test.in -faker==19.13.0 +faker==20.0.0 # via factory-boy fastavro==1.9.0 # via openedx-events @@ -442,17 +451,13 @@ filelock==3.13.1 # virtualenv freezegun==1.2.2 # via -r requirements/test.in -frozenlist==1.4.0 - # via - # aiohttp - # aiosignal getsmarter-api-clients==0.6.1 # via -r requirements/base.in glom==22.1.0 # via semgrep -google-api-core==2.12.0 +google-api-core==2.14.0 # via google-api-python-client -google-api-python-client==2.106.0 +google-api-python-client==2.107.0 # via -r requirements/base.in google-auth==2.23.4 # via @@ -472,19 +477,26 @@ googleapis-common-protos==1.61.0 gspread==5.12.0 # via -r requirements/base.in h11==0.14.0 - # via wsproto + # via + # httpcore + # wsproto html2text==2020.1.16 # via -r requirements/base.in +httpcore==1.0.2 + # via httpx httplib2==0.22.0 # via # google-api-python-client # google-auth-httplib2 +httpx==0.25.1 + # via openai idna==3.4 # via + # anyio + # httpx # requests # snowflake-connector-python # trio - # yarl imagesize==1.4.1 # via sphinx importlib-metadata==6.8.0 @@ -516,7 +528,7 @@ jsonschema==3.2.0 # via # docker-compose # semgrep -kombu==5.3.2 +kombu==5.3.3 # via celery libsass==0.22.0 # via django-libsass @@ -535,10 +547,6 @@ mock==5.1.0 # via -r requirements/test.in more-itertools==10.1.0 # via simple-salesforce -multidict==6.0.4 - # via - # aiohttp - # yarl mysqlclient==2.2.0 # via -r requirements/test.in newrelic==9.1.1 @@ -548,7 +556,7 @@ oauthlib==3.2.2 # getsmarter-api-clients # requests-oauthlib # social-auth-core -openai==0.28.1 +openai==1.2.3 # via taxonomy-connector openedx-atlas==0.5.0 # via -r requirements/base.in @@ -565,6 +573,7 @@ packaging==21.3 # docker # drf-yasg # pydata-sphinx-theme + # pyproject-api # pytest # semgrep # snowflake-connector-python @@ -574,7 +583,7 @@ paramiko==3.3.1 # via docker path==16.7.1 # via edx-i18n-tools -pbr==5.11.1 +pbr==6.0.0 # via stevedore peewee==3.17.0 # via semgrep @@ -590,6 +599,7 @@ platformdirs==3.11.0 # via # pylint # snowflake-connector-python + # tox # virtualenv # zeep pluggy==1.3.0 @@ -598,7 +608,7 @@ pluggy==1.3.0 # tox polib==1.2.0 # via edx-i18n-tools -prompt-toolkit==3.0.39 +prompt-toolkit==3.0.40 # via click-repl protobuf==4.25.0 # via @@ -606,8 +616,6 @@ protobuf==4.25.0 # googleapis-common-protos psutil==5.9.6 # via edx-django-utils -py==1.11.0 - # via tox pyasn1==0.5.0 # via # pyasn1-modules @@ -620,6 +628,10 @@ pycountry==22.3.5 # via -r requirements/base.in pycparser==2.21 # via cffi +pydantic==2.4.2 + # via openai +pydantic-core==2.10.1 + # via pydantic pydata-sphinx-theme==0.14.3 # via sphinx-book-theme pygments==2.16.1 @@ -667,6 +679,8 @@ pyparsing==3.1.1 # via # httplib2 # packaging +pyproject-api==1.5.0 + # via tox pyrsistent==0.20.0 # via jsonschema pysocks==1.7.1 @@ -681,13 +695,13 @@ pytest==7.4.3 # pytest-xdist pytest-cov==4.1.0 # via -r requirements/test.in -pytest-django==4.6.0 +pytest-django==4.7.0 # via -r requirements/test.in pytest-responses==0.5.1 # via -r requirements/test.in pytest-split==0.8.1 # via -r requirements/local.in -pytest-xdist==3.3.1 +pytest-xdist==3.4.0 # via -r requirements/test.in python-dateutil==2.8.2 # via @@ -755,7 +769,6 @@ requests==2.31.0 # edx-drf-extensions # edx-rest-api-client # google-api-core - # openai # requests-file # requests-oauthlib # requests-toolbelt @@ -821,15 +834,17 @@ six==1.16.0 # python-memcached # python-monkey-business # requests-file - # tox # websocket-client slumber==0.7.1 # via edx-rest-api-client sniffio==1.3.0 - # via trio + # via + # anyio + # httpx + # trio snowballstemmer==2.2.0 # via sphinx -snowflake-connector-python==3.4.0 +snowflake-connector-python==3.4.1 # via -r requirements/base.in social-auth-app-django==5.4.0 # via @@ -890,16 +905,15 @@ tomli==2.0.1 # via # coverage # pylint + # pyproject-api # pytest # tox tomlkit==0.12.2 # via # pylint # snowflake-connector-python -tox==3.28.0 - # via - # -c requirements/common_constraints.txt - # -r requirements/test.in +tox==4.0.0 + # via -r requirements/test.in tqdm==4.66.1 # via # openai @@ -912,12 +926,16 @@ trio-websocket==0.11.1 # via selenium typing-extensions==4.8.0 # via + # annotated-types # asgiref # astroid # django-countries # edx-opaque-keys # faker # kombu + # openai + # pydantic + # pydantic-core # pydata-sphinx-theme # pylint # semgrep @@ -969,8 +987,6 @@ wsproto==1.2.0 # via trio-websocket xss-utils==0.5.0 # via -r requirements/base.in -yarl==1.9.2 - # via aiohttp zeep==4.2.1 # via simple-salesforce zipp==3.17.0 diff --git a/requirements/production.txt b/requirements/production.txt index 0f38e9fafb..a0981d267d 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -4,10 +4,6 @@ # # pip-compile --output-file=requirements/production.txt requirements/production.in # -aiohttp==3.8.6 - # via openai -aiosignal==1.3.1 - # via aiohttp algoliasearch==1.20.0 # via # -c requirements/constraints.txt @@ -19,6 +15,12 @@ algoliasearch-django==1.7.3 # -r requirements/base.in amqp==5.2.0 # via kombu +annotated-types==0.6.0 + # via pydantic +anyio==3.7.1 + # via + # httpx + # openai asgiref==3.7.2 # via # django @@ -26,12 +28,9 @@ asgiref==3.7.2 asn1crypto==1.5.1 # via snowflake-connector-python async-timeout==4.0.3 - # via - # aiohttp - # redis + # via redis attrs==23.1.0 # via - # aiohttp # openedx-events # zeep backoff==2.2.1 @@ -48,9 +47,9 @@ beautifulsoup4==4.12.2 # taxonomy-connector billiard==4.2.0 # via celery -boto3==1.28.78 +boto3==1.28.84 # via django-ses -botocore==1.31.78 +botocore==1.31.84 # via # boto3 # s3transfer @@ -62,7 +61,7 @@ cairocffi==1.4.0 # cairosvg cairosvg==2.7.1 # via -r requirements/base.in -celery==5.3.4 +celery==5.3.5 # via # -c requirements/constraints.txt # taxonomy-connector @@ -70,6 +69,8 @@ certifi==2023.7.22 # via # -r requirements/production.in # elasticsearch + # httpcore + # httpx # requests # snowflake-connector-python cffi==1.16.0 @@ -80,7 +81,6 @@ cffi==1.16.0 # snowflake-connector-python charset-normalizer==3.3.2 # via - # aiohttp # requests # snowflake-connector-python click==8.1.7 @@ -116,6 +116,8 @@ defusedxml==0.7.1 # djangorestframework-xml # python3-openid # social-auth-core +distro==1.8.0 + # via openai django==4.2.7 # via # -c requirements/constraints.txt @@ -343,21 +345,19 @@ elasticsearch-dsl==7.4.1 # -r requirements/base.in # django-elasticsearch-dsl # django-elasticsearch-dsl-drf +exceptiongroup==1.1.3 + # via anyio fastavro==1.9.0 # via openedx-events filelock==3.13.1 # via snowflake-connector-python -frozenlist==1.4.0 - # via - # aiohttp - # aiosignal getsmarter-api-clients==0.6.1 # via -r requirements/base.in gevent==23.9.1 # via -r requirements/production.in -google-api-core==2.12.0 +google-api-core==2.14.0 # via google-api-python-client -google-api-python-client==2.106.0 +google-api-python-client==2.107.0 # via -r requirements/base.in google-auth==2.23.4 # via @@ -380,17 +380,24 @@ gspread==5.12.0 # via -r requirements/base.in gunicorn==21.2.0 # via -r requirements/production.in +h11==0.14.0 + # via httpcore html2text==2020.1.16 # via -r requirements/base.in +httpcore==1.0.2 + # via httpx httplib2==0.22.0 # via # google-api-python-client # google-auth-httplib2 +httpx==0.25.1 + # via openai idna==3.4 # via + # anyio + # httpx # requests # snowflake-connector-python - # yarl importlib-metadata==6.8.0 # via # -r requirements/base.in @@ -407,7 +414,7 @@ jmespath==1.0.1 # botocore jsonfield==3.1.0 # via -r requirements/base.in -kombu==5.3.2 +kombu==5.3.3 # via celery libsass==0.22.0 # via django-libsass @@ -421,10 +428,6 @@ markupsafe==2.1.3 # via jinja2 more-itertools==10.1.0 # via simple-salesforce -multidict==6.0.4 - # via - # aiohttp - # yarl mysqlclient==2.2.0 # via -r requirements/production.in newrelic==9.1.1 @@ -436,7 +439,7 @@ oauthlib==3.2.2 # getsmarter-api-clients # requests-oauthlib # social-auth-core -openai==0.28.1 +openai==1.2.3 # via taxonomy-connector openedx-atlas==0.5.0 # via -r requirements/base.in @@ -451,7 +454,7 @@ packaging==23.2 # drf-yasg # gunicorn # snowflake-connector-python -pbr==5.11.1 +pbr==6.0.0 # via stevedore pendulum==2.1.2 # via simple-salesforce @@ -465,7 +468,7 @@ platformdirs==3.11.0 # via # snowflake-connector-python # zeep -prompt-toolkit==3.0.39 +prompt-toolkit==3.0.40 # via click-repl protobuf==4.25.0 # via @@ -483,6 +486,10 @@ pycountry==22.3.5 # via -r requirements/base.in pycparser==2.21 # via cffi +pydantic==2.4.2 + # via openai +pydantic-core==2.10.1 + # via pydantic pyjwt[crypto]==2.8.0 # via # drf-jwt @@ -556,7 +563,6 @@ requests==2.31.0 # edx-drf-extensions # edx-rest-api-client # google-api-core - # openai # requests-file # requests-oauthlib # requests-toolbelt @@ -602,7 +608,11 @@ six==1.16.0 # requests-file slumber==0.7.1 # via edx-rest-api-client -snowflake-connector-python==3.4.0 +sniffio==1.3.0 + # via + # anyio + # httpx +snowflake-connector-python==3.4.1 # via -r requirements/base.in social-auth-app-django==5.4.0 # via @@ -637,10 +647,14 @@ tqdm==4.66.1 # via openai typing-extensions==4.8.0 # via + # annotated-types # asgiref # django-countries # edx-opaque-keys # kombu + # openai + # pydantic + # pydantic-core # snowflake-connector-python tzdata==2023.3 # via @@ -673,8 +687,6 @@ webencodings==0.5.1 # tinycss2 xss-utils==0.5.0 # via -r requirements/base.in -yarl==1.9.2 - # via aiohttp zeep==4.2.1 # via simple-salesforce zipp==3.17.0