Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Commit

Permalink
feat: add python312 support
Browse files Browse the repository at this point in the history
fix: update celery package constraint
  • Loading branch information
edx-requirements-bot authored and UsamaSadiq committed May 7, 2024
1 parent 8e5bdae commit d2e4657
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 24 deletions.
20 changes: 9 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,24 @@ name: Python CI
on:
push:
branches:
- master
- master
pull_request:
branches:
- '**'
- '**'

jobs:
run_tests:
name: Tests
runs-on: ${{ matrix.os }}
strategy:
matrix:
os:
- ubuntu-20.04
python-version:
- 3.8
toxenv: [ django42 ]
os: [ubuntu-20.04]
python-version: ['3.8', '3.12']
toxenv: [django42]
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3
- name: setup python
uses: actions/setup-python@v2
uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}
architecture: x64
Expand All @@ -45,8 +43,8 @@ jobs:
make static
make validate_translations
- name: Run Coverage
if: matrix.python-version == '3.8' && matrix.toxenv=='django42'
uses: codecov/codecov-action@v4
if: matrix.python-version == '3.12' && matrix.toxenv=='django42'
uses: codecov/codecov-action@v1
with:
flags: unittests
file: ./coverage.xml
Expand Down
2 changes: 0 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@ upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
upgrade: piptools $(COMMON_CONSTRAINTS_TXT) ## re-compile requirements .txt files from .in files
sed 's/django-simple-history==3.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
mv requirements/common_constraints.tmp requirements/common_constraints.txt
sed 's/Django<4.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
mv requirements/common_constraints.tmp requirements/common_constraints.txt
pip-compile --allow-unsafe --rebuild --upgrade -o requirements/pip.txt requirements/pip.in
pip-compile --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in
pip install -qr requirements/pip.txt
Expand Down
1 change: 0 additions & 1 deletion requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ defusedxml==0.8.0rc2
django==4.2.11
# via
# -c requirements/common_constraints.txt
# -c requirements/constraints.txt
# -r requirements/base.in
# django-cors-headers
# django-crum
Expand Down
7 changes: 4 additions & 3 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@
# Common constraints for edx repos
-c common_constraints.txt

# This constraint can be removed once global constraint is updated.
Django<4.3

# Version 3.2.0 contains bad arabic translations that will cause validation tests to fail
django-extensions<3.2.0

Expand Down Expand Up @@ -48,3 +45,7 @@ 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'
2 changes: 1 addition & 1 deletion requirements/devstack.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ backoff==1.10.0
# analytics-python
backports-zoneinfo[tzdata]==0.2.1
# via
# -c requirements/constraints.txt
# -r requirements/local.txt
# celery
# django
Expand Down Expand Up @@ -162,7 +163,6 @@ distlib==0.3.8
django==4.2.11
# via
# -c requirements/common_constraints.txt
# -c requirements/constraints.txt
# -r requirements/local.txt
# django-cors-headers
# django-crum
Expand Down
2 changes: 1 addition & 1 deletion requirements/local.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ backoff==1.10.0
# analytics-python
backports-zoneinfo[tzdata]==0.2.1
# via
# -c requirements/constraints.txt
# -r requirements/test.txt
# celery
# django
Expand Down Expand Up @@ -162,7 +163,6 @@ distlib==0.3.8
django==4.2.11
# via
# -c requirements/common_constraints.txt
# -c requirements/constraints.txt
# -r requirements/test.txt
# django-cors-headers
# django-crum
Expand Down
2 changes: 1 addition & 1 deletion requirements/production.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ backoff==1.10.0
# analytics-python
backports-zoneinfo[tzdata]==0.2.1
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
# celery
# django
Expand Down Expand Up @@ -94,7 +95,6 @@ defusedxml==0.8.0rc2
django==4.2.11
# via
# -c requirements/common_constraints.txt
# -c requirements/constraints.txt
# -r requirements/base.txt
# django-cors-headers
# django-crum
Expand Down
2 changes: 1 addition & 1 deletion requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ backoff==1.10.0
# analytics-python
backports-zoneinfo[tzdata]==0.2.1
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
# celery
# django
Expand Down Expand Up @@ -125,7 +126,6 @@ distlib==0.3.8
# via virtualenv
# via
# -c requirements/common_constraints.txt
# -c requirements/constraints.txt
# -r requirements/base.txt
# django-cors-headers
# django-crum
Expand Down
7 changes: 4 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
[tox]
envlist = py38-django{42}
envlist = py{38, 312}-django{42}
skipsdist = true

[testenv]
passenv = *
deps =
deps =
setuptools
django42: -r requirements/django.txt
-r{toxinidir}/requirements/test.txt
allowlist_externals =
allowlist_externals =
i18n_tool
/bin/bash
commands = {posargs:pytest}

0 comments on commit d2e4657

Please sign in to comment.