Skip to content

Commit

Permalink
chore: Upgrade Python requirements (#388)
Browse files Browse the repository at this point in the history
* chore: Upgrade Python requirements

* fix: drop support for python 3.8

---------

Co-authored-by: Irtaza Akram <[email protected]>
  • Loading branch information
edx-requirements-bot and irtazaakram authored Jul 29, 2024
1 parent 9d0a71d commit 1760448
Show file tree
Hide file tree
Showing 14 changed files with 61 additions and 144 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ jobs:
strategy:
matrix:
os: [ubuntu-20.04]
python-version: ['3.8', '3.11', '3.12']
python-version: ['3.11', '3.12']
toxenv: [django42]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Python setup
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -31,7 +31,7 @@ jobs:
run: tox -e ${{ matrix.toxenv }}

- name: Upload coverage to CodeCov
if: matrix.python-version == '3.8' && matrix.toxenv == 'django42'
if: matrix.python-version == '3.11' && matrix.toxenv == 'django42'
uses: codecov/codecov-action@v4
with:
file: ./coverage.xml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Build and Push docker image
env:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pypi-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: setup python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: 3.8
python-version: 3.11

- name: Install pip
run: pip install -r requirements/pip.txt
Expand Down
6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Getting Started
Developing
==========

This code runs on Python 3.8 or newer.
This code runs on Python 3.11 or newer.

One Time Setup
--------------
Expand All @@ -40,7 +40,7 @@ One Time Setup
# Set up a virtualenv with the same name as the repo and activate it
# Here's how you might do that if you have virtualenvwrapper setup.
mkvirtualenv -p python3.8 xblock-sdk
mkvirtualenv -p python3.11 xblock-sdk
# Install system requirements needed to run this on ubuntu.
# Note: Debian 10 needs libjpeg62-turbo-dev instead of libjpeg62-dev.
Expand Down Expand Up @@ -107,7 +107,7 @@ On the first startup run the following command to create the SQLite database.

Command::

$ docker container exec -it edx.devstack.xblock-sdk python3.8 manage.py migrate
$ docker container exec -it edx.devstack.xblock-sdk python3.11 manage.py migrate

You should now be able to access the XBlock SDK environment in your browser at http://localhost:8000

Expand Down
20 changes: 6 additions & 14 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -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.11
# by the following command:
#
# make upgrade
Expand All @@ -10,15 +10,11 @@ arrow==1.3.0
# via cookiecutter
asgiref==3.8.1
# via django
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# django
binaryornot==0.4.4
# via cookiecutter
boto3==1.34.144
boto3==1.34.149
# via fs-s3fs
botocore==1.34.144
botocore==1.34.149
# via
# boto3
# s3transfer
Expand Down Expand Up @@ -107,17 +103,13 @@ six==1.16.0
# fs
# fs-s3fs
# python-dateutil
sqlparse==0.5.0
sqlparse==0.5.1
# via django
text-unidecode==1.3
# via python-slugify
types-python-dateutil==2.9.0.20240316
# via arrow
typing-extensions==4.12.2
# via
# asgiref
# rich
urllib3==1.26.19
urllib3==2.2.2
# via
# botocore
# requests
Expand All @@ -129,7 +121,7 @@ webob==1.8.7
# via
# -r requirements/base.in
# xblock
xblock[django]==4.0.1
xblock[django]==5.0.0
# via -r requirements/base.in

# The following packages are considered to be unsafe in a requirements file:
Expand Down
8 changes: 2 additions & 6 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
#
cachetools==5.3.3
cachetools==5.4.0
# via tox
chardet==5.2.0
# via tox
Expand All @@ -28,10 +28,6 @@ pluggy==1.5.0
# via tox
pyproject-api==1.7.1
# via tox
tomli==2.0.1
# via
# pyproject-api
# tox
tox==4.16.0
# via -r requirements/ci.in
virtualenv==20.26.3
Expand Down
8 changes: 8 additions & 0 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Django<5.0

# elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process.
# elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
# See https://github.com/openedx/edx-platform/issues/35126 for more info
elasticsearch<7.14.0

# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
Expand All @@ -30,3 +31,10 @@ django-simple-history==3.0.0
# So we need to pin it globally, for now.
# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407
importlib-metadata<7

# Cause: https://github.com/openedx/event-tracking/pull/290
# event-tracking 2.4.1 upgrades to pymongo 4.4.0 which is not supported on edx-platform.
# We will pin event-tracking to do not break existing installations
# This can be unpinned once https://github.com/openedx/edx-platform/issues/34586
# has been resolved and edx-platform is running with pymongo>=4.4.0
event-tracking<2.4.1
48 changes: 11 additions & 37 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -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.11
# by the following command:
#
# make upgrade
Expand All @@ -23,33 +23,27 @@ asgiref==3.8.1
# -r requirements/base.txt
# -r requirements/test.txt
# django
astroid==3.2.3
astroid==3.2.4
# via
# pylint
# pylint-celery
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
# -r requirements/test.txt
# django
binaryornot==0.4.4
# via
# -r requirements/base.txt
# -r requirements/test.txt
# cookiecutter
boto3==1.34.144
boto3==1.34.149
# via
# -r requirements/base.txt
# -r requirements/test.txt
# fs-s3fs
botocore==1.34.144
botocore==1.34.149
# via
# -r requirements/base.txt
# -r requirements/test.txt
# boto3
# s3transfer
cachetools==5.3.3
cachetools==5.4.0
# via
# -r requirements/test.txt
# tox
Expand Down Expand Up @@ -110,12 +104,8 @@ django==4.2.14
# -r requirements/base.txt
# -r requirements/test.txt
# openedx-django-pyfs
edx-lint==5.3.6
edx-lint==5.3.7
# via -r requirements/quality.in
exceptiongroup==1.2.2
# via
# -r requirements/test.txt
# pytest
filelock==3.15.4
# via
# -r requirements/test.txt
Expand Down Expand Up @@ -232,7 +222,7 @@ pygments==2.18.0
# -r requirements/base.txt
# -r requirements/test.txt
# rich
pylint==3.2.5
pylint==3.2.6
# via
# edx-lint
# pylint-celery
Expand All @@ -254,7 +244,7 @@ pyproject-api==1.7.1
# via
# -r requirements/test.txt
# tox
pytest==8.2.2
pytest==8.3.2
# via
# -r requirements/test.txt
# pytest-cov
Expand Down Expand Up @@ -327,7 +317,7 @@ six==1.16.0
# python-dateutil
snowballstemmer==2.2.0
# via pydocstyle
sqlparse==0.5.0
sqlparse==0.5.1
# via
# -r requirements/base.txt
# -r requirements/test.txt
Expand All @@ -339,14 +329,6 @@ text-unidecode==1.3
# -r requirements/base.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 pylint
tox==4.16.0
Expand All @@ -358,15 +340,7 @@ types-python-dateutil==2.9.0.20240316
# -r requirements/base.txt
# -r requirements/test.txt
# arrow
typing-extensions==4.12.2
# via
# -r requirements/base.txt
# -r requirements/test.txt
# asgiref
# astroid
# pylint
# rich
urllib3==1.26.19
urllib3==2.2.2
# via
# -r requirements/base.txt
# -r requirements/test.txt
Expand All @@ -386,7 +360,7 @@ webob==1.8.7
# -r requirements/base.txt
# -r requirements/test.txt
# xblock
xblock[django]==4.0.1
xblock[django]==5.0.0
# via
# -r requirements/base.txt
# -r requirements/test.txt
Expand Down
12 changes: 1 addition & 11 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
@@ -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.11
# by the following command:
#
# make upgrade
Expand All @@ -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.1
# via build
pip-tools==7.4.1
Expand All @@ -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.19.2
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down
4 changes: 2 additions & 2 deletions requirements/pip.txt
Original file line number Diff line number Diff line change
@@ -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.11
# by the following command:
#
# make upgrade
Expand All @@ -10,5 +10,5 @@ wheel==0.43.0
# The following packages are considered to be unsafe in a requirements file:
pip==24.1.2
# via -r requirements/pip.in
setuptools==70.3.0
setuptools==71.1.0
# via -r requirements/pip.in
Loading

0 comments on commit 1760448

Please sign in to comment.