From 0133c8f3bfeffceb165fdc2a18466cf1b3c3e9e4 Mon Sep 17 00:00:00 2001 From: Usama Sadiq Date: Tue, 21 May 2024 18:51:00 +0500 Subject: [PATCH] feat!: upgrade to Python 3.12 (#824) * feat!: upgrade to Python 3.12 * build: upgrade Python in Dockerfile and configs * build: update sql volume in Dockerfile * build: update Dockerfile * build: update Dockerfile * build: update Dockerfile * build: update Dockerfile * build: update Dockerfile * build: update Dockerfile * build: update Dockerfile * build: update Dockerfile * build: update Dockerfile * build: update Dockerfile * build: update Dockerfile * build: update Dockerfile * build: update Dockerfile * build: update Dockerfile * build: update Dockerfile * build: update Dockerfile * build: update Dockerfile * build: update Dockerfile * fix: fix quality checks * chore: remove edx-lint and pylint constraints * chore: remove edx-lint and pylint constraints * fix: update pylintrc * fix: fix quality checks * fix: fix dict literal syntax * fix: fix quality checks --- .github/docker-compose-github.yml | 6 +- .github/workflows/ci.yml | 8 +- .github/workflows/mysql-migrations-check.yml | 2 +- .../workflows/upgrade-python-requirements.yml | 1 + Dockerfile | 39 +- Makefile | 4 - .../apps/academy/tests/factories.py | 10 +- .../apps/ai_curation/tests/test_utils.py | 4 +- enterprise_catalog/apps/api/tasks.py | 4 +- pylintrc | 7 +- requirements/base.txt | 38 +- requirements/constraints.txt | 5 - requirements/dev.txt | 79 +- requirements/dev312.txt | 842 ------------------ requirements/doc.txt | 102 +-- requirements/pip-tools.txt | 12 +- requirements/pip.txt | 2 +- requirements/production.txt | 40 +- requirements/quality.txt | 61 +- requirements/test.txt | 67 +- requirements/test312.txt | 579 ------------ requirements/validation.txt | 73 +- tox.ini | 11 +- validate.sh | 6 +- 24 files changed, 115 insertions(+), 1887 deletions(-) delete mode 100644 requirements/dev312.txt delete mode 100644 requirements/test312.txt diff --git a/.github/docker-compose-github.yml b/.github/docker-compose-github.yml index a1919afe9..df0ac7265 100644 --- a/.github/docker-compose-github.yml +++ b/.github/docker-compose-github.yml @@ -1,14 +1,14 @@ version: "2.1" services: mysql: - image: mysql:5.7 + image: mysql:8.0.28-oracle container_name: enterprise.catalog.mysql environment: MYSQL_ROOT_PASSWORD: "" MYSQL_ALLOW_EMPTY_PASSWORD: "yes" MYSQL_DATABASE: "enterprise_catalog" volumes: - - enterprise_catalog_mysql:/var/lib/mysql + - enterprise_catalog_mysql8:/var/lib/mysql app: image: openedx/enterprise-catalog @@ -32,5 +32,5 @@ services: DJANGO_SETTINGS_MODULE: enterprise_catalog.settings.test volumes: - enterprise_catalog_mysql: + enterprise_catalog_mysql8: driver: local diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eeb5ad591..113f15ca7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.8', '3.12'] + python-version: ['3.12'] django-version: [django42] steps: @@ -25,11 +25,7 @@ jobs: docker-compose -f .github/docker-compose-github.yml up -d - name: Install test dependencies and run validation run: | - if [[ "${{ matrix.python-version }}" == "3.8" ]]; then - docker exec -e TOXENV=py38-${{ matrix.django-version }} -u root enterprise.catalog.app /edx/app/enterprise_catalog/enterprise_catalog/validate.sh - elif [[ "${{ matrix.python-version }}" == "3.12" ]]; then docker exec -e TOXENV=py312-${{ matrix.django-version }} -u root enterprise.catalog.app /edx/app/enterprise_catalog/enterprise_catalog/validate.sh - fi - name: Code Coverage - if: matrix.python-version == '3.8' && matrix.django-version=='django42' + if: matrix.python-version == '3.12' && matrix.django-version=='django42' uses: codecov/codecov-action@v1 diff --git a/.github/workflows/mysql-migrations-check.yml b/.github/workflows/mysql-migrations-check.yml index 1692af970..6e0639874 100644 --- a/.github/workflows/mysql-migrations-check.yml +++ b/.github/workflows/mysql-migrations-check.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: os: [ ubuntu-20.04 ] - python-version: [ 3.8 ] + python-version: [ 3.12 ] steps: - name: Checkout repo diff --git a/.github/workflows/upgrade-python-requirements.yml b/.github/workflows/upgrade-python-requirements.yml index ddadff918..648574d0d 100644 --- a/.github/workflows/upgrade-python-requirements.yml +++ b/.github/workflows/upgrade-python-requirements.yml @@ -18,6 +18,7 @@ jobs: branch: ${{ github.event.inputs.branch || 'master' }} team_reviewers: "enterprise-quokkas" email_address: "online-campus@edx.org" + python_version: 3.12 secrets: requirements_bot_github_token: ${{ secrets.REQUIREMENTS_BOT_GITHUB_TOKEN }} requirements_bot_github_email: ${{ secrets.REQUIREMENTS_BOT_GITHUB_EMAIL }} diff --git a/Dockerfile b/Dockerfile index fef31c6fb..e2c0e8312 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,9 +8,6 @@ MAINTAINER sre@edx.org # language-pack-en locales # ubuntu locale support so that system utilities have a consistent # language and time zone. -# python3.5 -# ubuntu doesnt ship with python, so this is the python we will use to run the -# application # python3-pip # install pip to install application requirements.txt files # pkg-config @@ -21,36 +18,42 @@ MAINTAINER sre@edx.org # to install header files needed to use native C implementation for # MySQL-python for performance gains. +ARG PYTHON_VERSION=3.12 +ENV TZ=UTC +ENV TERM=xterm-256color +ENV DEBIAN_FRONTEND=noninteractive + # If you add a package here please include a comment above describing what it is used for +RUN apt-get update && \ + apt-get install -y software-properties-common && \ + apt-add-repository -y ppa:deadsnakes/ppa + RUN apt-get update && apt-get -qy install --no-install-recommends \ + build-essential \ language-pack-en \ locales \ - python3.8 \ - python3-pip \ - python3.8-venv \ - python3.8-dev \ pkg-config \ libmysqlclient-dev \ libssl-dev \ - build-essential \ + libffi-dev \ + libsqlite3-dev \ git \ - wget + wget \ + python3.12 \ + python3.12-dev \ + python3.12-distutils \ + python3-pip -ENV TZ=UTC RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone -RUN apt-get update && apt-get -qy install libffi-dev libsqlite3-dev python3-distutils - -RUN apt-get update && apt-get install -y build-essential wget && \ -wget https://www.python.org/ftp/python/3.12.0/Python-3.12.0.tgz && \ -tar -xzvf Python-3.12.0.tgz && cd Python-3.12.0 && ./configure --enable-optimizations && \ -make -j$(nproc) && make altinstall && python3.12 --version +RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python${PYTHON_VERSION} +RUN pip install virtualenv ENV VIRTUAL_ENV=/venv -RUN python3.8 -m venv $VIRTUAL_ENV +RUN virtualenv -p python$PYTHON_VERSION $VIRTUAL_ENV ENV PATH="$VIRTUAL_ENV/bin:$PATH" -RUN pip install pip==20.2.3 setuptools==50.3.0 +RUN pip install pip==24.0 setuptools==69.5.1 RUN locale-gen en_US.UTF-8 ENV LANG en_US.UTF-8 diff --git a/Makefile b/Makefile index 9fd92ac7e..20e04564d 100644 --- a/Makefile +++ b/Makefile @@ -47,10 +47,6 @@ piptools: ## install pinned version of pip-compile and pip-sync requirements: piptools dev_requirements ## sync to default requirements -requirements312: ## sync to requirements for local development with Python 3.12 - pip3.12 install -qr requirements/pip-tools.txt - pip3.12 install -qr requirements/dev312.txt - dev_requirements: ## sync to requirements for local development pip-sync -q requirements/dev.txt diff --git a/enterprise_catalog/apps/academy/tests/factories.py b/enterprise_catalog/apps/academy/tests/factories.py index 15a2c4ba6..bf6851296 100644 --- a/enterprise_catalog/apps/academy/tests/factories.py +++ b/enterprise_catalog/apps/academy/tests/factories.py @@ -24,7 +24,7 @@ class Meta: def content_metadata(self, create, extracted, **kwargs): # pylint: disable=unused-argument content_metadata1 = ContentMetadataFactory.create(content_type=COURSE) content_metadata2 = ContentMetadataFactory.create(content_type=COURSE) - self.content_metadata.set([content_metadata1, content_metadata2]) # pylint: disable=no-member + self.content_metadata.set([content_metadata1, content_metadata2]) class AcademyFactory(factory.django.DjangoModelFactory): @@ -43,18 +43,18 @@ class Meta: def enterprise_catalogs(self, create, extracted, **kwargs): # pylint: disable=unused-argument if extracted: for enterprise_catalog in extracted: - self.enterprise_catalogs.add(enterprise_catalog) # pylint: disable=no-member + self.enterprise_catalogs.add(enterprise_catalog) else: enterprise_catalog1 = EnterpriseCatalogFactory() enterprise_catalog2 = EnterpriseCatalogFactory() - self.enterprise_catalogs.set([enterprise_catalog1, enterprise_catalog2]) # pylint: disable=no-member + self.enterprise_catalogs.set([enterprise_catalog1, enterprise_catalog2]) @factory.post_generation def tags(self, create, extracted, **kwargs): # pylint: disable=unused-argument if extracted: for tag in extracted: - self.tags.add(tag) # pylint: disable=no-member + self.tags.add(tag) else: tag1 = TagFactory() tag2 = TagFactory() - self.tags.set([tag1, tag2]) # pylint: disable=no-member + self.tags.set([tag1, tag2]) diff --git a/enterprise_catalog/apps/ai_curation/tests/test_utils.py b/enterprise_catalog/apps/ai_curation/tests/test_utils.py index f008eb03a..0ac23cc52 100644 --- a/enterprise_catalog/apps/ai_curation/tests/test_utils.py +++ b/enterprise_catalog/apps/ai_curation/tests/test_utils.py @@ -23,9 +23,7 @@ ) -CHAT_COMPLETIONS_API_KEYWARGS = dict( - model='gpt-4', temperature=0.3, max_tokens=500 -) +CHAT_COMPLETIONS_API_KEYWARGS = {"model": 'gpt-4', "temperature": 0.3, "max_tokens": 500} class TestUtils(TestCase): diff --git a/enterprise_catalog/apps/api/tasks.py b/enterprise_catalog/apps/api/tasks.py index 951a7981e..ec0dc337d 100644 --- a/enterprise_catalog/apps/api/tasks.py +++ b/enterprise_catalog/apps/api/tasks.py @@ -1127,14 +1127,14 @@ def update_catalog_metadata_task(self, catalog_query_id, force=False, dry_run=Fa except Exception as e: logger.exception( f'Something went wrong while updating content metadata from discovery using catalog: {catalog_query_id} ' - f'after update_catalog_metadata_task_seconds={time.perf_counter()-start_time} seconds', + f'after update_catalog_metadata_task_seconds={time.perf_counter() - start_time} seconds', exc_info=e, ) raise e logger.info( f'Finished update_catalog_metadata_task with {len(associated_content_keys)} ' f'associated content keys for catalog {catalog_query_id} ' - f'after update_catalog_metadata_task_seconds={time.perf_counter()-start_time} seconds' + f'after update_catalog_metadata_task_seconds={time.perf_counter() - start_time} seconds' ) diff --git a/pylintrc b/pylintrc index a66d797f0..e2b363e62 100644 --- a/pylintrc +++ b/pylintrc @@ -64,7 +64,7 @@ # SERIOUSLY. # # ------------------------------ -# Generated by edx-lint version: 5.2.5 +# Generated by edx-lint version: 5.3.6 # ------------------------------ [MASTER] ignore = ,migrations, settings, wsgi.py @@ -259,6 +259,7 @@ enable = useless-suppression, disable = bad-indentation, + broad-exception-raised, consider-using-f-string, duplicate-code, file-ignored, @@ -380,6 +381,6 @@ ext-import-graph = int-import-graph = [EXCEPTIONS] -overgeneral-exceptions = Exception +overgeneral-exceptions = builtins.Exception -# b86606bb77e6a87fcf5f6893592d35d432a507f5 +# 43c0dc058c537a12f0149a84a44e307cd064feda diff --git a/requirements/base.txt b/requirements/base.txt index fa2802016..9b2163935 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade @@ -27,13 +27,6 @@ attrs==23.2.0 # referencing backoff==1.10.0 # via analytics-python -backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" - # via - # -c requirements/constraints.txt - # celery - # django - # djangorestframework - # kombu billiard==4.2.0 # via celery celery==5.4.0 @@ -181,8 +174,6 @@ edx-rest-api-client==5.7.0 # via -r requirements/base.in edx-toggles==5.2.0 # via -r requirements/base.in -exceptiongroup==1.2.1 - # via anyio h11==0.14.0 # via httpcore httpcore==1.0.5 @@ -194,10 +185,6 @@ idna==3.7 # anyio # httpx # requests -importlib-resources==6.4.0 - # via - # jsonschema - # jsonschema-specifications inflection==0.5.1 # via drf-spectacular jinja2==3.1.4 @@ -222,7 +209,7 @@ mysqlclient==2.2.4 # via -r requirements/base.in newrelic==9.9.0 # via edx-django-utils -numpy==1.24.4 +numpy==1.26.4 # via # scikit-learn # scipy @@ -236,8 +223,6 @@ openai==1.13.3 # -r requirements/base.in pbr==6.0.0 # via stevedore -pkgutil-resolve-name==1.3.10 - # via jsonschema ply==3.11 # via djangoql prompt-toolkit==3.0.43 @@ -297,15 +282,15 @@ requests==2.31.0 # social-auth-core requests-oauthlib==2.0.0 # via social-auth-core -rpds-py==0.18.0 +rpds-py==0.18.1 # via # jsonschema # referencing rules==3.3 # via -r requirements/base.in -scikit-learn==1.3.2 +scikit-learn==1.4.2 # via -r requirements/base.in -scipy==1.10.1 +scipy==1.13.0 # via scikit-learn semantic-version==2.10.0 # via edx-drf-extensions @@ -348,19 +333,12 @@ tqdm==4.66.4 # via openai typing-extensions==4.11.0 # via - # annotated-types - # anyio - # asgiref - # drf-spectacular # edx-opaque-keys - # kombu # openai # pydantic # pydantic-core tzdata==2024.1 - # via - # backports-zoneinfo - # celery + # via celery uritemplate==4.1.1 # via drf-spectacular urllib3==2.2.1 @@ -375,9 +353,7 @@ wcwidth==0.2.13 xlsxwriter==3.2.0 # via -r requirements/base.in zipp==3.18.1 - # via - # -r requirements/base.in - # importlib-resources + # via -r requirements/base.in # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 6878afae9..4acd53e16 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -33,11 +33,6 @@ diff-cover==4.0.0 # redis 4 client won't work with redis 3 server redis<4 -# edx-lint>=5.3.0 and/or pylint>=2.15 throws a bunch of unknown option value errors -edx-lint<5.3 -pylint<2.15 -astroid<2.12 - # To avoid any breaking changes openai<=1.13.3 diff --git a/requirements/dev.txt b/requirements/dev.txt index 25779be4e..c97a4b9d9 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade @@ -35,9 +35,8 @@ asgiref==3.8.1 # django # django-cors-headers # django-simple-history -astroid==2.11.7 +astroid==3.1.0 # via - # -c requirements/constraints.txt # -r requirements/quality.txt # -r requirements/test.txt # pylint @@ -53,15 +52,6 @@ backoff==1.10.0 # -r requirements/quality.txt # -r requirements/test.txt # analytics-python -backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" - # via - # -c requirements/constraints.txt - # -r requirements/quality.txt - # -r requirements/test.txt - # celery - # django - # djangorestframework - # kombu billiard==4.2.0 # via # -r requirements/quality.txt @@ -327,9 +317,8 @@ edx-drf-extensions==10.3.0 # edx-rbac edx-i18n-tools==1.6.0 # via -r requirements/dev.in -edx-lint==5.2.5 +edx-lint==5.3.6 # via - # -c requirements/constraints.txt # -r requirements/quality.txt # -r requirements/test.txt edx-opaque-keys==2.9.0 @@ -349,12 +338,6 @@ edx-toggles==5.2.0 # via # -r requirements/quality.txt # -r requirements/test.txt -exceptiongroup==1.2.1 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # anyio - # pytest factory-boy==3.3.0 # via -r requirements/test.txt faker==25.0.1 @@ -393,15 +376,7 @@ idna==3.7 importlib-metadata==6.11.0 # via # -c requirements/common_constraints.txt - # -r requirements/pip-tools.txt - # build # inflect -importlib-resources==6.4.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # jsonschema - # jsonschema-specifications inflect==3.0.2 # via # -c requirements/constraints.txt @@ -459,11 +434,6 @@ kombu==5.3.7 # -r requirements/quality.txt # -r requirements/test.txt # celery -lazy-object-proxy==1.10.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # astroid lxml[html-clean,html_clean]==5.2.1 # via # edx-i18n-tools @@ -494,7 +464,7 @@ newrelic==9.9.0 # -r requirements/quality.txt # -r requirements/test.txt # edx-django-utils -numpy==1.24.4 +numpy==1.26.4 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -529,11 +499,6 @@ pbr==6.0.0 # stevedore pip-tools==7.4.1 # via -r requirements/pip-tools.txt -pkgutil-resolve-name==1.3.10 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # jsonschema platformdirs==4.2.1 # via # -r requirements/quality.txt @@ -594,9 +559,8 @@ pyjwt[crypto]==2.8.0 # edx-drf-extensions # edx-rest-api-client # social-auth-core -pylint==2.14.5 +pylint==3.1.0 # via - # -c requirements/constraints.txt # -r requirements/quality.txt # -r requirements/test.txt # edx-lint @@ -715,7 +679,7 @@ responses==0.25.0 # via # -r requirements/dev.in # -r requirements/test.txt -rpds-py==0.18.0 +rpds-py==0.18.1 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -725,11 +689,11 @@ rules==3.3 # via # -r requirements/quality.txt # -r requirements/test.txt -scikit-learn==1.3.2 +scikit-learn==1.4.2 # via # -r requirements/quality.txt # -r requirements/test.txt -scipy==1.10.1 +scipy==1.13.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -803,18 +767,6 @@ threadpoolctl==3.5.0 # -r requirements/quality.txt # -r requirements/test.txt # scikit-learn -tomli==2.0.1 - # via - # -r requirements/pip-tools.txt - # -r requirements/quality.txt - # -r requirements/test.txt - # build - # coverage - # pip-tools - # pylint - # pyproject-api - # pytest - # tox tomlkit==0.12.4 # via # -r requirements/quality.txt @@ -831,22 +783,14 @@ typing-extensions==4.11.0 # via # -r requirements/quality.txt # -r requirements/test.txt - # annotated-types - # anyio - # asgiref - # astroid - # drf-spectacular # edx-opaque-keys - # kombu # openai # pydantic # pydantic-core - # pylint tzdata==2024.1 # via # -r requirements/quality.txt # -r requirements/test.txt - # backports-zoneinfo # celery uritemplate==4.1.1 # via @@ -879,22 +823,15 @@ wheel==0.43.0 # via # -r requirements/pip-tools.txt # pip-tools -wrapt==1.16.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # astroid xlsxwriter==3.2.0 # via # -r requirements/quality.txt # -r requirements/test.txt zipp==3.18.1 # via - # -r requirements/pip-tools.txt # -r requirements/quality.txt # -r requirements/test.txt # importlib-metadata - # importlib-resources # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/dev312.txt b/requirements/dev312.txt deleted file mode 100644 index 78f681761..000000000 --- a/requirements/dev312.txt +++ /dev/null @@ -1,842 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: -# -# make upgrade -# -algoliasearch==3.0.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt -amqp==5.2.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # kombu -analytics-python==1.4.post1 - # via - # -r requirements/quality.txt - # -r requirements/test.txt -annotated-types==0.6.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # pydantic -anyio==4.3.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # httpx - # openai -asgiref==3.8.1 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # django - # django-cors-headers - # django-simple-history -astroid==2.11.7 - # via - # -c requirements/constraints.txt - # -r requirements/quality.txt - # -r requirements/test.txt - # pylint - # pylint-celery -attrs==23.2.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # jsonschema - # referencing -backoff==1.10.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # analytics-python -billiard==4.2.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # celery -build==1.2.1 - # via - # -r requirements/pip-tools.txt - # pip-tools -cachetools==5.3.3 - # via - # -r requirements/test.txt - # tox -celery==5.3.6 - # via - # -c requirements/constraints.txt - # -r requirements/quality.txt - # -r requirements/test.txt - # django-celery-results - # edx-celeryutils -certifi==2024.2.2 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # httpcore - # httpx - # requests -cffi==1.16.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # cryptography - # pynacl -chardet==5.2.0 - # via - # -r requirements/test.txt - # tox -charset-normalizer==3.3.2 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # requests -click==8.1.7 - # via - # -r requirements/pip-tools.txt - # -r requirements/quality.txt - # -r requirements/test.txt - # celery - # click-didyoumean - # click-log - # click-plugins - # click-repl - # code-annotations - # edx-django-utils - # edx-lint - # pip-tools -click-didyoumean==0.3.1 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # celery -click-log==0.4.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # edx-lint -click-plugins==1.1.1 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # celery -click-repl==0.3.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # celery -code-annotations==1.8.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # edx-lint - # edx-toggles -colorama==0.4.6 - # via - # -r requirements/test.txt - # tox -coverage[toml]==7.4.4 - # via - # -r requirements/test.txt - # pytest-cov -cryptography==42.0.5 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # pyjwt - # social-auth-core -ddt==1.7.2 - # via - # -r requirements/dev.in - # -r requirements/test.txt -defusedxml==0.7.1 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # djangorestframework-xml - # python3-openid - # social-auth-core -diff-cover==4.0.0 - # via - # -c requirements/constraints.txt - # -r requirements/dev.in -dill==0.3.8 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # pylint -distlib==0.3.8 - # via - # -r requirements/test.txt - # virtualenv -distro==1.9.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # openai -django==4.2.13 - # via - # -c requirements/common_constraints.txt - # -c requirements/constraints.txt - # -r requirements/quality.txt - # -r requirements/test.txt - # django-celery-results - # django-clearcache - # django-config-models - # django-cors-headers - # django-crum - # django-debug-toolbar - # django-extensions - # django-log-request-id - # django-model-utils - # django-waffle - # djangorestframework - # drf-jwt - # drf-spectacular - # edx-auth-backends - # edx-celeryutils - # edx-django-release-util - # edx-django-utils - # edx-drf-extensions - # edx-i18n-tools - # edx-rbac - # edx-toggles - # jsonfield - # jsonfield2 - # social-auth-app-django -django-celery-results==2.5.1 - # via - # -r requirements/quality.txt - # -r requirements/test.txt -django-clearcache==1.2.1 - # via - # -r requirements/quality.txt - # -r requirements/test.txt -django-config-models==2.7.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt -django-cors-headers==4.3.1 - # via - # -r requirements/quality.txt - # -r requirements/test.txt -django-crum==0.7.9 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # edx-django-utils - # edx-rbac - # edx-toggles -django-debug-toolbar==4.3.0 - # via -r requirements/dev.in -django-dynamic-fixture==4.0.1 - # via -r requirements/test.txt -django-extensions==3.2.3 - # via - # -r requirements/quality.txt - # -r requirements/test.txt -django-log-request-id==2.1.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt -django-model-utils==4.5.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # edx-celeryutils - # edx-rbac -django-simple-history==3.5.0 - # via - # -c requirements/constraints.txt - # -r requirements/quality.txt - # -r requirements/test.txt -django-waffle==4.1.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # edx-django-utils - # edx-drf-extensions - # edx-toggles -djangoql==0.18.1 - # via - # -r requirements/quality.txt - # -r requirements/test.txt -djangorestframework==3.15.1 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # django-config-models - # drf-jwt - # drf-spectacular - # edx-drf-extensions -djangorestframework-xml==2.0.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt -drf-jwt==1.19.2 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # edx-drf-extensions -drf-spectacular==0.27.2 - # via - # -r requirements/quality.txt - # -r requirements/test.txt -edx-auth-backends==4.3.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt -edx-celeryutils==1.3.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt -edx-django-release-util==1.4.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt -edx-django-utils==5.12.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # django-config-models - # edx-drf-extensions - # edx-rest-api-client - # edx-toggles -edx-drf-extensions==10.3.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # edx-rbac -edx-i18n-tools==1.5.0 - # via -r requirements/dev.in -edx-lint==5.2.5 - # via - # -c requirements/constraints.txt - # -r requirements/quality.txt - # -r requirements/test.txt -edx-opaque-keys==2.5.1 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # edx-drf-extensions -edx-rbac==1.8.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt -edx-rest-api-client==5.7.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt -edx-toggles==5.2.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt -factory-boy==3.3.0 - # via -r requirements/test.txt -faker==24.9.0 - # via - # -r requirements/test.txt - # factory-boy -filelock==3.13.4 - # via - # -r requirements/test.txt - # tox - # virtualenv -gunicorn==22.0.0 - # via -r requirements/dev.in -h11==0.14.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # httpcore -httpcore==1.0.5 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # httpx -httpx==0.27.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # openai -idna==3.7 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # anyio - # httpx - # requests -importlib-metadata==6.11.0 - # via - # -c requirements/common_constraints.txt - # inflect -inflect==3.0.2 - # via - # -c requirements/constraints.txt - # -r requirements/dev.in - # jinja2-pluralize -inflection==0.5.1 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # drf-spectacular -iniconfig==2.0.0 - # via - # -r requirements/test.txt - # pytest -isort==5.13.2 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # pylint -jinja2==3.1.3 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # code-annotations - # diff-cover - # jinja2-pluralize -jinja2-pluralize==0.3.0 - # via diff-cover -joblib==1.4.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # scikit-learn -jsonfield==3.1.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # edx-celeryutils -jsonfield2==4.0.0.post0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt -jsonschema==4.21.1 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # drf-spectacular -jsonschema-specifications==2023.12.1 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # jsonschema -kombu==5.3.7 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # celery -lazy-object-proxy==1.10.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # astroid -lxml==5.2.1 - # via edx-i18n-tools -markupsafe==2.1.5 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # jinja2 -mccabe==0.7.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # pylint -monotonic==1.6 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # analytics-python -mysqlclient==2.2.4 - # via - # -r requirements/quality.txt - # -r requirements/test.txt -newrelic==9.8.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # edx-django-utils -numpy==1.26.4 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # scikit-learn - # scipy -oauthlib==3.2.2 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # requests-oauthlib - # social-auth-core -openai==1.13.3 - # via - # -c requirements/constraints.txt - # -r requirements/quality.txt - # -r requirements/test.txt -packaging==24.0 - # via - # -r requirements/pip-tools.txt - # -r requirements/test.txt - # build - # gunicorn - # pyproject-api - # pytest - # tox -path==16.14.0 - # via edx-i18n-tools -pbr==6.0.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # stevedore -pip-tools==7.4.1 - # via -r requirements/pip-tools.txt -platformdirs==4.2.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # pylint - # tox - # virtualenv -pluggy==1.4.0 - # via - # -r requirements/test.txt - # diff-cover - # pytest - # tox -ply==3.11 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # djangoql -polib==1.2.0 - # via edx-i18n-tools -prompt-toolkit==3.0.43 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # click-repl -psutil==5.9.8 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # edx-django-utils -pycodestyle==2.11.1 - # via -r requirements/quality.txt -pycparser==2.22 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # cffi -pydantic==2.7.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # openai -pydantic-core==2.18.1 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # pydantic -pydocstyle==6.3.0 - # via -r requirements/quality.txt -pygments==2.17.2 - # via diff-cover -pyjwt[crypto]==2.8.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # drf-jwt - # edx-auth-backends - # edx-drf-extensions - # edx-rest-api-client - # social-auth-core -pylint==2.14.5 - # via - # -c requirements/constraints.txt - # -r requirements/quality.txt - # -r requirements/test.txt - # edx-lint - # pylint-celery - # pylint-django - # pylint-plugin-utils -pylint-celery==0.3 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # edx-lint -pylint-django==2.5.5 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # edx-lint -pylint-plugin-utils==0.8.2 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # pylint-celery - # pylint-django -pymemcache==4.0.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt -pymongo==3.13.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # edx-opaque-keys -pynacl==1.5.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # edx-django-utils -pyproject-api==1.6.1 - # via - # -r requirements/test.txt - # tox -pyproject-hooks==1.0.0 - # via - # -r requirements/pip-tools.txt - # build - # pip-tools -pytest==8.1.1 - # via - # -r requirements/test.txt - # pytest-cov - # pytest-django -pytest-cov==5.0.0 - # via -r requirements/test.txt -pytest-django==4.8.0 - # via -r requirements/test.txt -python-dateutil==2.9.0.post0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # analytics-python - # celery - # faker -python-memcached==1.62 - # via -r requirements/dev.in -python-slugify==8.0.4 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # code-annotations -python3-openid==3.2.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # social-auth-core -pytz==2024.1 - # via - # -r requirements/quality.txt - # -r requirements/test.txt -pyyaml==6.0.1 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # code-annotations - # drf-spectacular - # edx-django-release-util - # edx-i18n-tools - # responses -redis==3.5.3 - # via - # -c requirements/constraints.txt - # -r requirements/quality.txt - # -r requirements/test.txt -referencing==0.34.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # jsonschema - # jsonschema-specifications -requests==2.31.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # algoliasearch - # analytics-python - # edx-drf-extensions - # edx-rest-api-client - # requests-oauthlib - # responses - # slumber - # social-auth-core -requests-oauthlib==2.0.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # social-auth-core -responses==0.25.0 - # via - # -r requirements/dev.in - # -r requirements/test.txt -rpds-py==0.18.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # jsonschema - # referencing -rules==3.3 - # via - # -r requirements/quality.txt - # -r requirements/test.txt -scikit-learn==1.4.2 - # via - # -r requirements/quality.txt - # -r requirements/test.txt -scipy==1.13.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # scikit-learn -semantic-version==2.10.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # edx-drf-extensions -simplejson==3.19.2 - # via - # -r requirements/quality.txt - # -r requirements/test.txt -six==1.16.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # analytics-python - # edx-auth-backends - # edx-django-release-util - # edx-lint - # edx-rbac - # python-dateutil -slumber==0.7.1 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # edx-rest-api-client -sniffio==1.3.1 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # anyio - # httpx - # openai -snowballstemmer==2.2.0 - # via - # -r requirements/quality.txt - # pydocstyle -social-auth-app-django==5.4.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # edx-auth-backends -social-auth-core==4.5.3 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # edx-auth-backends - # social-auth-app-django -sqlparse==0.5.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # django - # django-debug-toolbar -stevedore==5.2.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # code-annotations - # edx-django-utils - # edx-opaque-keys -text-unidecode==1.3 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # python-slugify -threadpoolctl==3.4.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # scikit-learn -tomlkit==0.12.4 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # pylint -tox==4.14.2 - # via -r requirements/test.txt -tqdm==4.66.2 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # openai -typing-extensions==4.11.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # edx-opaque-keys - # openai - # pydantic - # pydantic-core -tzdata==2024.1 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # celery -uritemplate==4.1.1 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # drf-spectacular -urllib3==2.2.1 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # requests - # responses -vine==5.1.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # amqp - # celery - # kombu -virtualenv==20.25.3 - # via - # -r requirements/test.txt - # tox -wcwidth==0.2.13 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # prompt-toolkit -wheel==0.43.0 - # via - # -r requirements/pip-tools.txt - # pip-tools -wrapt==1.16.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # astroid -xlsxwriter==3.2.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt -zipp==3.18.1 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # importlib-metadata - -# The following packages are considered to be unsafe in a requirements file: -# pip -# setuptools diff --git a/requirements/doc.txt b/requirements/doc.txt index b2f54442c..d32d05611 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -1,12 +1,12 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade # accessible-pygments==0.0.4 # via pydata-sphinx-theme -alabaster==0.7.13 +alabaster==0.7.16 # via sphinx algoliasearch==3.0.0 # via -r requirements/test.txt @@ -31,9 +31,8 @@ asgiref==3.8.1 # django # django-cors-headers # django-simple-history -astroid==2.11.7 +astroid==3.1.0 # via - # -c requirements/constraints.txt # -r requirements/test.txt # pylint # pylint-celery @@ -50,14 +49,6 @@ backoff==1.10.0 # via # -r requirements/test.txt # analytics-python -backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" - # via - # -c requirements/constraints.txt - # -r requirements/test.txt - # celery - # django - # djangorestframework - # kombu beautifulsoup4==4.12.3 # via pydata-sphinx-theme billiard==4.2.0 @@ -237,7 +228,7 @@ dnspython==2.6.1 # pymongo doc8==1.1.1 # via -r requirements/doc.in -docutils==0.19 +docutils==0.20.1 # via # doc8 # pydata-sphinx-theme @@ -267,10 +258,8 @@ edx-drf-extensions==10.3.0 # via # -r requirements/test.txt # edx-rbac -edx-lint==5.2.5 - # via - # -c requirements/constraints.txt - # -r requirements/test.txt +edx-lint==5.3.6 + # via -r requirements/test.txt edx-opaque-keys==2.9.0 # via # -r requirements/test.txt @@ -281,11 +270,6 @@ edx-rest-api-client==5.7.0 # via -r requirements/test.txt edx-toggles==5.2.0 # via -r requirements/test.txt -exceptiongroup==1.2.1 - # via - # -r requirements/test.txt - # anyio - # pytest factory-boy==3.3.0 # via -r requirements/test.txt faker==25.0.1 @@ -317,15 +301,6 @@ idna==3.7 # requests imagesize==1.4.1 # via sphinx -importlib-metadata==6.11.0 - # via - # -c requirements/common_constraints.txt - # sphinx -importlib-resources==6.4.0 - # via - # -r requirements/test.txt - # jsonschema - # jsonschema-specifications inflection==0.5.1 # via # -r requirements/test.txt @@ -365,10 +340,6 @@ kombu==5.3.7 # via # -r requirements/test.txt # celery -lazy-object-proxy==1.10.0 - # via - # -r requirements/test.txt - # astroid markupsafe==2.1.5 # via # -r requirements/test.txt @@ -389,7 +360,7 @@ newrelic==9.9.0 # edx-django-utils nh3==0.2.17 # via readme-renderer -numpy==1.24.4 +numpy==1.26.4 # via # -r requirements/test.txt # scikit-learn @@ -415,10 +386,6 @@ pbr==6.0.0 # via # -r requirements/test.txt # stevedore -pkgutil-resolve-name==1.3.10 - # via - # -r requirements/test.txt - # jsonschema platformdirs==4.2.1 # via # -r requirements/test.txt @@ -454,7 +421,7 @@ pydantic-core==2.18.2 # via # -r requirements/test.txt # pydantic -pydata-sphinx-theme==0.14.4 +pydata-sphinx-theme==0.15.2 # via sphinx-book-theme pygments==2.18.0 # via @@ -471,9 +438,8 @@ pyjwt[crypto]==2.8.0 # edx-drf-extensions # edx-rest-api-client # social-auth-core -pylint==2.14.5 +pylint==3.1.0 # via - # -c requirements/constraints.txt # -r requirements/test.txt # edx-lint # pylint-celery @@ -530,9 +496,7 @@ python3-openid==3.2.0 # -r requirements/test.txt # social-auth-core pytz==2024.1 - # via - # -r requirements/test.txt - # babel + # via -r requirements/test.txt pyyaml==6.0.1 # via # -r requirements/test.txt @@ -571,16 +535,16 @@ responses==0.25.0 # via -r requirements/test.txt restructuredtext-lint==1.4.0 # via doc8 -rpds-py==0.18.0 +rpds-py==0.18.1 # via # -r requirements/test.txt # jsonschema # referencing rules==3.3 # via -r requirements/test.txt -scikit-learn==1.3.2 +scikit-learn==1.4.2 # via -r requirements/test.txt -scipy==1.10.1 +scipy==1.13.0 # via # -r requirements/test.txt # scikit-learn @@ -622,24 +586,24 @@ social-auth-core==4.5.4 # social-auth-app-django soupsieve==2.5 # via beautifulsoup4 -sphinx==6.2.1 +sphinx==7.3.7 # via # -r requirements/doc.in # pydata-sphinx-theme # sphinx-book-theme -sphinx-book-theme==1.0.1 +sphinx-book-theme==1.1.2 # via -r requirements/doc.in -sphinxcontrib-applehelp==1.0.4 +sphinxcontrib-applehelp==1.0.8 # via sphinx -sphinxcontrib-devhelp==1.0.2 +sphinxcontrib-devhelp==1.0.6 # via sphinx -sphinxcontrib-htmlhelp==2.0.1 +sphinxcontrib-htmlhelp==2.0.5 # via sphinx sphinxcontrib-jsmath==1.0.1 # via sphinx -sphinxcontrib-qthelp==1.0.3 +sphinxcontrib-qthelp==1.0.7 # via sphinx -sphinxcontrib-serializinghtml==1.1.5 +sphinxcontrib-serializinghtml==1.1.10 # via sphinx sqlparse==0.5.0 # via @@ -660,15 +624,6 @@ threadpoolctl==3.5.0 # via # -r requirements/test.txt # scikit-learn -tomli==2.0.1 - # via - # -r requirements/test.txt - # coverage - # doc8 - # pylint - # pyproject-api - # pytest - # tox tomlkit==0.12.4 # via # -r requirements/test.txt @@ -682,22 +637,14 @@ tqdm==4.66.4 typing-extensions==4.11.0 # via # -r requirements/test.txt - # annotated-types - # anyio - # asgiref - # astroid - # drf-spectacular # edx-opaque-keys - # kombu # openai # pydantic # pydantic-core # pydata-sphinx-theme - # pylint tzdata==2024.1 # via # -r requirements/test.txt - # backports-zoneinfo # celery uritemplate==4.1.1 # via @@ -722,17 +669,10 @@ wcwidth==0.2.13 # via # -r requirements/test.txt # prompt-toolkit -wrapt==1.16.0 - # via - # -r requirements/test.txt - # astroid xlsxwriter==3.2.0 # via -r requirements/test.txt zipp==3.18.1 - # via - # -r requirements/test.txt - # importlib-metadata - # importlib-resources + # via -r requirements/test.txt # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 1b67baa1d..0adf54ba4 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade @@ -8,10 +8,6 @@ build==1.2.1 # via pip-tools click==8.1.7 # via pip-tools -importlib-metadata==6.11.0 - # via - # -c requirements/common_constraints.txt - # build packaging==24.0 # via build pip-tools==7.4.1 @@ -20,14 +16,8 @@ pyproject-hooks==1.1.0 # via # build # pip-tools -tomli==2.0.1 - # via - # build - # pip-tools wheel==0.43.0 # via pip-tools -zipp==3.18.1 - # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/pip.txt b/requirements/pip.txt index e3ffcc7b6..8ed3e6735 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade diff --git a/requirements/production.txt b/requirements/production.txt index 920ac084f..613fa96ea 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade @@ -36,13 +36,6 @@ backoff==1.10.0 # via # -r requirements/base.txt # analytics-python -backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" - # via - # -r requirements/base.txt - # celery - # django - # djangorestframework - # kombu billiard==4.2.0 # via # -r requirements/base.txt @@ -211,10 +204,6 @@ edx-rest-api-client==5.7.0 # via -r requirements/base.txt edx-toggles==5.2.0 # via -r requirements/base.txt -exceptiongroup==1.2.1 - # via - # -r requirements/base.txt - # anyio gevent==24.2.1 # via -r requirements/production.in greenlet==3.0.3 @@ -239,11 +228,6 @@ idna==3.7 # anyio # httpx # requests -importlib-resources==6.4.0 - # via - # -r requirements/base.txt - # jsonschema - # jsonschema-specifications inflection==0.5.1 # via # -r requirements/base.txt @@ -288,7 +272,7 @@ newrelic==9.9.0 # via # -r requirements/base.txt # edx-django-utils -numpy==1.24.4 +numpy==1.26.4 # via # -r requirements/base.txt # scikit-learn @@ -306,10 +290,6 @@ pbr==6.0.0 # via # -r requirements/base.txt # stevedore -pkgutil-resolve-name==1.3.10 - # via - # -r requirements/base.txt - # jsonschema ply==3.11 # via # -r requirements/base.txt @@ -397,16 +377,16 @@ requests-oauthlib==2.0.0 # via # -r requirements/base.txt # social-auth-core -rpds-py==0.18.0 +rpds-py==0.18.1 # via # -r requirements/base.txt # jsonschema # referencing rules==3.3 # via -r requirements/base.txt -scikit-learn==1.3.2 +scikit-learn==1.4.2 # via -r requirements/base.txt -scipy==1.10.1 +scipy==1.13.0 # via # -r requirements/base.txt # scikit-learn @@ -468,19 +448,13 @@ tqdm==4.66.4 typing-extensions==4.11.0 # via # -r requirements/base.txt - # annotated-types - # anyio - # asgiref - # drf-spectacular # edx-opaque-keys - # kombu # openai # pydantic # pydantic-core tzdata==2024.1 # via # -r requirements/base.txt - # backports-zoneinfo # celery uritemplate==4.1.1 # via @@ -503,9 +477,7 @@ wcwidth==0.2.13 xlsxwriter==3.2.0 # via -r requirements/base.txt zipp==3.18.1 - # via - # -r requirements/base.txt - # importlib-resources + # via -r requirements/base.txt zope-event==5.0 # via gevent zope-interface==6.3 diff --git a/requirements/quality.txt b/requirements/quality.txt index 8a7c55147..70b998a85 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade @@ -27,9 +27,8 @@ asgiref==3.8.1 # django # django-cors-headers # django-simple-history -astroid==2.11.7 +astroid==3.1.0 # via - # -c requirements/constraints.txt # pylint # pylint-celery attrs==23.2.0 @@ -41,14 +40,6 @@ backoff==1.10.0 # via # -r requirements/base.txt # analytics-python -backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" - # via - # -c requirements/constraints.txt - # -r requirements/base.txt - # celery - # django - # djangorestframework - # kombu billiard==4.2.0 # via # -r requirements/base.txt @@ -219,10 +210,8 @@ edx-drf-extensions==10.3.0 # via # -r requirements/base.txt # edx-rbac -edx-lint==5.2.5 - # via - # -c requirements/constraints.txt - # -r requirements/quality.in +edx-lint==5.3.6 + # via -r requirements/quality.in edx-opaque-keys==2.9.0 # via # -r requirements/base.txt @@ -233,10 +222,6 @@ edx-rest-api-client==5.7.0 # via -r requirements/base.txt edx-toggles==5.2.0 # via -r requirements/base.txt -exceptiongroup==1.2.1 - # via - # -r requirements/base.txt - # anyio h11==0.14.0 # via # -r requirements/base.txt @@ -255,11 +240,6 @@ idna==3.7 # anyio # httpx # requests -importlib-resources==6.4.0 - # via - # -r requirements/base.txt - # jsonschema - # jsonschema-specifications inflection==0.5.1 # via # -r requirements/base.txt @@ -294,8 +274,6 @@ kombu==5.3.7 # via # -r requirements/base.txt # celery -lazy-object-proxy==1.10.0 - # via astroid markupsafe==2.1.5 # via # -r requirements/base.txt @@ -312,7 +290,7 @@ newrelic==9.9.0 # via # -r requirements/base.txt # edx-django-utils -numpy==1.24.4 +numpy==1.26.4 # via # -r requirements/base.txt # scikit-learn @@ -330,10 +308,6 @@ pbr==6.0.0 # via # -r requirements/base.txt # stevedore -pkgutil-resolve-name==1.3.10 - # via - # -r requirements/base.txt - # jsonschema platformdirs==4.2.1 # via pylint ply==3.11 @@ -372,9 +346,8 @@ pyjwt[crypto]==2.8.0 # edx-drf-extensions # edx-rest-api-client # social-auth-core -pylint==2.14.5 +pylint==3.1.0 # via - # -c requirements/constraints.txt # edx-lint # pylint-celery # pylint-django @@ -441,16 +414,16 @@ requests-oauthlib==2.0.0 # via # -r requirements/base.txt # social-auth-core -rpds-py==0.18.0 +rpds-py==0.18.1 # via # -r requirements/base.txt # jsonschema # referencing rules==3.3 # via -r requirements/base.txt -scikit-learn==1.3.2 +scikit-learn==1.4.2 # via -r requirements/base.txt -scipy==1.10.1 +scipy==1.13.0 # via # -r requirements/base.txt # scikit-learn @@ -508,8 +481,6 @@ threadpoolctl==3.5.0 # via # -r requirements/base.txt # scikit-learn -tomli==2.0.1 - # via pylint tomlkit==0.12.4 # via pylint tqdm==4.66.4 @@ -519,21 +490,13 @@ tqdm==4.66.4 typing-extensions==4.11.0 # via # -r requirements/base.txt - # annotated-types - # anyio - # asgiref - # astroid - # drf-spectacular # edx-opaque-keys - # kombu # openai # pydantic # pydantic-core - # pylint tzdata==2024.1 # via # -r requirements/base.txt - # backports-zoneinfo # celery uritemplate==4.1.1 # via @@ -553,14 +516,10 @@ wcwidth==0.2.13 # via # -r requirements/base.txt # prompt-toolkit -wrapt==1.16.0 - # via astroid xlsxwriter==3.2.0 # via -r requirements/base.txt zipp==3.18.1 - # via - # -r requirements/base.txt - # importlib-resources + # via -r requirements/base.txt # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/test.txt b/requirements/test.txt index d4c8f52e6..30162babd 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade @@ -27,9 +27,8 @@ asgiref==3.8.1 # django # django-cors-headers # django-simple-history -astroid==2.11.7 +astroid==3.1.0 # via - # -c requirements/constraints.txt # pylint # pylint-celery attrs==23.2.0 @@ -41,14 +40,6 @@ backoff==1.10.0 # via # -r requirements/base.txt # analytics-python -backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" - # via - # -c requirements/constraints.txt - # -r requirements/base.txt - # celery - # django - # djangorestframework - # kombu billiard==4.2.0 # via # -r requirements/base.txt @@ -235,10 +226,8 @@ edx-drf-extensions==10.3.0 # via # -r requirements/base.txt # edx-rbac -edx-lint==5.2.5 - # via - # -c requirements/constraints.txt - # -r requirements/test.in +edx-lint==5.3.6 + # via -r requirements/test.in edx-opaque-keys==2.9.0 # via # -r requirements/base.txt @@ -249,11 +238,6 @@ edx-rest-api-client==5.7.0 # via -r requirements/base.txt edx-toggles==5.2.0 # via -r requirements/base.txt -exceptiongroup==1.2.1 - # via - # -r requirements/base.txt - # anyio - # pytest factory-boy==3.3.0 # via -r requirements/test.in faker==25.0.1 @@ -280,11 +264,6 @@ idna==3.7 # anyio # httpx # requests -importlib-resources==6.4.0 - # via - # -r requirements/base.txt - # jsonschema - # jsonschema-specifications inflection==0.5.1 # via # -r requirements/base.txt @@ -319,8 +298,6 @@ kombu==5.3.7 # via # -r requirements/base.txt # celery -lazy-object-proxy==1.10.0 - # via astroid markupsafe==2.1.5 # via # -r requirements/base.txt @@ -337,7 +314,7 @@ newrelic==9.9.0 # via # -r requirements/base.txt # edx-django-utils -numpy==1.24.4 +numpy==1.26.4 # via # -r requirements/base.txt # scikit-learn @@ -360,10 +337,6 @@ pbr==6.0.0 # via # -r requirements/base.txt # stevedore -pkgutil-resolve-name==1.3.10 - # via - # -r requirements/base.txt - # jsonschema platformdirs==4.2.1 # via # pylint @@ -405,9 +378,8 @@ pyjwt[crypto]==2.8.0 # edx-drf-extensions # edx-rest-api-client # social-auth-core -pylint==2.14.5 +pylint==3.1.0 # via - # -c requirements/constraints.txt # edx-lint # pylint-celery # pylint-django @@ -489,16 +461,16 @@ requests-oauthlib==2.0.0 # social-auth-core responses==0.25.0 # via -r requirements/test.in -rpds-py==0.18.0 +rpds-py==0.18.1 # via # -r requirements/base.txt # jsonschema # referencing rules==3.3 # via -r requirements/base.txt -scikit-learn==1.3.2 +scikit-learn==1.4.2 # via -r requirements/base.txt -scipy==1.10.1 +scipy==1.13.0 # via # -r requirements/base.txt # scikit-learn @@ -554,13 +526,6 @@ threadpoolctl==3.5.0 # via # -r requirements/base.txt # scikit-learn -tomli==2.0.1 - # via - # coverage - # pylint - # pyproject-api - # pytest - # tox tomlkit==0.12.4 # via pylint tox==4.15.0 @@ -572,21 +537,13 @@ tqdm==4.66.4 typing-extensions==4.11.0 # via # -r requirements/base.txt - # annotated-types - # anyio - # asgiref - # astroid - # drf-spectacular # edx-opaque-keys - # kombu # openai # pydantic # pydantic-core - # pylint tzdata==2024.1 # via # -r requirements/base.txt - # backports-zoneinfo # celery uritemplate==4.1.1 # via @@ -609,14 +566,10 @@ wcwidth==0.2.13 # via # -r requirements/base.txt # prompt-toolkit -wrapt==1.16.0 - # via astroid xlsxwriter==3.2.0 # via -r requirements/base.txt zipp==3.18.1 - # via - # -r requirements/base.txt - # importlib-resources + # via -r requirements/base.txt # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/test312.txt b/requirements/test312.txt deleted file mode 100644 index c4926131e..000000000 --- a/requirements/test312.txt +++ /dev/null @@ -1,579 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: -# -# make upgrade -# -algoliasearch==3.0.0 - # via -r requirements/base.txt -amqp==5.2.0 - # via - # -r requirements/base.txt - # kombu -analytics-python==1.4.post1 - # via -r requirements/base.txt -annotated-types==0.6.0 - # via - # -r requirements/base.txt - # pydantic -anyio==4.3.0 - # via - # -r requirements/base.txt - # httpx - # openai -asgiref==3.8.1 - # via - # -r requirements/base.txt - # django - # django-cors-headers - # django-simple-history -astroid==2.11.7 - # via - # -c requirements/constraints.txt - # pylint - # pylint-celery -attrs==23.2.0 - # via - # -r requirements/base.txt - # jsonschema - # referencing -backoff==1.10.0 - # via - # -r requirements/base.txt - # analytics-python -billiard==4.2.0 - # via - # -r requirements/base.txt - # celery -cachetools==5.3.3 - # via tox -celery==5.3.6 - # via - # -c requirements/constraints.txt - # -r requirements/base.txt - # django-celery-results - # edx-celeryutils -certifi==2024.2.2 - # via - # -r requirements/base.txt - # httpcore - # httpx - # requests -cffi==1.16.0 - # via - # -r requirements/base.txt - # cryptography - # pynacl -chardet==5.2.0 - # via tox -charset-normalizer==3.3.2 - # via - # -r requirements/base.txt - # requests -click==8.1.7 - # via - # -r requirements/base.txt - # celery - # click-didyoumean - # click-log - # click-plugins - # click-repl - # code-annotations - # edx-django-utils - # edx-lint -click-didyoumean==0.3.1 - # via - # -r requirements/base.txt - # celery -click-log==0.4.0 - # via edx-lint -click-plugins==1.1.1 - # via - # -r requirements/base.txt - # celery -click-repl==0.3.0 - # via - # -r requirements/base.txt - # celery -code-annotations==1.8.0 - # via - # -r requirements/base.txt - # -r requirements/test.in - # edx-lint - # edx-toggles -colorama==0.4.6 - # via tox -coverage[toml]==7.4.4 - # via - # -r requirements/test.in - # pytest-cov -cryptography==42.0.5 - # via - # -r requirements/base.txt - # pyjwt - # social-auth-core -ddt==1.7.2 - # via -r requirements/test.in -defusedxml==0.7.1 - # via - # -r requirements/base.txt - # djangorestframework-xml - # python3-openid - # social-auth-core -dill==0.3.8 - # via pylint -distlib==0.3.8 - # via virtualenv -distro==1.9.0 - # via - # -r requirements/base.txt - # openai - # via - # -c requirements/common_constraints.txt - # -c requirements/constraints.txt - # -r requirements/base.txt - # django-celery-results - # django-clearcache - # django-config-models - # django-cors-headers - # django-crum - # django-extensions - # django-log-request-id - # django-model-utils - # django-waffle - # djangorestframework - # drf-jwt - # drf-spectacular - # edx-auth-backends - # edx-celeryutils - # edx-django-release-util - # edx-django-utils - # edx-drf-extensions - # edx-rbac - # edx-toggles - # jsonfield - # jsonfield2 - # social-auth-app-django -django-celery-results==2.5.1 - # via -r requirements/base.txt -django-clearcache==1.2.1 - # via -r requirements/base.txt -django-config-models==2.7.0 - # via -r requirements/base.txt -django-cors-headers==4.3.1 - # via -r requirements/base.txt -django-crum==0.7.9 - # via - # -r requirements/base.txt - # edx-django-utils - # edx-rbac - # edx-toggles -django-dynamic-fixture==4.0.1 - # via -r requirements/test.in -django-extensions==3.2.3 - # via -r requirements/base.txt -django-log-request-id==2.1.0 - # via -r requirements/base.txt -django-model-utils==4.5.0 - # via - # -r requirements/base.txt - # edx-celeryutils - # edx-rbac -django-simple-history==3.5.0 - # via - # -c requirements/constraints.txt - # -r requirements/base.txt -django-waffle==4.1.0 - # via - # -r requirements/base.txt - # edx-django-utils - # edx-drf-extensions - # edx-toggles -djangoql==0.18.1 - # via -r requirements/base.txt -djangorestframework==3.15.1 - # via - # -r requirements/base.txt - # django-config-models - # drf-jwt - # drf-spectacular - # edx-drf-extensions -djangorestframework-xml==2.0.0 - # via -r requirements/base.txt -drf-jwt==1.19.2 - # via - # -r requirements/base.txt - # edx-drf-extensions -drf-spectacular==0.27.2 - # via -r requirements/base.txt -edx-auth-backends==4.3.0 - # via -r requirements/base.txt -edx-celeryutils==1.3.0 - # via -r requirements/base.txt -edx-django-release-util==1.4.0 - # via -r requirements/base.txt -edx-django-utils==5.12.0 - # via - # -r requirements/base.txt - # django-config-models - # edx-drf-extensions - # edx-rest-api-client - # edx-toggles -edx-drf-extensions==10.3.0 - # via - # -r requirements/base.txt - # edx-rbac -edx-lint==5.2.5 - # via - # -c requirements/constraints.txt - # -r requirements/test.in -edx-opaque-keys==2.5.1 - # via - # -r requirements/base.txt - # edx-drf-extensions -edx-rbac==1.8.0 - # via -r requirements/base.txt -edx-rest-api-client==5.7.0 - # via -r requirements/base.txt -edx-toggles==5.2.0 - # via -r requirements/base.txt -factory-boy==3.3.0 - # via -r requirements/test.in -faker==24.9.0 - # via factory-boy -filelock==3.13.4 - # via - # tox - # virtualenv -h11==0.14.0 - # via - # -r requirements/base.txt - # httpcore -httpcore==1.0.5 - # via - # -r requirements/base.txt - # httpx -httpx==0.27.0 - # via - # -r requirements/base.txt - # openai -idna==3.7 - # via - # -r requirements/base.txt - # anyio - # httpx - # requests -inflection==0.5.1 - # via - # -r requirements/base.txt - # drf-spectacular -iniconfig==2.0.0 - # via pytest -isort==5.13.2 - # via pylint -jinja2==3.1.3 - # via - # -r requirements/base.txt - # code-annotations -joblib==1.4.0 - # via - # -r requirements/base.txt - # scikit-learn -jsonfield==3.1.0 - # via - # -r requirements/base.txt - # edx-celeryutils -jsonfield2==4.0.0.post0 - # via -r requirements/base.txt -jsonschema==4.21.1 - # via - # -r requirements/base.txt - # drf-spectacular -jsonschema-specifications==2023.12.1 - # via - # -r requirements/base.txt - # jsonschema -kombu==5.3.7 - # via - # -r requirements/base.txt - # celery -lazy-object-proxy==1.10.0 - # via astroid -markupsafe==2.1.5 - # via - # -r requirements/base.txt - # jinja2 -mccabe==0.7.0 - # via pylint -monotonic==1.6 - # via - # -r requirements/base.txt - # analytics-python -mysqlclient==2.2.4 - # via -r requirements/base.txt -newrelic==9.8.0 - # via - # -r requirements/base.txt - # edx-django-utils -numpy==1.26.4 - # via - # -r requirements/base.txt - # scikit-learn - # scipy -oauthlib==3.2.2 - # via - # -r requirements/base.txt - # requests-oauthlib - # social-auth-core -openai==1.13.3 - # via - # -c requirements/constraints.txt - # -r requirements/base.txt -packaging==24.0 - # via - # pyproject-api - # pytest - # tox -pbr==6.0.0 - # via - # -r requirements/base.txt - # stevedore -platformdirs==4.2.0 - # via - # pylint - # tox - # virtualenv -pluggy==1.4.0 - # via - # pytest - # tox -ply==3.11 - # via - # -r requirements/base.txt - # djangoql -prompt-toolkit==3.0.43 - # via - # -r requirements/base.txt - # click-repl -psutil==5.9.8 - # via - # -r requirements/base.txt - # edx-django-utils -pycparser==2.22 - # via - # -r requirements/base.txt - # cffi -pydantic==2.7.0 - # via - # -r requirements/base.txt - # openai -pydantic-core==2.18.1 - # via - # -r requirements/base.txt - # pydantic -pyjwt[crypto]==2.8.0 - # via - # -r requirements/base.txt - # drf-jwt - # edx-auth-backends - # edx-drf-extensions - # edx-rest-api-client - # social-auth-core -pylint==2.14.5 - # via - # -c requirements/constraints.txt - # edx-lint - # pylint-celery - # pylint-django - # pylint-plugin-utils -pylint-celery==0.3 - # via edx-lint -pylint-django==2.5.5 - # via edx-lint -pylint-plugin-utils==0.8.2 - # via - # pylint-celery - # pylint-django -pymemcache==4.0.0 - # via -r requirements/base.txt -pymongo==3.13.0 - # via - # -r requirements/base.txt - # edx-opaque-keys -pynacl==1.5.0 - # via - # -r requirements/base.txt - # edx-django-utils -pyproject-api==1.6.1 - # via tox -pytest==8.1.1 - # via - # pytest-cov - # pytest-django -pytest-cov==5.0.0 - # via -r requirements/test.in -pytest-django==4.8.0 - # via -r requirements/test.in -python-dateutil==2.9.0.post0 - # via - # -r requirements/base.txt - # analytics-python - # celery - # faker -python-slugify==8.0.4 - # via - # -r requirements/base.txt - # code-annotations -python3-openid==3.2.0 - # via - # -r requirements/base.txt - # social-auth-core -pytz==2024.1 - # via -r requirements/base.txt -pyyaml==6.0.1 - # via - # -r requirements/base.txt - # code-annotations - # drf-spectacular - # edx-django-release-util - # responses -redis==3.5.3 - # via - # -c requirements/constraints.txt - # -r requirements/base.txt -referencing==0.34.0 - # via - # -r requirements/base.txt - # jsonschema - # jsonschema-specifications -requests==2.31.0 - # via - # -r requirements/base.txt - # algoliasearch - # analytics-python - # edx-drf-extensions - # edx-rest-api-client - # requests-oauthlib - # responses - # slumber - # social-auth-core -requests-oauthlib==2.0.0 - # via - # -r requirements/base.txt - # social-auth-core -responses==0.25.0 - # via -r requirements/test.in -rpds-py==0.18.0 - # via - # -r requirements/base.txt - # jsonschema - # referencing -rules==3.3 - # via -r requirements/base.txt -scikit-learn==1.4.2 - # via -r requirements/base.txt -scipy==1.13.0 - # via - # -r requirements/base.txt - # scikit-learn -semantic-version==2.10.0 - # via - # -r requirements/base.txt - # edx-drf-extensions -simplejson==3.19.2 - # via -r requirements/base.txt -six==1.16.0 - # via - # -r requirements/base.txt - # analytics-python - # edx-auth-backends - # edx-django-release-util - # edx-lint - # edx-rbac - # python-dateutil -slumber==0.7.1 - # via - # -r requirements/base.txt - # edx-rest-api-client -sniffio==1.3.1 - # via - # -r requirements/base.txt - # anyio - # httpx - # openai -social-auth-app-django==5.4.0 - # via - # -r requirements/base.txt - # edx-auth-backends -social-auth-core==4.5.3 - # via - # -r requirements/base.txt - # edx-auth-backends - # social-auth-app-django -sqlparse==0.5.0 - # via - # -r requirements/base.txt - # django -stevedore==5.2.0 - # via - # -r requirements/base.txt - # code-annotations - # edx-django-utils - # edx-opaque-keys -text-unidecode==1.3 - # via - # -r requirements/base.txt - # python-slugify -threadpoolctl==3.4.0 - # via - # -r requirements/base.txt - # scikit-learn -tomlkit==0.12.4 - # via pylint -tox==4.14.2 - # via -r requirements/test.in -tqdm==4.66.2 - # via - # -r requirements/base.txt - # openai -typing-extensions==4.11.0 - # via - # -r requirements/base.txt - # edx-opaque-keys - # openai - # pydantic - # pydantic-core -tzdata==2024.1 - # via - # -r requirements/base.txt - # celery -uritemplate==4.1.1 - # via - # -r requirements/base.txt - # drf-spectacular -urllib3==2.2.1 - # via - # -r requirements/base.txt - # requests - # responses -vine==5.1.0 - # via - # -r requirements/base.txt - # amqp - # celery - # kombu -virtualenv==20.25.3 - # via tox -wcwidth==0.2.13 - # via - # -r requirements/base.txt - # prompt-toolkit -wrapt==1.16.0 - # via astroid -xlsxwriter==3.2.0 - # via -r requirements/base.txt -zipp==3.18.1 - # via -r requirements/base.txt - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/requirements/validation.txt b/requirements/validation.txt index 0cf6f0db4..f161851d4 100644 --- a/requirements/validation.txt +++ b/requirements/validation.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade @@ -35,9 +35,8 @@ asgiref==3.8.1 # django # django-cors-headers # django-simple-history -astroid==2.11.7 +astroid==3.1.0 # via - # -c requirements/constraints.txt # -r requirements/quality.txt # -r requirements/test.txt # pylint @@ -53,15 +52,6 @@ backoff==1.10.0 # -r requirements/quality.txt # -r requirements/test.txt # analytics-python -backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" - # via - # -c requirements/constraints.txt - # -r requirements/quality.txt - # -r requirements/test.txt - # celery - # django - # djangorestframework - # kombu billiard==4.2.0 # via # -r requirements/quality.txt @@ -309,9 +299,8 @@ edx-drf-extensions==10.3.0 # -r requirements/quality.txt # -r requirements/test.txt # edx-rbac -edx-lint==5.2.5 +edx-lint==5.3.6 # via - # -c requirements/constraints.txt # -r requirements/quality.txt # -r requirements/test.txt edx-opaque-keys==2.9.0 @@ -331,12 +320,6 @@ edx-toggles==5.2.0 # via # -r requirements/quality.txt # -r requirements/test.txt -exceptiongroup==1.2.1 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # anyio - # pytest factory-boy==3.3.0 # via -r requirements/test.txt faker==25.0.1 @@ -370,12 +353,6 @@ idna==3.7 # anyio # httpx # requests -importlib-resources==6.4.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # jsonschema - # jsonschema-specifications inflection==0.5.1 # via # -r requirements/quality.txt @@ -424,11 +401,6 @@ kombu==5.3.7 # -r requirements/quality.txt # -r requirements/test.txt # celery -lazy-object-proxy==1.10.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # astroid markupsafe==2.1.5 # via # -r requirements/quality.txt @@ -453,7 +425,7 @@ newrelic==9.9.0 # -r requirements/quality.txt # -r requirements/test.txt # edx-django-utils -numpy==1.24.4 +numpy==1.26.4 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -481,11 +453,6 @@ pbr==6.0.0 # -r requirements/quality.txt # -r requirements/test.txt # stevedore -pkgutil-resolve-name==1.3.10 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # jsonschema platformdirs==4.2.1 # via # -r requirements/quality.txt @@ -541,9 +508,8 @@ pyjwt[crypto]==2.8.0 # edx-drf-extensions # edx-rest-api-client # social-auth-core -pylint==2.14.5 +pylint==3.1.0 # via - # -c requirements/constraints.txt # -r requirements/quality.txt # -r requirements/test.txt # edx-lint @@ -652,7 +618,7 @@ requests-oauthlib==2.0.0 # social-auth-core responses==0.25.0 # via -r requirements/test.txt -rpds-py==0.18.0 +rpds-py==0.18.1 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -662,11 +628,11 @@ rules==3.3 # via # -r requirements/quality.txt # -r requirements/test.txt -scikit-learn==1.3.2 +scikit-learn==1.4.2 # via # -r requirements/quality.txt # -r requirements/test.txt -scipy==1.10.1 +scipy==1.13.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -739,15 +705,6 @@ threadpoolctl==3.5.0 # -r requirements/quality.txt # -r requirements/test.txt # scikit-learn -tomli==2.0.1 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # coverage - # pylint - # pyproject-api - # pytest - # tox tomlkit==0.12.4 # via # -r requirements/quality.txt @@ -764,22 +721,14 @@ typing-extensions==4.11.0 # via # -r requirements/quality.txt # -r requirements/test.txt - # annotated-types - # anyio - # asgiref - # astroid - # drf-spectacular # edx-opaque-keys - # kombu # openai # pydantic # pydantic-core - # pylint tzdata==2024.1 # via # -r requirements/quality.txt # -r requirements/test.txt - # backports-zoneinfo # celery uritemplate==4.1.1 # via @@ -808,11 +757,6 @@ wcwidth==0.2.13 # -r requirements/quality.txt # -r requirements/test.txt # prompt-toolkit -wrapt==1.16.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # astroid xlsxwriter==3.2.0 # via # -r requirements/quality.txt @@ -821,7 +765,6 @@ zipp==3.18.1 # via # -r requirements/quality.txt # -r requirements/test.txt - # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/tox.ini b/tox.ini index ef20b2c46..bfab24aa3 100644 --- a/tox.ini +++ b/tox.ini @@ -1,17 +1,10 @@ [tox] skipsdist = true -envlist = py{38, 312}-django{42} +envlist = py{312}-django{42} -[testenv:py38-django42] +[testenv] deps = django42: Django>=4.2,<5.0 -r{toxinidir}/requirements/test.txt commands = {posargs:pytest} - -[testenv:py312-django42] -deps = - django42: Django>=4.2,<5.0 - -r{toxinidir}/requirements/test312.txt -commands = - {posargs:pytest} diff --git a/validate.sh b/validate.sh index 2db4d40fa..cf15e59dc 100755 --- a/validate.sh +++ b/validate.sh @@ -6,11 +6,7 @@ export DJANGO_SETTINGS_MODULE=enterprise_catalog.settings.test cd /edx/app/enterprise_catalog/enterprise_catalog -if [[ "$TOXENV" == "py38-django42" ]]; then - make requirements -elif [[ "$TOXENV" == "py312-django42" ]]; then - make requirements312 -fi +make requirements # Alex Dusenbery 2022-04-12: This is failing CI for a reason I don't understand # and I don't know why we care about translations here, anyway.