diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc44ef57..781d1a2e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: os: [ubuntu-20.04] - python-version: ['3.8', '3.12'] + python-version: ['3.12'] toxenv: [django42] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/mysql8-check-migrations.yml b/.github/workflows/mysql8-check-migrations.yml index 604b218f..51ca32f9 100644 --- a/.github/workflows/mysql8-check-migrations.yml +++ b/.github/workflows/mysql8-check-migrations.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 8b797093..28c1303e 100644 --- a/.github/workflows/upgrade-python-requirements.yml +++ b/.github/workflows/upgrade-python-requirements.yml @@ -15,7 +15,7 @@ jobs: uses: openedx/.github/.github/workflows/upgrade-python-requirements.yml@master with: branch: ${{ github.event.inputs.branch || 'master' }} - python_version: "3.8" + python_version: "3.12" # optional parameters below; fill in if you'd like github or email notifications # user_reviewers: "" # team_reviewers: "" diff --git a/Dockerfile b/Dockerfile index ff433a03..092793c2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,28 +1,48 @@ FROM ubuntu:focal as app +# ENV variables for Python 3.12 support +ARG PYTHON_VERSION=3.12 +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 + # System requirements. RUN apt-get update RUN DEBIAN_FRONTEND=noninteractive apt-get install -qy \ git-core \ language-pack-en \ build-essential \ - python3.8 \ - python3-pip \ - python3-virtualenv \ - python3.8-dev \ # libmysqlclient-dev header files needed to use native C implementation for MySQL-python for performance gains. libmysqlclient-dev \ # mysqlclient wont install without libssl-dev libssl-dev \ # mysqlclient>=2.2.0 requires pkg-config (https://github.com/PyMySQL/mysqlclient/issues/620) pkg-config \ - && \ - # delete apt package lists because we do not need them inflating our image - rm -rf /var/lib/apt/lists/* + curl \ + python3-pip \ + python${PYTHON_VERSION} \ + python${PYTHON_VERSION}-dev \ + python${PYTHON_VERSION}-distutils + +# need to use virtualenv pypi package with Python 3.12 +RUN pip install --upgrade pip setuptools +RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python${PYTHON_VERSION} +RUN pip install virtualenv + +# delete apt package lists because we do not need them inflating our image +RUN rm -rf /var/lib/apt/lists/* # Python is Python3. RUN ln -s /usr/bin/python3 /usr/bin/python +# Setup zoneinfo for Python 3.12 +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone + # Use UTF-8. RUN locale-gen en_US.UTF-8 ENV LANG en_US.UTF-8 @@ -44,7 +64,7 @@ COPY requirements ${REGISTRAR_CODE_DIR}/requirements # Working directory will be root of repo. WORKDIR ${REGISTRAR_CODE_DIR} -RUN virtualenv -p python3.8 --always-copy ${REGISTRAR_VENV_DIR} +RUN virtualenv -p python${PYTHON_VERSION} --always-copy ${REGISTRAR_VENV_DIR} # Copy just Python requirements & install them. COPY requirements ${REGISTRAR_CODE_DIR}/requirements diff --git a/requirements/base.txt b/requirements/base.txt index 3f353f37..8aee2aef 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 @@ -12,17 +12,8 @@ asgiref==3.8.1 # via # django # django-cors-headers -async-timeout==4.0.3 - # via redis 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 @@ -198,7 +189,7 @@ pyyaml==6.0.1 # via # drf-yasg # edx-django-release-util -redis==5.0.7 +redis==5.0.8 # via -r requirements/base.in requests==2.32.3 # via @@ -237,14 +228,9 @@ stevedore==5.2.0 text-unidecode==1.3 # via python-slugify typing-extensions==4.12.2 - # via - # asgiref - # edx-opaque-keys - # kombu + # via edx-opaque-keys tzdata==2024.1 - # via - # backports-zoneinfo - # celery + # via celery uritemplate==4.1.1 # via drf-yasg urllib3==1.26.19 diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 9e40c380..ff3fb0f8 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -46,9 +46,5 @@ wrapt < 1.14.0 # At the time of adding this, the moto version 4.1.9 requires urllib3<1.27,>=1.25.4 urllib3<1.27,>=1.25.4 -# backports.zoneinfo needed for Python 3.12 + Django 4.2 compatibility -# Can be removed once requirements have been upgraded with Python>=3.9 -backports.zoneinfo; python_version<'3.9' - # path>16.14.0 has removed the deprecated abspath function, which is breaking the docs build path<16.15.0 diff --git a/requirements/devstack.txt b/requirements/devstack.txt index 1932bf8a..8c43a6db 100644 --- a/requirements/devstack.txt +++ b/requirements/devstack.txt @@ -1,14 +1,14 @@ # -# 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 +accessible-pygments==0.0.5 # via # -r requirements/local.txt # pydata-sphinx-theme -alabaster==0.7.13 +alabaster==1.0.0 # via # -r requirements/local.txt # sphinx @@ -28,10 +28,6 @@ astroid==3.2.4 # -r requirements/local.txt # pylint # pylint-celery -async-timeout==4.0.3 - # via - # -r requirements/local.txt - # redis babel==2.15.0 # via # -r requirements/local.txt @@ -41,14 +37,6 @@ backoff==1.10.0 # via # -r requirements/local.txt # analytics-python -backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" - # via - # -c requirements/constraints.txt - # -r requirements/local.txt - # celery - # django - # djangorestframework - # kombu beautifulsoup4==4.12.3 # via # -r requirements/local.txt @@ -231,7 +219,7 @@ dnspython==2.6.1 # via # -r requirements/local.txt # pymongo -docutils==0.19 +docutils==0.21.2 # via # -r requirements/local.txt # pydata-sphinx-theme @@ -268,10 +256,6 @@ edx-opaque-keys==2.10.0 # edx-drf-extensions edx-rest-api-client==5.7.1 # via -r requirements/local.txt -exceptiongroup==1.2.2 - # via - # -r requirements/local.txt - # pytest factory-boy==3.3.0 # via -r requirements/local.txt faker==26.0.0 @@ -293,11 +277,6 @@ imagesize==1.4.1 # via # -r requirements/local.txt # sphinx -importlib-metadata==6.11.0 - # via - # -c requirements/common_constraints.txt - # -r requirements/local.txt - # sphinx inflection==0.5.1 # via # -r requirements/local.txt @@ -416,7 +395,7 @@ pycparser==2.22 # via # -r requirements/local.txt # cffi -pydata-sphinx-theme==0.14.4 +pydata-sphinx-theme==0.15.4 # via # -r requirements/local.txt # sphinx-book-theme @@ -501,7 +480,6 @@ python3-openid==3.2.0 pytz==2024.1 # via # -r requirements/local.txt - # babel # drf-yasg pywatchman==2.0.0 # via -r requirements/local.txt @@ -513,7 +491,7 @@ pyyaml==6.0.1 # edx-django-release-util # edx-i18n-tools # yamllint -redis==5.0.7 +redis==5.0.8 # via -r requirements/local.txt requests==2.32.3 # via @@ -595,22 +573,22 @@ soupsieve==2.5 # via # -r requirements/local.txt # beautifulsoup4 -sphinx==6.2.1 +sphinx==8.0.2 # via # -r requirements/local.txt # pydata-sphinx-theme # sphinx-book-theme -sphinx-book-theme==1.0.1 +sphinx-book-theme==1.1.3 # via -r requirements/local.txt -sphinxcontrib-applehelp==1.0.4 +sphinxcontrib-applehelp==2.0.0 # via # -r requirements/local.txt # sphinx -sphinxcontrib-devhelp==1.0.2 +sphinxcontrib-devhelp==2.0.0 # via # -r requirements/local.txt # sphinx -sphinxcontrib-htmlhelp==2.0.1 +sphinxcontrib-htmlhelp==2.1.0 # via # -r requirements/local.txt # sphinx @@ -618,11 +596,11 @@ sphinxcontrib-jsmath==1.0.1 # via # -r requirements/local.txt # sphinx -sphinxcontrib-qthelp==1.0.3 +sphinxcontrib-qthelp==2.0.0 # via # -r requirements/local.txt # sphinx -sphinxcontrib-serializinghtml==1.1.5 +sphinxcontrib-serializinghtml==2.0.0 # via # -r requirements/local.txt # sphinx @@ -641,14 +619,6 @@ text-unidecode==1.3 # via # -r requirements/local.txt # python-slugify -tomli==2.0.1 - # via - # -r requirements/local.txt - # coverage - # pylint - # pyproject-api - # pytest - # tox tomlkit==0.13.0 # via # -r requirements/local.txt @@ -658,16 +628,11 @@ tox==4.16.0 typing-extensions==4.12.2 # via # -r requirements/local.txt - # asgiref - # astroid # edx-opaque-keys - # kombu # pydata-sphinx-theme - # pylint tzdata==2024.1 # via # -r requirements/local.txt - # backports-zoneinfo # celery uritemplate==4.1.1 # via @@ -704,7 +669,3 @@ xmltodict==0.13.0 # moto yamllint==1.35.1 # via -r requirements/local.txt -zipp==3.19.2 - # via - # -r requirements/local.txt - # importlib-metadata diff --git a/requirements/docs.txt b/requirements/docs.txt index 1d5bcf80..61d61fdc 100644 --- a/requirements/docs.txt +++ b/requirements/docs.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 +accessible-pygments==0.0.5 # via pydata-sphinx-theme -alabaster==0.7.13 +alabaster==1.0.0 # via sphinx amqp==5.2.0 # via @@ -19,10 +19,6 @@ asgiref==3.8.1 # -r requirements/base.txt # django # django-cors-headers -async-timeout==4.0.3 - # via - # -r requirements/base.txt - # redis babel==2.15.0 # via # pydata-sphinx-theme @@ -31,14 +27,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 beautifulsoup4==4.12.3 # via pydata-sphinx-theme billiard==4.2.0 @@ -159,7 +147,7 @@ dnspython==2.6.1 # via # -r requirements/base.txt # pymongo -docutils==0.19 +docutils==0.21.2 # via # pydata-sphinx-theme # sphinx @@ -197,10 +185,6 @@ idna==3.7 # requests imagesize==1.4.1 # via sphinx -importlib-metadata==6.11.0 - # via - # -c requirements/common_constraints.txt - # sphinx inflection==0.5.1 # via # -r requirements/base.txt @@ -249,7 +233,7 @@ pycparser==2.22 # via # -r requirements/base.txt # cffi -pydata-sphinx-theme==0.14.4 +pydata-sphinx-theme==0.15.4 # via sphinx-book-theme pygments==2.18.0 # via @@ -288,14 +272,13 @@ python3-openid==3.2.0 pytz==2024.1 # via # -r requirements/base.txt - # babel # drf-yasg pyyaml==6.0.1 # via # -r requirements/base.txt # drf-yasg # edx-django-release-util -redis==5.0.7 +redis==5.0.8 # via -r requirements/base.txt requests==2.32.3 # via @@ -339,24 +322,24 @@ social-auth-core==4.5.4 # social-auth-app-django soupsieve==2.5 # via beautifulsoup4 -sphinx==6.2.1 +sphinx==8.0.2 # via # -r requirements/docs.in # pydata-sphinx-theme # sphinx-book-theme -sphinx-book-theme==1.0.1 +sphinx-book-theme==1.1.3 # via -r requirements/docs.in -sphinxcontrib-applehelp==1.0.4 +sphinxcontrib-applehelp==2.0.0 # via sphinx -sphinxcontrib-devhelp==1.0.2 +sphinxcontrib-devhelp==2.0.0 # via sphinx -sphinxcontrib-htmlhelp==2.0.1 +sphinxcontrib-htmlhelp==2.1.0 # via sphinx sphinxcontrib-jsmath==1.0.1 # via sphinx -sphinxcontrib-qthelp==1.0.3 +sphinxcontrib-qthelp==2.0.0 # via sphinx -sphinxcontrib-serializinghtml==1.1.5 +sphinxcontrib-serializinghtml==2.0.0 # via sphinx sqlparse==0.5.1 # via @@ -374,14 +357,11 @@ text-unidecode==1.3 typing-extensions==4.12.2 # via # -r requirements/base.txt - # asgiref # edx-opaque-keys - # kombu # pydata-sphinx-theme tzdata==2024.1 # via # -r requirements/base.txt - # backports-zoneinfo # celery uritemplate==4.1.1 # via @@ -402,5 +382,3 @@ wcwidth==0.2.13 # via # -r requirements/base.txt # prompt-toolkit -zipp==3.19.2 - # via importlib-metadata diff --git a/requirements/github.txt b/requirements/github.txt index c52b940f..9ab7f504 100644 --- a/requirements/github.txt +++ b/requirements/github.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/local.txt b/requirements/local.txt index 46c62655..44ef4367 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -1,14 +1,14 @@ # -# 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 +accessible-pygments==0.0.5 # via # -r requirements/docs.txt # pydata-sphinx-theme -alabaster==0.7.13 +alabaster==1.0.0 # via # -r requirements/docs.txt # sphinx @@ -32,11 +32,6 @@ astroid==3.2.4 # -r requirements/test.txt # pylint # pylint-celery -async-timeout==4.0.3 - # via - # -r requirements/docs.txt - # -r requirements/test.txt - # redis babel==2.15.0 # via # -r requirements/docs.txt @@ -47,15 +42,6 @@ backoff==1.10.0 # -r requirements/docs.txt # -r requirements/test.txt # analytics-python -backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" - # via - # -c requirements/constraints.txt - # -r requirements/docs.txt - # -r requirements/test.txt - # celery - # django - # djangorestframework - # kombu beautifulsoup4==4.12.3 # via # -r requirements/docs.txt @@ -265,7 +251,7 @@ dnspython==2.6.1 # -r requirements/docs.txt # -r requirements/test.txt # pymongo -docutils==0.19 +docutils==0.21.2 # via # -r requirements/docs.txt # pydata-sphinx-theme @@ -316,10 +302,6 @@ edx-rest-api-client==5.7.1 # via # -r requirements/docs.txt # -r requirements/test.txt -exceptiongroup==1.2.2 - # via - # -r requirements/test.txt - # pytest factory-boy==3.3.0 # via -r requirements/test.txt faker==26.0.0 @@ -342,11 +324,6 @@ imagesize==1.4.1 # via # -r requirements/docs.txt # sphinx -importlib-metadata==6.11.0 - # via - # -c requirements/common_constraints.txt - # -r requirements/docs.txt - # sphinx inflection==0.5.1 # via # -r requirements/docs.txt @@ -467,7 +444,7 @@ pycparser==2.22 # -r requirements/docs.txt # -r requirements/test.txt # cffi -pydata-sphinx-theme==0.14.4 +pydata-sphinx-theme==0.15.4 # via # -r requirements/docs.txt # sphinx-book-theme @@ -555,7 +532,6 @@ pytz==2024.1 # via # -r requirements/docs.txt # -r requirements/test.txt - # babel # drf-yasg pywatchman==2.0.0 # via -r requirements/local.in @@ -568,7 +544,7 @@ pyyaml==6.0.1 # edx-django-release-util # edx-i18n-tools # yamllint -redis==5.0.7 +redis==5.0.8 # via # -r requirements/docs.txt # -r requirements/test.txt @@ -652,22 +628,22 @@ soupsieve==2.5 # via # -r requirements/docs.txt # beautifulsoup4 -sphinx==6.2.1 +sphinx==8.0.2 # via # -r requirements/docs.txt # pydata-sphinx-theme # sphinx-book-theme -sphinx-book-theme==1.0.1 +sphinx-book-theme==1.1.3 # via -r requirements/docs.txt -sphinxcontrib-applehelp==1.0.4 +sphinxcontrib-applehelp==2.0.0 # via # -r requirements/docs.txt # sphinx -sphinxcontrib-devhelp==1.0.2 +sphinxcontrib-devhelp==2.0.0 # via # -r requirements/docs.txt # sphinx -sphinxcontrib-htmlhelp==2.0.1 +sphinxcontrib-htmlhelp==2.1.0 # via # -r requirements/docs.txt # sphinx @@ -675,11 +651,11 @@ sphinxcontrib-jsmath==1.0.1 # via # -r requirements/docs.txt # sphinx -sphinxcontrib-qthelp==1.0.3 +sphinxcontrib-qthelp==2.0.0 # via # -r requirements/docs.txt # sphinx -sphinxcontrib-serializinghtml==1.1.5 +sphinxcontrib-serializinghtml==2.0.0 # via # -r requirements/docs.txt # sphinx @@ -701,14 +677,6 @@ text-unidecode==1.3 # -r requirements/docs.txt # -r requirements/test.txt # python-slugify -tomli==2.0.1 - # via - # -r requirements/test.txt - # coverage - # pylint - # pyproject-api - # pytest - # tox tomlkit==0.13.0 # via # -r requirements/test.txt @@ -719,17 +687,12 @@ typing-extensions==4.12.2 # via # -r requirements/docs.txt # -r requirements/test.txt - # asgiref - # astroid # edx-opaque-keys - # kombu # pydata-sphinx-theme - # pylint tzdata==2024.1 # via # -r requirements/docs.txt # -r requirements/test.txt - # backports-zoneinfo # celery uritemplate==4.1.1 # via @@ -770,7 +733,3 @@ xmltodict==0.13.0 # moto yamllint==1.35.1 # via -r requirements/test.txt -zipp==3.19.2 - # via - # -r requirements/docs.txt - # importlib-metadata diff --git a/requirements/monitoring/requirements.txt b/requirements/monitoring/requirements.txt index b4d0257f..f6c85309 100644 --- a/requirements/monitoring/requirements.txt +++ b/requirements/monitoring/requirements.txt @@ -1,15 +1,15 @@ # -# 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 +accessible-pygments==0.0.5 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # pydata-sphinx-theme -alabaster==0.7.13 +alabaster==1.0.0 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -42,13 +42,6 @@ astroid==3.2.4 # -r requirements/monitoring/../test.txt # pylint # pylint-celery -async-timeout==4.0.3 - # via - # -r requirements/monitoring/../devstack.txt - # -r requirements/monitoring/../local.txt - # -r requirements/monitoring/../production.txt - # -r requirements/monitoring/../test.txt - # redis babel==2.15.0 # via # -r requirements/monitoring/../devstack.txt @@ -62,16 +55,6 @@ backoff==1.10.0 # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt # analytics-python -backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" - # via - # -r requirements/monitoring/../devstack.txt - # -r requirements/monitoring/../local.txt - # -r requirements/monitoring/../production.txt - # -r requirements/monitoring/../test.txt - # celery - # django - # djangorestframework - # kombu beautifulsoup4==4.12.3 # via # -r requirements/monitoring/../devstack.txt @@ -357,7 +340,7 @@ dnspython==2.6.1 # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt # pymongo -docutils==0.19 +docutils==0.21.2 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -432,12 +415,6 @@ edx-rest-api-client==5.7.1 # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt -exceptiongroup==1.2.2 - # via - # -r requirements/monitoring/../devstack.txt - # -r requirements/monitoring/../local.txt - # -r requirements/monitoring/../test.txt - # pytest factory-boy==3.3.0 # via # -r requirements/monitoring/../devstack.txt @@ -481,11 +458,6 @@ imagesize==1.4.1 # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # sphinx -importlib-metadata==6.11.0 - # via - # -r requirements/monitoring/../devstack.txt - # -r requirements/monitoring/../local.txt - # sphinx inflection==0.5.1 # via # -r requirements/monitoring/../devstack.txt @@ -666,7 +638,7 @@ pycparser==2.22 # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt # cffi -pydata-sphinx-theme==0.14.4 +pydata-sphinx-theme==0.15.4 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -795,7 +767,6 @@ pytz==2024.1 # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt - # babel # drf-yasg pywatchman==2.0.0 # via @@ -812,7 +783,7 @@ pyyaml==6.0.1 # edx-django-release-util # edx-i18n-tools # yamllint -redis==5.0.7 +redis==5.0.8 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -931,27 +902,27 @@ soupsieve==2.5 # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # beautifulsoup4 -sphinx==6.2.1 +sphinx==8.0.2 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # pydata-sphinx-theme # sphinx-book-theme -sphinx-book-theme==1.0.1 +sphinx-book-theme==1.1.3 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt -sphinxcontrib-applehelp==1.0.4 +sphinxcontrib-applehelp==2.0.0 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # sphinx -sphinxcontrib-devhelp==1.0.2 +sphinxcontrib-devhelp==2.0.0 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # sphinx -sphinxcontrib-htmlhelp==2.0.1 +sphinxcontrib-htmlhelp==2.1.0 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -961,12 +932,12 @@ sphinxcontrib-jsmath==1.0.1 # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # sphinx -sphinxcontrib-qthelp==1.0.3 +sphinxcontrib-qthelp==2.0.0 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # sphinx -sphinxcontrib-serializinghtml==1.1.5 +sphinxcontrib-serializinghtml==2.0.0 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -995,16 +966,6 @@ text-unidecode==1.3 # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt # python-slugify -tomli==2.0.1 - # via - # -r requirements/monitoring/../devstack.txt - # -r requirements/monitoring/../local.txt - # -r requirements/monitoring/../test.txt - # coverage - # pylint - # pyproject-api - # pytest - # tox tomlkit==0.13.0 # via # -r requirements/monitoring/../devstack.txt @@ -1022,19 +983,14 @@ typing-extensions==4.12.2 # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt - # asgiref - # astroid # edx-opaque-keys - # kombu # pydata-sphinx-theme - # pylint tzdata==2024.1 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt - # backports-zoneinfo # celery uritemplate==4.1.1 # via @@ -1091,11 +1047,6 @@ yamllint==1.35.1 # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../test.txt -zipp==3.19.2 - # via - # -r requirements/monitoring/../devstack.txt - # -r requirements/monitoring/../local.txt - # importlib-metadata zope-event==5.0 # via # -r requirements/monitoring/../production.txt diff --git a/requirements/nonlocal.txt b/requirements/nonlocal.txt index 12715956..5020d173 100644 --- a/requirements/nonlocal.txt +++ b/requirements/nonlocal.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/optional.txt b/requirements/optional.txt index 9f81bf23..237aa33b 100644 --- a/requirements/optional.txt +++ b/requirements/optional.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/pip-tools.txt b/requirements/pip-tools.txt index e34fcae5..c62445a3 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,8 +8,6 @@ build==1.2.1 # via pip-tools click==8.1.7 # via pip-tools -importlib-metadata==8.2.0 - # via build packaging==24.1 # via build pip-tools==7.4.1 @@ -18,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.19.2 - # 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 7b187b8d..5c0bd300 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 b5f4d7ab..9310ea3c 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 @@ -15,22 +15,10 @@ asgiref==3.8.1 # -r requirements/base.txt # django # django-cors-headers -async-timeout==4.0.3 - # via - # -r requirements/base.txt - # redis 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 @@ -290,7 +278,7 @@ pyyaml==6.0.1 # -r requirements/production.in # drf-yasg # edx-django-release-util -redis==5.0.7 +redis==5.0.8 # via -r requirements/base.txt requests==2.32.3 # via @@ -347,13 +335,10 @@ text-unidecode==1.3 typing-extensions==4.12.2 # via # -r requirements/base.txt - # asgiref # edx-opaque-keys - # kombu tzdata==2024.1 # via # -r requirements/base.txt - # backports-zoneinfo # celery uritemplate==4.1.1 # via diff --git a/requirements/test.txt b/requirements/test.txt index 4070a346..d773909b 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 @@ -19,22 +19,10 @@ astroid==3.2.4 # via # pylint # pylint-celery -async-timeout==4.0.3 - # via - # -r requirements/base.txt - # redis 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 @@ -220,8 +208,6 @@ edx-opaque-keys==2.10.0 # edx-drf-extensions edx-rest-api-client==5.7.1 # via -r requirements/base.txt -exceptiongroup==1.2.2 - # via pytest factory-boy==3.3.0 # via -r requirements/test.in faker==26.0.0 @@ -388,7 +374,7 @@ pyyaml==6.0.1 # drf-yasg # edx-django-release-util # yamllint -redis==5.0.7 +redis==5.0.8 # via -r requirements/base.txt requests==2.32.3 # via @@ -452,13 +438,6 @@ text-unidecode==1.3 # via # -r requirements/base.txt # python-slugify -tomli==2.0.1 - # via - # coverage - # pylint - # pyproject-api - # pytest - # tox tomlkit==0.13.0 # via pylint tox==4.16.0 @@ -466,15 +445,10 @@ tox==4.16.0 typing-extensions==4.12.2 # via # -r requirements/base.txt - # asgiref - # astroid # edx-opaque-keys - # kombu - # pylint tzdata==2024.1 # via # -r requirements/base.txt - # backports-zoneinfo # celery uritemplate==4.1.1 # via diff --git a/tox.ini b/tox.ini index a8591756..f2e6536c 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{38, 312}-django{42} +envlist = py{312}-django{42} skipsdist = true [testenv]