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 support for django 5.1 #219

Merged
merged 1 commit into from
Aug 22, 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: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
matrix:
os: [ubuntu-20.04]
python-version:
- '3.8'
- '3.11'
toxenv: [quality, django42]
- '3.12'
toxenv: [quality, django42, django51]

steps:
- name: checkout repo
Expand All @@ -38,7 +38,7 @@ jobs:
run: tox

- name: Run Coverage
if: matrix.python-version == '3.8' && matrix.toxenv=='django42'
if: matrix.python-version == '3.12' && matrix.toxenv=='django42'
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
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 @@ -15,7 +15,7 @@ jobs:
- name: setup python
uses: actions/setup-python@v5
with:
python-version: 3.8
python-version: 3.12

- name: Install pip
run: pip install -r requirements/pip.txt
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ Change Log
Unreleased
**********

3.7.0
*****

* feat: support for Django 5.1
* chore: drop support for python 3.8

3.6.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.6.0'
__version__ = '3.7.0'
4 changes: 2 additions & 2 deletions djpyfs/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ class Meta:
# We'd like to create an index first on expiration than on expires (so
# we can search for objects where expires=True and expiration is before
# now).
index_together = [
["expiration", "expires"],
indexes = [
models.Index(fields=["expiration", "expires"]),
]

def __str__(self):
Expand Down
22 changes: 9 additions & 13 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
@@ -1,38 +1,34 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# pip-compile --output-file=requirements/ci.txt requirements/ci.in
#
cachetools==5.3.3
cachetools==5.5.0
# via tox
chardet==5.2.0
# via tox
colorama==0.4.6
# via tox
distlib==0.3.8
# via virtualenv
filelock==3.13.1
filelock==3.15.4
# via
# tox
# virtualenv
packaging==24.0
packaging==24.1
# via
# pyproject-api
# tox
platformdirs==4.2.0
platformdirs==4.2.2
# via
# tox
# virtualenv
pluggy==1.4.0
pluggy==1.5.0
# via tox
pyproject-api==1.6.1
pyproject-api==1.7.1
# via tox
tomli==2.0.1
# via
# pyproject-api
# tox
tox==4.14.1
tox==4.18.0
# via -r requirements/ci.in
virtualenv==20.25.1
virtualenv==20.26.3
# via tox
15 changes: 7 additions & 8 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,15 @@ 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
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
# 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
57 changes: 19 additions & 38 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -1,26 +1,22 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# pip-compile --output-file=requirements/dev.txt requirements/base.in requirements/dev.in
#
appdirs==1.4.4
# via fs
asgiref==3.7.2
asgiref==3.8.1
# via django
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# django
boto3==1.34.61
boto3==1.35.3
# via fs-s3fs
botocore==1.34.61
botocore==1.35.3
# via
# boto3
# s3transfer
build==1.1.1
build==1.2.1
# via pip-tools
cachetools==5.3.3
cachetools==5.5.0
# via tox
chardet==5.2.0
# via tox
Expand All @@ -30,11 +26,11 @@ colorama==0.4.6
# via tox
distlib==0.3.8
# via virtualenv
django==4.2.11
django==4.2.15
# via
# -c requirements/common_constraints.txt
# -r requirements/base.in
filelock==3.13.1
filelock==3.15.4
# via
# tox
# virtualenv
Expand All @@ -44,63 +40,48 @@ fs==2.4.16
# fs-s3fs
fs-s3fs==1.1.1
# via -r requirements/base.in
importlib-metadata==6.11.0
# via
# -c requirements/common_constraints.txt
# build
jmespath==1.0.1
# via
# boto3
# botocore
packaging==24.0
packaging==24.1
# via
# build
# pyproject-api
# tox
pip-tools==7.4.1
# via -r requirements/dev.in
platformdirs==4.2.0
platformdirs==4.2.2
# via
# tox
# virtualenv
pluggy==1.4.0
pluggy==1.5.0
# via tox
pyproject-api==1.6.1
pyproject-api==1.7.1
# via tox
pyproject-hooks==1.0.0
pyproject-hooks==1.1.0
# via
# build
# pip-tools
python-dateutil==2.9.0.post0
# via botocore
s3transfer==0.10.0
s3transfer==0.10.2
# via boto3
six==1.16.0
# via
# fs
# fs-s3fs
# python-dateutil
sqlparse==0.4.4
sqlparse==0.5.1
# via django
tomli==2.0.1
# via
# build
# pip-tools
# pyproject-api
# pyproject-hooks
# tox
tox==4.14.1
tox==4.18.0
# via -r requirements/dev.in
typing-extensions==4.10.0
# via asgiref
urllib3==1.26.18
urllib3==2.2.2
# via botocore
virtualenv==20.25.1
virtualenv==20.26.3
# via tox
wheel==0.43.0
wheel==0.44.0
# via pip-tools
zipp==3.18.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down
21 changes: 5 additions & 16 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
@@ -1,34 +1,23 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# pip-compile --output-file=requirements/pip-tools.txt requirements/pip-tools.in
#
build==1.1.1
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.0
packaging==24.1
# via build
pip-tools==7.4.1
# via -r requirements/pip-tools.in
pyproject-hooks==1.0.0
# via
# build
# pip-tools
tomli==2.0.1
pyproject-hooks==1.1.0
# via
# build
# pip-tools
# pyproject-hooks
wheel==0.43.0
wheel==0.44.0
# via pip-tools
zipp==3.18.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down
8 changes: 4 additions & 4 deletions requirements/pip.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# pip-compile --allow-unsafe --output-file=requirements/pip.txt requirements/pip.in
#
wheel==0.43.0
wheel==0.44.0
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
pip==24.0
pip==24.2
# via -r requirements/pip.in
setuptools==69.1.1
setuptools==73.0.1
# via -r requirements/pip.in
Loading