Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Python Requirements Update #374

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ 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
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/pypi-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: setup python
uses: actions/setup-python@v2
with:
python-version: 3.8
python-version: 3.11

- name: Install pip
run: pip install -r requirements/pip.txt
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ COPY . /usr/local/src/xblock-sdk
WORKDIR /usr/local/src/xblock-sdk

ENV VIRTUAL_ENV=/venvs/xblock-sdk
RUN python3.8 -m venv $VIRTUAL_ENV
RUN python3.11 -m venv $VIRTUAL_ENV
ENV PATH="$VIRTUAL_ENV/bin:$PATH"

RUN pip install --upgrade pip && pip install -r /usr/local/src/xblock-sdk/requirements/dev.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
8 changes: 4 additions & 4 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ backports-zoneinfo==0.2.1 ; python_version < "3.9"
# django
binaryornot==0.4.4
# via cookiecutter
boto3==1.34.108
boto3==1.34.115
# via fs-s3fs
botocore==1.34.108
botocore==1.34.115
# via
# boto3
# s3transfer
Expand Down Expand Up @@ -90,7 +90,7 @@ pyyaml==6.0.1
# via
# cookiecutter
# xblock
requests==2.31.0
requests==2.32.3
# via
# -r requirements/base.in
# cookiecutter
Expand All @@ -113,7 +113,7 @@ text-unidecode==1.3
# via python-slugify
types-python-dateutil==2.9.0.20240316
# via arrow
typing-extensions==4.11.0
typing-extensions==4.12.0
# via
# asgiref
# rich
Expand Down
16 changes: 8 additions & 8 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ asgiref==3.8.1
# -r requirements/base.txt
# -r requirements/test.txt
# django
astroid==3.2.1
astroid==3.2.2
# via
# pylint
# pylint-celery
Expand All @@ -38,12 +38,12 @@ binaryornot==0.4.4
# -r requirements/base.txt
# -r requirements/test.txt
# cookiecutter
boto3==1.34.108
boto3==1.34.115
# via
# -r requirements/base.txt
# -r requirements/test.txt
# fs-s3fs
botocore==1.34.108
botocore==1.34.115
# via
# -r requirements/base.txt
# -r requirements/test.txt
Expand Down Expand Up @@ -89,7 +89,7 @@ cookiecutter==2.6.0
# via
# -r requirements/base.txt
# -r requirements/test.txt
coverage[toml]==7.5.1
coverage[toml]==7.5.3
# via
# -r requirements/test.in
# -r requirements/test.txt
Expand Down Expand Up @@ -232,7 +232,7 @@ pygments==2.18.0
# -r requirements/base.txt
# -r requirements/test.txt
# rich
pylint==3.2.1
pylint==3.2.2
# via
# edx-lint
# pylint-celery
Expand All @@ -254,7 +254,7 @@ pyproject-api==1.6.1
# via
# -r requirements/test.txt
# tox
pytest==8.2.0
pytest==8.2.1
# via
# -r requirements/test.txt
# pytest-cov
Expand Down Expand Up @@ -297,7 +297,7 @@ pyyaml==6.0.1
# code-annotations
# cookiecutter
# xblock
requests==2.31.0
requests==2.32.3
# via
# -r requirements/base.txt
# -r requirements/test.txt
Expand Down Expand Up @@ -358,7 +358,7 @@ types-python-dateutil==2.9.0.20240316
# -r requirements/base.txt
# -r requirements/test.txt
# arrow
typing-extensions==4.11.0
typing-extensions==4.12.0
# via
# -r requirements/base.txt
# -r requirements/test.txt
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ tomli==2.0.1
# pip-tools
wheel==0.43.0
# via pip-tools
zipp==3.18.2
zipp==3.19.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ wheel==0.43.0
# The following packages are considered to be unsafe in a requirements file:
pip==24.0
# via -r requirements/pip.in
setuptools==69.5.1
setuptools==70.0.0
# via -r requirements/pip.in
16 changes: 8 additions & 8 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ asgiref==3.8.1
# via
# -r requirements/test.txt
# django
astroid==3.2.1
astroid==3.2.2
# via
# pylint
# pylint-celery
Expand All @@ -31,11 +31,11 @@ binaryornot==0.4.4
# via
# -r requirements/test.txt
# cookiecutter
boto3==1.34.108
boto3==1.34.115
# via
# -r requirements/test.txt
# fs-s3fs
botocore==1.34.108
botocore==1.34.115
# via
# -r requirements/test.txt
# boto3
Expand Down Expand Up @@ -74,7 +74,7 @@ colorama==0.4.6
# tox
cookiecutter==2.6.0
# via -r requirements/test.txt
coverage[toml]==7.5.1
coverage[toml]==7.5.3
# via
# -r requirements/test.txt
# pytest-cov
Expand Down Expand Up @@ -198,7 +198,7 @@ pygments==2.18.0
# via
# -r requirements/test.txt
# rich
pylint==3.2.1
pylint==3.2.2
# via
# edx-lint
# pylint-celery
Expand All @@ -218,7 +218,7 @@ pyproject-api==1.6.1
# via
# -r requirements/test.txt
# tox
pytest==8.2.0
pytest==8.2.1
# via
# -r requirements/test.txt
# pytest-cov
Expand Down Expand Up @@ -251,7 +251,7 @@ pyyaml==6.0.1
# code-annotations
# cookiecutter
# xblock
requests==2.31.0
requests==2.32.3
# via
# -r requirements/test.txt
# cookiecutter
Expand Down Expand Up @@ -302,7 +302,7 @@ types-python-dateutil==2.9.0.20240316
# via
# -r requirements/test.txt
# arrow
typing-extensions==4.11.0
typing-extensions==4.12.0
# via
# -r requirements/test.txt
# asgiref
Expand Down
12 changes: 6 additions & 6 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ binaryornot==0.4.4
# via
# -r requirements/base.txt
# cookiecutter
boto3==1.34.108
boto3==1.34.115
# via
# -r requirements/base.txt
# fs-s3fs
botocore==1.34.108
botocore==1.34.115
# via
# -r requirements/base.txt
# boto3
Expand Down Expand Up @@ -59,7 +59,7 @@ colorama==0.4.6
# via tox
cookiecutter==2.6.0
# via -r requirements/base.txt
coverage[toml]==7.5.1
coverage[toml]==7.5.3
# via
# -r requirements/test.in
# pytest-cov
Expand Down Expand Up @@ -158,7 +158,7 @@ pypng==0.20220715.0
# via -r requirements/base.txt
pyproject-api==1.6.1
# via tox
pytest==8.2.0
pytest==8.2.1
# via
# pytest-cov
# pytest-django
Expand Down Expand Up @@ -188,7 +188,7 @@ pyyaml==6.0.1
# -r requirements/base.txt
# cookiecutter
# xblock
requests==2.31.0
requests==2.32.3
# via
# -r requirements/base.txt
# cookiecutter
Expand Down Expand Up @@ -230,7 +230,7 @@ types-python-dateutil==2.9.0.20240316
# via
# -r requirements/base.txt
# arrow
typing-extensions==4.11.0
typing-extensions==4.12.0
# via
# -r requirements/base.txt
# asgiref
Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ def get_version(*file_paths):
'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)',
'Natural Language :: English',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
],
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py{38,311,312}-django{42},quality
envlist = py{311,312}-django{42},quality

[pycodestyle]
exclude = .git,.tox,migrations
Expand Down
2 changes: 1 addition & 1 deletion workbench/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
Provide a djangoapp for XBlock development
"""

__version__ = '0.11.0'
__version__ = '1.0.0'
Loading