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

feat: add python 3.11 support #181

Merged
merged 1 commit into from
Mar 29, 2024
Merged
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
6 changes: 4 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ jobs:
strategy:
matrix:
os: [ubuntu-20.04]
python-version: ['3.8']
toxenv: [quality, django32, django40, django42]
python-version:
- '3.8'
- '3.11'
toxenv: [quality, django42]

steps:
- name: checkout repo
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@ Change Log
Unreleased
**********

3.6.0
*****

Added
=====

* feat: support for python3.12.

3.5.0
*****

Expand Down
2 changes: 1 addition & 1 deletion djpyfs/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# pylint: disable=django-not-configured
"""init file"""
__version__ = '3.5.0'
__version__ = '3.6.0'
4 changes: 2 additions & 2 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ filelock==3.13.1
# via
# tox
# virtualenv
packaging==23.2
packaging==24.0
# via
# pyproject-api
# tox
Expand All @@ -32,7 +32,7 @@ tomli==2.0.1
# via
# pyproject-api
# tox
tox==4.13.0
tox==4.14.1
# via -r requirements/ci.in
virtualenv==20.25.1
# via tox
9 changes: 9 additions & 0 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,12 @@ elasticsearch<7.14.0

# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
django-simple-history==3.0.0

# opentelemetry requires version 6.x at the moment:
# https://github.com/open-telemetry/opentelemetry-python/issues/3570
# Normally this could be added as a constraint in edx-django-utils, where we're
# adding the opentelemetry dependency. However, when we compile pip-tools.txt,
# that uses version 7.x, and then there's no undoing that when compiling base.txt.
# So we need to pin it globally, for now.
# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407
importlib-metadata<7
2 changes: 2 additions & 0 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@
# moto>5.0.0 contains breaking changes with mock_s3 testing
# needs to fixed separately
moto<5.0.0

backports.zoneinfo;python_version<"3.9"
28 changes: 16 additions & 12 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,13 @@ appdirs==1.4.4
# via fs
asgiref==3.7.2
# via django
backports-zoneinfo==0.2.1
# via django
boto3==1.34.54
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# django
boto3==1.34.61
# via fs-s3fs
botocore==1.34.54
botocore==1.34.61
# via
# boto3
# s3transfer
Expand All @@ -28,7 +30,7 @@ colorama==0.4.6
# via tox
distlib==0.3.8
# via virtualenv
django==4.2.10
django==4.2.11
# via
# -c requirements/common_constraints.txt
# -r requirements/base.in
Expand All @@ -42,18 +44,20 @@ fs==2.4.16
# fs-s3fs
fs-s3fs==1.1.1
# via -r requirements/base.in
importlib-metadata==7.0.1
# via build
importlib-metadata==6.11.0
# via
# -c requirements/common_constraints.txt
# build
jmespath==1.0.1
# via
# boto3
# botocore
packaging==23.2
packaging==24.0
# via
# build
# pyproject-api
# tox
pip-tools==7.4.0
pip-tools==7.4.1
# via -r requirements/dev.in
platformdirs==4.2.0
# via
Expand Down Expand Up @@ -85,17 +89,17 @@ tomli==2.0.1
# pyproject-api
# pyproject-hooks
# tox
tox==4.13.0
tox==4.14.1
# via -r requirements/dev.in
typing-extensions==4.10.0
# via asgiref
urllib3==1.26.18
# via botocore
virtualenv==20.25.1
# via tox
wheel==0.42.0
wheel==0.43.0
# via pip-tools
zipp==3.17.0
zipp==3.18.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
Expand Down
14 changes: 8 additions & 6 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,13 @@ build==1.1.1
# via pip-tools
click==8.1.7
# via pip-tools
importlib-metadata==7.0.1
# via build
packaging==23.2
importlib-metadata==6.11.0
# via
# -c requirements/common_constraints.txt
# build
packaging==24.0
# via build
pip-tools==7.4.0
pip-tools==7.4.1
# via -r requirements/pip-tools.in
pyproject-hooks==1.0.0
# via
Expand All @@ -23,9 +25,9 @@ tomli==2.0.1
# build
# pip-tools
# pyproject-hooks
wheel==0.42.0
wheel==0.43.0
# via pip-tools
zipp==3.17.0
zipp==3.18.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 @@ -4,7 +4,7 @@
#
# pip-compile --allow-unsafe --output-file=requirements/pip.txt requirements/pip.in
#
wheel==0.42.0
wheel==0.43.0
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
Expand Down
20 changes: 11 additions & 9 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,17 @@ astroid==3.1.0
# via
# pylint
# pylint-celery
backports-zoneinfo==0.2.1
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# -r requirements/test.txt
# django
boto3==1.34.54
boto3==1.34.61
# via
# -r requirements/test.txt
# fs-s3fs
# moto
botocore==1.34.54
botocore==1.34.61
# via
# -r requirements/test.txt
# boto3
Expand Down Expand Up @@ -63,7 +64,7 @@ cryptography==42.0.5
# secretstorage
dill==0.3.8
# via pylint
django==4.2.10
django==4.2.11
# via
# -c requirements/common_constraints.txt
# -r requirements/test.txt
Expand All @@ -85,11 +86,12 @@ idna==3.6
# via
# -r requirements/test.txt
# requests
importlib-metadata==7.0.1
importlib-metadata==6.11.0
# via
# -c requirements/common_constraints.txt
# keyring
# twine
importlib-resources==6.1.2
importlib-resources==6.3.0
# via keyring
iniconfig==2.0.0
# via
Expand Down Expand Up @@ -138,7 +140,7 @@ moto==4.2.14
# -r requirements/test.txt
nh3==0.2.15
# via readme-renderer
packaging==23.2
packaging==24.0
# via
# -r requirements/test.txt
# pytest
Expand Down Expand Up @@ -180,7 +182,7 @@ pylint-plugin-utils==0.8.2
# pylint-django
pypng==0.20220715.0
# via -r requirements/test.txt
pytest==8.1.0
pytest==8.1.1
# via
# -r requirements/test.txt
# pytest-cov
Expand Down Expand Up @@ -275,7 +277,7 @@ xmltodict==0.13.0
# via
# -r requirements/test.txt
# moto
zipp==3.17.0
zipp==3.18.0
# via
# importlib-metadata
# importlib-resources
Expand Down
14 changes: 8 additions & 6 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,15 @@ appdirs==1.4.4
# via fs
asgiref==3.7.2
# via django
backports-zoneinfo==0.2.1
# via django
boto3==1.34.54
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# django
boto3==1.34.61
# via
# fs-s3fs
# moto
botocore==1.34.54
botocore==1.34.61
# via
# boto3
# moto
Expand Down Expand Up @@ -60,15 +62,15 @@ moto==4.2.14
# via
# -c requirements/constraints.txt
# -r requirements/test.in
packaging==23.2
packaging==24.0
# via pytest
pluggy==1.4.0
# via pytest
pycparser==2.21
# via cffi
pypng==0.20220715.0
# via -r requirements/test.in
pytest==8.1.0
pytest==8.1.1
# via
# -r requirements/test.in
# pytest-cov
Expand Down
10 changes: 5 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[tox]
envlist = python{3.8}-django{32,40,42},quality
envlist = python{3.8,3.11}-django{42},quality

[testenv]
passenv =
passenv =
CI
TRAVIS
TRAVIS_*
Expand All @@ -11,16 +11,16 @@ commands =
python -m coverage html
deps =
-r{toxinidir}/requirements/test.txt
django32: Django>=3.2,<4.0
django40: Django>=4.0,<4.1
django42: Django>=4.2,<4.3


[testenv:quality]
allowlist_externals =
make
rm
touch
deps =
deps =
wheel
-r{toxinidir}/requirements/quality.txt
commands =
pylint djpyfs
Expand Down
Loading