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

Commit

Permalink
Merge pull request #168 from openedx/jenkins/python312-support-7daab06
Browse files Browse the repository at this point in the history
feat: add python312 support
  • Loading branch information
UsamaSadiq authored Feb 27, 2024
2 parents 7daab06 + 01fad3d commit 54ba89c
Show file tree
Hide file tree
Showing 10 changed files with 42 additions and 27 deletions.
20 changes: 12 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: Python CI
on:
push:
branches:
- master
- master
pull_request:
branches:
- '**'
- '**'

jobs:
run_tests:
Expand All @@ -15,14 +15,18 @@ jobs:
strategy:
matrix:
os:
- ubuntu-20.04
python-version:
- 3.8
toxenv: [ py38,quality ]
- ubuntu-20.04
python-version: ['3.8', '3.12']
toxenv: [py38,py312,quality]
exclude:
- python-version: '3.8'
toxenv: 'py312'
- python-version: '3.12'
toxenv: 'py38'
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 }}

Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ upgrade: $(COMMON_CONSTRAINTS_TXT)
## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
pip install -qr requirements/pip-tools.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-compile --allow-unsafe --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in
pip install -qr requirements/pip.txt
pip install -qr requirements/pip-tools.txt
pip-compile --upgrade -o requirements/base.txt requirements/base.in
pip-compile --upgrade -o requirements/tox.txt requirements/tox.in
pip-compile --upgrade -o requirements/test.txt requirements/test.in
pip-compile --allow-unsafe --upgrade -o requirements/base.txt requirements/base.in
pip-compile --allow-unsafe --upgrade -o requirements/tox.txt requirements/tox.in
pip-compile --allow-unsafe --upgrade -o requirements/test.txt requirements/test.in
2 changes: 1 addition & 1 deletion analyticsclient/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.18.2'
__version__ = '0.18.3'
1 change: 1 addition & 0 deletions requirements/base.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
-c constraints.txt

requests
setuptools
4 changes: 4 additions & 0 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,7 @@ requests==2.31.0
# via -r requirements/base.in
urllib3==2.2.1
# via requests

# The following packages are considered to be unsafe in a requirements file:
setuptools==69.1.1
# via -r requirements/base.in
6 changes: 4 additions & 2 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,7 @@ zipp==3.17.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
# setuptools
pip==24.0
# via pip-tools
setuptools==69.1.1
# via pip-tools
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.42.0
# The following packages are considered to be unsafe in a requirements file:
pip==24.0
# via -r requirements/pip.in
setuptools==69.1.0
setuptools==69.1.1
# via -r requirements/pip.in
18 changes: 11 additions & 7 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# make upgrade
#
astroid==3.0.3
astroid==3.1.0
# via pylint
certifi==2024.2.2
# via
Expand All @@ -14,11 +14,11 @@ charset-normalizer==3.3.2
# via
# -r requirements/base.txt
# requests
coverage[toml]==7.4.1
coverage[toml]==7.4.3
# via
# -r requirements/test.in
# pytest-cov
ddt==1.7.1
ddt==1.7.2
# via -r requirements/test.in
dill==0.3.8
# via pylint
Expand Down Expand Up @@ -46,9 +46,9 @@ pycodestyle==2.11.1
# via -r requirements/test.in
pydocstyle==6.3.0
# via -r requirements/test.in
pylint==3.0.3
pylint==3.1.0
# via -r requirements/test.in
pytest==8.0.1
pytest==8.0.2
# via
# -r requirements/test.in
# pytest-cov
Expand All @@ -65,13 +65,17 @@ tomli==2.0.1
# coverage
# pylint
# pytest
tomlkit==0.12.3
tomlkit==0.12.4
# via pylint
typing-extensions==4.9.0
typing-extensions==4.10.0
# via
# astroid
# pylint
urllib3==2.2.1
# via
# -r requirements/base.txt
# requests

# The following packages are considered to be unsafe in a requirements file:
setuptools==69.1.1
# via -r requirements/base.txt
6 changes: 3 additions & 3 deletions requirements/tox.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
#
# make upgrade
#
cachetools==5.3.2
cachetools==5.3.3
# via tox
chardet==5.2.0
# via tox
colorama==0.4.6
# via tox
coverage==7.4.1
coverage==7.4.3
# via -r requirements/tox.in
distlib==0.3.8
# via virtualenv
Expand All @@ -36,5 +36,5 @@ tomli==2.0.1
# tox
tox==4.13.0
# via -r requirements/tox.in
virtualenv==20.25.0
virtualenv==20.25.1
# via tox
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py38,quality
envlist = py{38,312},quality

[testenv]
deps = -r{toxinidir}/requirements/test.txt
Expand Down

0 comments on commit 54ba89c

Please sign in to comment.