From f838857a37bcf17d3726f91339aa2163f42af0de Mon Sep 17 00:00:00 2001 From: Usama Sadiq Date: Mon, 9 Sep 2024 20:40:00 +0500 Subject: [PATCH] feat!: Python 3.11 Upgrade --- .github/workflows/ci.yml | 8 +++ .github/workflows/mysql8-migrations.yml | 4 ++ .../workflows/upgrade-python-requirements.yml | 4 ++ Dockerfile | 25 ++++++++- requirements/base.txt | 40 +++++++-------- requirements/ci.txt | 4 ++ requirements/constraints.txt | 5 ++ requirements/dev.txt | 38 +++++++------- requirements/django.txt | 2 +- requirements/doc.txt | 51 +++++++++---------- requirements/pip.txt | 6 ++- requirements/pip_tools.txt | 14 ++--- requirements/production.txt | 38 +++++++------- requirements/test.txt | 46 +++++++---------- requirements/tox.txt | 16 +++--- tox.ini | 4 ++ 16 files changed, 166 insertions(+), 139 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7b548116..b10ec65d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,11 @@ jobs: os: - ubuntu-20.04 python-version: +<<<<<<< Updated upstream - 3.8 +======= + - 3.11 +>>>>>>> Stashed changes targets: [ 'quality','main.test','docs' ] steps: @@ -40,7 +44,11 @@ jobs: && export TOXENV=django42 && make test.requirements tox.requirements ${{ matrix.targets }}" - name: Run Coverage +<<<<<<< Updated upstream if: matrix.python-version == '3.8' && matrix.targets=='main.test' +======= + if: matrix.python-version == '3.11' && matrix.targets=='main.test' +>>>>>>> Stashed changes uses: codecov/codecov-action@v1 with: fail_ci_if_error: true diff --git a/.github/workflows/mysql8-migrations.yml b/.github/workflows/mysql8-migrations.yml index 4ca91459..7f11e017 100644 --- a/.github/workflows/mysql8-migrations.yml +++ b/.github/workflows/mysql8-migrations.yml @@ -14,7 +14,11 @@ jobs: strategy: matrix: os: [ ubuntu-20.04 ] +<<<<<<< Updated upstream python-version: [ 3.8 ] +======= + python-version: [ 3.11 ] +>>>>>>> Stashed changes steps: - name: Checkout repo diff --git a/.github/workflows/upgrade-python-requirements.yml b/.github/workflows/upgrade-python-requirements.yml index 8b797093..1193da35 100644 --- a/.github/workflows/upgrade-python-requirements.yml +++ b/.github/workflows/upgrade-python-requirements.yml @@ -21,6 +21,10 @@ jobs: # team_reviewers: "" email_address: "cosmonauts-requirements-update@2u-internal.opsgenie.net" send_success_notification: true +<<<<<<< Updated upstream +======= + python_version: 3.11 +>>>>>>> Stashed changes 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 71026f2a..02cc37b0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,10 +2,24 @@ FROM ubuntu:focal as base # System requirements. +<<<<<<< Updated upstream +======= +# ENV variables for Python 3.11 support +ARG PYTHON_VERSION=3.11 +ENV TZ=UTC +ENV TERM=xterm-256color +ENV DEBIAN_FRONTEND=noninteractive + +# software-properties-common is needed to setup Python 3.12 env +RUN apt-get update && \ + apt-get install -y software-properties-common && \ + apt-add-repository -y ppa:deadsnakes/ppa + +>>>>>>> Stashed changes # pkg-config; mysqlclient>=2.2.0 requires pkg-config (https://github.com/PyMySQL/mysqlclient/issues/620) -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -qy \ +RUN apt-get update && \ + apt-get install -qy \ curl \ vim \ language-pack-en \ @@ -18,6 +32,13 @@ RUN apt update && \ libssl-dev && \ rm -rf /var/lib/apt/lists/* +<<<<<<< Updated upstream +======= +# need to use virtualenv pypi package with Python 3.12 +RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python${PYTHON_VERSION} +RUN pip install virtualenv + +>>>>>>> Stashed changes # Use UTF-8. RUN locale-gen en_US.UTF-8 ENV LANG en_US.UTF-8 diff --git a/requirements/base.txt b/requirements/base.txt index 2a744a27..c896024c 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,5 +1,9 @@ # +<<<<<<< Updated upstream # This file is autogenerated by pip-compile with Python 3.8 +======= +# This file is autogenerated by pip-compile with Python 3.11 +>>>>>>> Stashed changes # by the following command: # # make upgrade @@ -15,15 +19,15 @@ backports-zoneinfo==0.2.1 # djangorestframework boto==2.49.0 # via -r requirements/base.in -boto3==1.35.8 +boto3==1.35.14 # via -r requirements/base.in -botocore==1.35.8 +botocore==1.35.14 # via # boto3 # s3transfer -certifi==2024.7.4 +certifi==2024.8.30 # via requests -cffi==1.17.0 +cffi==1.17.1 # via # cryptography # pynacl @@ -35,11 +39,11 @@ coreapi==2.3.3 # via -r requirements/base.in coreschema==0.0.4 # via coreapi -cryptography==43.0.0 +cryptography==43.0.1 # via # django-fernet-fields-v2 # pyjwt -django==4.2.15 +django==4.2.16 # via # -c requirements/constraints.txt # -r requirements/base.in @@ -71,7 +75,7 @@ django-fernet-fields-v2==0.9 # via edx-enterprise-data django-filter==24.3 # via edx-enterprise-data -django-model-utils==4.5.1 +django-model-utils==5.0.0 # via # edx-enterprise-data # edx-rbac @@ -113,14 +117,14 @@ edx-django-utils==5.15.0 # edx-drf-extensions # edx-enterprise-data # edx-rest-api-client -edx-drf-extensions==10.3.0 +edx-drf-extensions==10.4.0 # via # -r requirements/base.in # edx-enterprise-data # edx-rbac -edx-enterprise-data==8.11.0 +edx-enterprise-data==8.11.1 # via -r requirements/base.in -edx-opaque-keys==2.10.0 +edx-opaque-keys==2.11.0 # via # -r requirements/base.in # edx-ccx-keys @@ -128,20 +132,18 @@ edx-opaque-keys==2.10.0 # edx-enterprise-data edx-rbac==1.10.0 # via edx-enterprise-data -edx-rest-api-client==5.7.1 +edx-rest-api-client==6.0.0 # via # -r requirements/base.in # edx-enterprise-data factory-boy==3.3.1 # via edx-enterprise-data -faker==28.0.0 +faker==28.4.1 # via factory-boy html5lib==1.1 # via -r requirements/base.in idna==3.8 # via requests -importlib-metadata==8.4.0 - # via markdown inflection==0.5.1 # via drf-yasg itypes==1.2.0 @@ -208,8 +210,7 @@ requests==2.32.3 # edx-drf-extensions # edx-enterprise-data # edx-rest-api-client - # slumber -rules==3.4 +rules==3.5 # via edx-enterprise-data s3transfer==0.10.2 # via boto3 @@ -222,8 +223,6 @@ six==1.16.0 # edx-rbac # html5lib # python-dateutil -slumber==0.7.1 - # via edx-rest-api-client sqlparse==0.5.1 # via django stevedore==5.3.0 @@ -243,16 +242,13 @@ uritemplate==4.1.1 # via # coreapi # drf-yasg -urllib3==1.26.19 +urllib3==2.2.2 # via - # -c requirements/constraints.txt # -r requirements/base.in # botocore # requests webencodings==0.5.1 # via html5lib -zipp==3.20.1 - # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/ci.txt b/requirements/ci.txt index c52b940f..a1b2aa3d 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -1,5 +1,9 @@ # +<<<<<<< Updated upstream # This file is autogenerated by pip-compile with Python 3.8 +======= +# This file is autogenerated by pip-compile with Python 3.11 +>>>>>>> Stashed changes # by the following command: # # make upgrade diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 829e5a87..38a131e9 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -25,5 +25,10 @@ elasticsearch-dsl>=7.2.1,<8.0.0 pylint==2.4.4 pylint-django==2.0.11 +<<<<<<< Updated upstream # botocore 1.34.144 depends on urllib3<1.27 and >=1.25.4; python_version < "3.10" urllib3<2.0.0 +======= +# path>16.14.0 has removed the deprecated abspath function, which is breaking the docs build +path<16.15.0 +>>>>>>> Stashed changes diff --git a/requirements/dev.txt b/requirements/dev.txt index 01561887..26d3429e 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,5 +1,9 @@ # +<<<<<<< Updated upstream # This file is autogenerated by pip-compile with Python 3.8 +======= +# This file is autogenerated by pip-compile with Python 3.11 +>>>>>>> Stashed changes # by the following command: # # make upgrade @@ -15,15 +19,15 @@ backports-zoneinfo==0.2.1 # djangorestframework boto==2.49.0 # via -r requirements/base.in -boto3==1.35.8 +boto3==1.35.14 # via -r requirements/base.in -botocore==1.35.8 +botocore==1.35.14 # via # boto3 # s3transfer -certifi==2024.7.4 +certifi==2024.8.30 # via requests -cffi==1.17.0 +cffi==1.17.1 # via # cryptography # pynacl @@ -35,11 +39,11 @@ coreapi==2.3.3 # via -r requirements/base.in coreschema==0.0.4 # via coreapi -cryptography==43.0.0 +cryptography==43.0.1 # via # django-fernet-fields-v2 # pyjwt -django==4.2.15 +django==4.2.16 # via # -c requirements/constraints.txt # -r requirements/base.in @@ -71,7 +75,7 @@ django-fernet-fields-v2==0.9 # via edx-enterprise-data django-filter==24.3 # via edx-enterprise-data -django-model-utils==4.5.1 +django-model-utils==5.0.0 # via # edx-enterprise-data # edx-rbac @@ -113,14 +117,14 @@ edx-django-utils==5.15.0 # edx-drf-extensions # edx-enterprise-data # edx-rest-api-client -edx-drf-extensions==10.3.0 +edx-drf-extensions==10.4.0 # via # -r requirements/base.in # edx-enterprise-data # edx-rbac edx-enterprise-data==8.11.1 # via -r requirements/base.in -edx-opaque-keys==2.10.0 +edx-opaque-keys==2.11.0 # via # -r requirements/base.in # edx-ccx-keys @@ -128,20 +132,18 @@ edx-opaque-keys==2.10.0 # edx-enterprise-data edx-rbac==1.10.0 # via edx-enterprise-data -edx-rest-api-client==5.7.1 +edx-rest-api-client==6.0.0 # via # -r requirements/base.in # edx-enterprise-data factory-boy==3.3.1 # via edx-enterprise-data -faker==28.0.0 +faker==28.4.1 # via factory-boy html5lib==1.1 # via -r requirements/base.in idna==3.8 # via requests -importlib-metadata==8.4.0 - # via markdown inflection==0.5.1 # via drf-yasg itypes==1.2.0 @@ -210,8 +212,7 @@ requests==2.32.3 # edx-drf-extensions # edx-enterprise-data # edx-rest-api-client - # slumber -rules==3.4 +rules==3.5 # via edx-enterprise-data s3transfer==0.10.2 # via boto3 @@ -224,8 +225,6 @@ six==1.16.0 # edx-rbac # html5lib # python-dateutil -slumber==0.7.1 - # via edx-rest-api-client sqlparse==0.5.1 # via django stevedore==5.3.0 @@ -245,16 +244,13 @@ uritemplate==4.1.1 # via # coreapi # drf-yasg -urllib3==1.26.19 +urllib3==2.2.2 # via - # -c requirements/constraints.txt # -r requirements/base.in # botocore # requests webencodings==0.5.1 # via html5lib -zipp==3.20.1 - # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/django.txt b/requirements/django.txt index 16bc98be..64aaf996 100644 --- a/requirements/django.txt +++ b/requirements/django.txt @@ -1 +1 @@ -django==4.2.15 +django==4.2.16 diff --git a/requirements/doc.txt b/requirements/doc.txt index ffa237f9..0b6315d8 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -1,5 +1,9 @@ # +<<<<<<< Updated upstream # This file is autogenerated by pip-compile with Python 3.8 +======= +# This file is autogenerated by pip-compile with Python 3.11 +>>>>>>> Stashed changes # by the following command: # # make upgrade @@ -25,15 +29,15 @@ beautifulsoup4==4.12.3 # via pydata-sphinx-theme boto==2.49.0 # via -r requirements/base.in -boto3==1.35.8 +boto3==1.35.14 # via -r requirements/base.in -botocore==1.35.8 +botocore==1.35.14 # via # boto3 # s3transfer -certifi==2024.7.4 +certifi==2024.8.30 # via requests -cffi==1.17.0 +cffi==1.17.1 # via # cryptography # pynacl @@ -45,11 +49,11 @@ coreapi==2.3.3 # via -r requirements/base.in coreschema==0.0.4 # via coreapi -cryptography==43.0.0 +cryptography==43.0.1 # via # django-fernet-fields-v2 # pyjwt -django==4.2.15 +django==4.2.16 # via # -c requirements/constraints.txt # -r requirements/base.in @@ -81,7 +85,7 @@ django-fernet-fields-v2==0.9 # via edx-enterprise-data django-filter==24.3 # via edx-enterprise-data -django-model-utils==4.5.1 +django-model-utils==5.0.0 # via # edx-enterprise-data # edx-rbac @@ -127,14 +131,14 @@ edx-django-utils==5.15.0 # edx-drf-extensions # edx-enterprise-data # edx-rest-api-client -edx-drf-extensions==10.3.0 +edx-drf-extensions==10.4.0 # via # -r requirements/base.in # edx-enterprise-data # edx-rbac edx-enterprise-data==8.11.1 # via -r requirements/base.in -edx-opaque-keys==2.10.0 +edx-opaque-keys==2.11.0 # via # -r requirements/base.in # edx-ccx-keys @@ -142,13 +146,13 @@ edx-opaque-keys==2.10.0 # edx-enterprise-data edx-rbac==1.10.0 # via edx-enterprise-data -edx-rest-api-client==5.7.1 +edx-rest-api-client==6.0.0 # via # -r requirements/base.in # edx-enterprise-data factory-boy==3.3.1 # via edx-enterprise-data -faker==28.0.0 +faker==28.4.1 # via factory-boy html5lib==1.1 # via -r requirements/base.in @@ -156,10 +160,6 @@ idna==3.8 # via requests imagesize==1.4.1 # via sphinx -importlib-metadata==8.4.0 - # via - # markdown - # sphinx inflection==0.5.1 # via drf-yasg itypes==1.2.0 @@ -193,8 +193,10 @@ packaging==24.1 # sphinx pandas==2.0.3 # via edx-enterprise-data -path==17.0.0 - # via -r requirements/doc.in +path==16.14.0 + # via + # -c requirements/constraints.txt + # -r requirements/doc.in pbr==6.1.0 # via stevedore psutil==6.0.0 @@ -228,7 +230,6 @@ python-memcached==1.62 # via -r requirements/base.in pytz==2024.1 # via - # babel # drf-yasg # pandas pyyaml==6.0.2 @@ -241,9 +242,8 @@ requests==2.32.3 # edx-drf-extensions # edx-enterprise-data # edx-rest-api-client - # slumber # sphinx -rules==3.4 +rules==3.5 # via edx-enterprise-data s3transfer==0.10.2 # via boto3 @@ -256,13 +256,15 @@ six==1.16.0 # edx-rbac # html5lib # python-dateutil -slumber==0.7.1 - # via edx-rest-api-client snowballstemmer==2.2.0 # via sphinx soupsieve==2.6 # via beautifulsoup4 +<<<<<<< Updated upstream sphinx==6.2.1 +======= +sphinx==8.0.2 +>>>>>>> Stashed changes # via # -r requirements/doc.in # pydata-sphinx-theme @@ -301,16 +303,13 @@ uritemplate==4.1.1 # via # coreapi # drf-yasg -urllib3==1.26.19 +urllib3==2.2.2 # via - # -c requirements/constraints.txt # -r requirements/base.in # botocore # requests webencodings==0.5.1 # via html5lib -zipp==3.20.1 - # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/pip.txt b/requirements/pip.txt index f3fa6b47..b59e9cf7 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,5 +1,9 @@ # +<<<<<<< Updated upstream # This file is autogenerated by pip-compile with Python 3.8 +======= +# This file is autogenerated by pip-compile with Python 3.11 +>>>>>>> Stashed changes # by the following command: # # pip-compile --allow-unsafe --output-file=requirements/pip.txt requirements/pip.in @@ -10,5 +14,5 @@ wheel==0.44.0 # The following packages are considered to be unsafe in a requirements file: pip==24.2 # via -r requirements/pip.in -setuptools==74.0.0 +setuptools==74.1.2 # via -r requirements/pip.in diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index 290fd324..e7e6147d 100644 --- a/requirements/pip_tools.txt +++ b/requirements/pip_tools.txt @@ -1,15 +1,17 @@ # +<<<<<<< Updated upstream # This file is autogenerated by pip-compile with Python 3.8 +======= +# This file is autogenerated by pip-compile with Python 3.11 +>>>>>>> Stashed changes # by the following command: # # make upgrade # -build==1.2.1 +build==1.2.2 # via pip-tools click==8.1.7 # via pip-tools -importlib-metadata==8.4.0 - # via build packaging==24.1 # via build pip-tools==7.4.1 @@ -20,14 +22,8 @@ pyproject-hooks==1.1.0 # pip-tools six==1.16.0 # via -r requirements/pip_tools.in -tomli==2.0.1 - # via - # build - # pip-tools wheel==0.44.0 # via pip-tools -zipp==3.20.1 - # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/production.txt b/requirements/production.txt index 99f67a33..951572d3 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -1,5 +1,9 @@ # +<<<<<<< Updated upstream # This file is autogenerated by pip-compile with Python 3.8 +======= +# This file is autogenerated by pip-compile with Python 3.11 +>>>>>>> Stashed changes # by the following command: # # make upgrade @@ -15,15 +19,15 @@ backports-zoneinfo==0.2.1 # djangorestframework boto==2.49.0 # via -r requirements/base.in -boto3==1.35.8 +boto3==1.35.14 # via -r requirements/base.in -botocore==1.35.8 +botocore==1.35.14 # via # boto3 # s3transfer -certifi==2024.7.4 +certifi==2024.8.30 # via requests -cffi==1.17.0 +cffi==1.17.1 # via # cryptography # pynacl @@ -35,11 +39,11 @@ coreapi==2.3.3 # via -r requirements/base.in coreschema==0.0.4 # via coreapi -cryptography==43.0.0 +cryptography==43.0.1 # via # django-fernet-fields-v2 # pyjwt -django==4.2.15 +django==4.2.16 # via # -c requirements/constraints.txt # -r requirements/base.in @@ -71,7 +75,7 @@ django-fernet-fields-v2==0.9 # via edx-enterprise-data django-filter==24.3 # via edx-enterprise-data -django-model-utils==4.5.1 +django-model-utils==5.0.0 # via # edx-enterprise-data # edx-rbac @@ -113,14 +117,14 @@ edx-django-utils==5.15.0 # edx-drf-extensions # edx-enterprise-data # edx-rest-api-client -edx-drf-extensions==10.3.0 +edx-drf-extensions==10.4.0 # via # -r requirements/base.in # edx-enterprise-data # edx-rbac edx-enterprise-data==8.11.1 # via -r requirements/base.in -edx-opaque-keys==2.10.0 +edx-opaque-keys==2.11.0 # via # -r requirements/base.in # edx-ccx-keys @@ -128,13 +132,13 @@ edx-opaque-keys==2.10.0 # edx-enterprise-data edx-rbac==1.10.0 # via edx-enterprise-data -edx-rest-api-client==5.7.1 +edx-rest-api-client==6.0.0 # via # -r requirements/base.in # edx-enterprise-data factory-boy==3.3.1 # via edx-enterprise-data -faker==28.0.0 +faker==28.4.1 # via factory-boy gevent==24.2.1 # via -r requirements/production.in @@ -146,8 +150,6 @@ html5lib==1.1 # via -r requirements/base.in idna==3.8 # via requests -importlib-metadata==8.4.0 - # via markdown inflection==0.5.1 # via drf-yasg itypes==1.2.0 @@ -223,8 +225,7 @@ requests==2.32.3 # edx-drf-extensions # edx-enterprise-data # edx-rest-api-client - # slumber -rules==3.4 +rules==3.5 # via edx-enterprise-data s3transfer==0.10.2 # via boto3 @@ -237,8 +238,6 @@ six==1.16.0 # edx-rbac # html5lib # python-dateutil -slumber==0.7.1 - # via edx-rest-api-client sqlparse==0.5.1 # via django stevedore==5.3.0 @@ -258,16 +257,13 @@ uritemplate==4.1.1 # via # coreapi # drf-yasg -urllib3==1.26.19 +urllib3==2.2.2 # via - # -c requirements/constraints.txt # -r requirements/base.in # botocore # requests webencodings==0.5.1 # via html5lib -zipp==3.20.1 - # via importlib-metadata zope-event==5.0 # via gevent zope-interface==7.0.3 diff --git a/requirements/test.txt b/requirements/test.txt index 42bcb999..62a3c2c8 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,5 +1,9 @@ # +<<<<<<< Updated upstream # This file is autogenerated by pip-compile with Python 3.8 +======= +# This file is autogenerated by pip-compile with Python 3.11 +>>>>>>> Stashed changes # by the following command: # # make upgrade @@ -17,15 +21,15 @@ backports-zoneinfo==0.2.1 # djangorestframework boto==2.49.0 # via -r requirements/base.in -boto3==1.35.8 +boto3==1.35.14 # via -r requirements/base.in -botocore==1.35.8 +botocore==1.35.14 # via # boto3 # s3transfer -certifi==2024.7.4 +certifi==2024.8.30 # via requests -cffi==1.17.0 +cffi==1.17.1 # via # cryptography # pynacl @@ -43,13 +47,13 @@ coverage[toml]==7.6.1 # via # -r requirements/test.in # pytest-cov -cryptography==43.0.0 +cryptography==43.0.1 # via # django-fernet-fields-v2 # pyjwt ddt==1.7.2 # via -r requirements/test.in -diff-cover==9.1.1 +diff-cover==9.2.0 # via -r requirements/test.in # via # -c requirements/constraints.txt @@ -84,7 +88,7 @@ django-fernet-fields-v2==0.9 # via edx-enterprise-data django-filter==24.3 # via edx-enterprise-data -django-model-utils==4.5.1 +django-model-utils==5.0.0 # via # edx-enterprise-data # edx-rbac @@ -126,14 +130,14 @@ edx-django-utils==5.15.0 # edx-drf-extensions # edx-enterprise-data # edx-rest-api-client -edx-drf-extensions==10.3.0 +edx-drf-extensions==10.4.0 # via # -r requirements/base.in # edx-enterprise-data # edx-rbac edx-enterprise-data==8.11.1 # via -r requirements/base.in -edx-opaque-keys==2.10.0 +edx-opaque-keys==2.11.0 # via # -r requirements/base.in # edx-ccx-keys @@ -141,15 +145,13 @@ edx-opaque-keys==2.10.0 # edx-enterprise-data edx-rbac==1.10.0 # via edx-enterprise-data -edx-rest-api-client==5.7.1 +edx-rest-api-client==6.0.0 # via # -r requirements/base.in # edx-enterprise-data -exceptiongroup==1.2.2 - # via pytest factory-boy==3.3.1 # via edx-enterprise-data -faker==28.0.0 +faker==28.4.1 # via factory-boy freezegun==1.5.1 # via -r requirements/test.in @@ -157,8 +159,6 @@ html5lib==1.1 # via -r requirements/base.in idna==3.8 # via requests -importlib-metadata==8.4.0 - # via markdown inflection==0.5.1 # via drf-yasg iniconfig==2.0.0 @@ -236,7 +236,7 @@ pytest==8.3.2 # pytest-django pytest-cov==5.0.0 # via -r requirements/test.in -pytest-django==4.8.0 +pytest-django==4.9.0 # via -r requirements/test.in python-dateutil==2.9.0.post0 # via @@ -263,10 +263,9 @@ requests==2.32.3 # edx-enterprise-data # edx-rest-api-client # responses - # slumber responses==0.25.3 # via -r requirements/test.in -rules==3.4 +rules==3.5 # via edx-enterprise-data s3transfer==0.10.2 # via boto3 @@ -280,8 +279,6 @@ six==1.16.0 # edx-rbac # html5lib # python-dateutil -slumber==0.7.1 - # via edx-rest-api-client snowballstemmer==2.2.0 # via pydocstyle sqlparse==0.5.1 @@ -290,10 +287,6 @@ stevedore==5.3.0 # via # edx-django-utils # edx-opaque-keys -tomli==2.0.1 - # via - # coverage - # pytest tqdm==4.66.5 # via -r requirements/base.in typing-extensions==4.12.2 @@ -307,9 +300,8 @@ uritemplate==4.1.1 # via # coreapi # drf-yasg -urllib3==1.26.19 +urllib3==2.2.2 # via - # -c requirements/constraints.txt # -r requirements/base.in # botocore # requests @@ -318,8 +310,6 @@ webencodings==0.5.1 # via html5lib wrapt==1.11.2 # via astroid -zipp==3.20.1 - # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/tox.txt b/requirements/tox.txt index 71ceb495..75ceacbc 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -1,5 +1,9 @@ # +<<<<<<< Updated upstream # This file is autogenerated by pip-compile with Python 3.8 +======= +# This file is autogenerated by pip-compile with Python 3.11 +>>>>>>> Stashed changes # by the following command: # # make upgrade @@ -12,7 +16,7 @@ colorama==0.4.6 # via tox distlib==0.3.8 # via virtualenv -filelock==3.15.4 +filelock==3.16.0 # via # tox # virtualenv @@ -20,7 +24,7 @@ packaging==24.1 # via # pyproject-api # tox -platformdirs==4.2.2 +platformdirs==4.3.2 # via # tox # virtualenv @@ -28,11 +32,7 @@ pluggy==1.5.0 # via tox pyproject-api==1.7.1 # via tox -tomli==2.0.1 - # via - # pyproject-api - # tox -tox==4.18.0 +tox==4.18.1 # via -r requirements/tox.in -virtualenv==20.26.3 +virtualenv==20.26.4 # via tox diff --git a/tox.ini b/tox.ini index d188d1d4..26901b71 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,10 @@ [tox] skipsdist = True +<<<<<<< Updated upstream envlist = py38-django{42} +======= +envlist = py311-django{42} +>>>>>>> Stashed changes [testenv] passenv =