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: added Django 5 support #93

Merged
merged 1 commit into from
Nov 20, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/django-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
max-parallel: 2
matrix:
python-version: ['3.9', '3.10']
python-version: ['3.11']

steps:
- uses: actions/checkout@v2
Expand Down
6 changes: 6 additions & 0 deletions .sassrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"includePaths": [
".",
"assets/scss/"
]
}
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ A collection of Django apps for CDH Django projects. Developed by the
Documentation provided here: https://centrefordigitalhumanities.github.io/django-shared-core/

## Currently targeting:
- Python 3.9
- Python 3.10
- Django 4.0
- Python 3.9 (Django 4 only)
- Python 3.11
- Django 4.0-4.2
- Django 5.0

Tests are run using these versions; Some apps have lower requirements, but are
not tested against these lower versions. check the app collection below for
Expand Down
3 changes: 2 additions & 1 deletion dev/requirements.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Django>=4.0,<4.1
Django==5.0rc1
../.[dev]
django-braces
django-modeltranslation
django-impersonate
Expand Down
230 changes: 170 additions & 60 deletions dev/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,128 +1,238 @@
#
# This file is autogenerated by pip-compile with Python 3.9
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile --resolver=backtracking requirements.in
# pip-compile --pre
#
asgiref==3.6.0
alabaster==0.7.13
# via sphinx
asgiref==3.7.2
# via django
build==0.10.0
babel==2.13.1
# via sphinx
blessed==1.20.0
# via curtsies
bpython==0.24
# via cdh-django-core
build==1.0.3
# via pip-tools
certifi==2022.12.7
certifi==2023.11.17
# via requests
cffi==1.15.1
cffi==1.16.0
# via cryptography
charset-normalizer==3.0.1
charset-normalizer==3.3.2
# via requests
click==8.1.3
click==8.1.7
# via pip-tools
closure==20191111
# via -r requirements.in
cryptography==39.0.0
# via
# -r requirements.in
# cdh-django-core
cryptography==41.0.5
# via
# -r requirements.in
# cdh-django-core
# pyopenssl
# pysaml2
defusedxml==0.7.1
curtsies==0.4.2
# via bpython
cwcwidth==0.1.9
# via
# bpython
# curtsies
defusedxml==0.8.0rc2
# via
# djangosaml2
# pysaml2
django==4.0.8
deprecated==1.2.14
# via cdh-django-core
django==5.0rc1
# via
# -r requirements.in
# cdh-django-core
# django-braces
# django-csp
# django-debug-toolbar
# django-extensions
# django-filter
# django-modeltranslation
# django-simple-menu
# djangorestframework
# djangosaml2
# sphinxcontrib-django
django-braces==1.15.0
# via -r requirements.in
# via
# -r requirements.in
# cdh-django-core
django-csp==3.7
# via -r requirements.in
django-debug-toolbar==3.8.1
# via -r requirements.in
django-extensions==3.2.1
# via -r requirements.in
django-impersonate==1.8.2
# via -r requirements.in
django-modeltranslation==0.18.7
# via -r requirements.in
django-simple-menu==2.1.0
# via -r requirements.in
# via
# -r requirements.in
# cdh-django-core
django-debug-toolbar==4.2.0
# via
# -r requirements.in
# cdh-django-core
django-extensions==3.2.3
# via
# -r requirements.in
# cdh-django-core
django-filter==23.3
# via cdh-django-core
django-impersonate==1.9.1
# via
# -r requirements.in
# cdh-django-core
django-modeltranslation==0.18.13b1
# via
# -r requirements.in
# cdh-django-core
django-simple-menu==2.1.3
# via
# -r requirements.in
# cdh-django-core
djangorestframework==3.14.0
# via -r requirements.in
djangosaml2==1.5.5
# via -r requirements.in
elementpath==3.0.2
# via
# -r requirements.in
# cdh-django-core
djangosaml2==1.8.0
# via
# -r requirements.in
# cdh-django-core
docutils==0.20.1
# via sphinx
elementpath==4.1.5
# via xmlschema
faker==20.0.3
# via cdh-django-core
greenlet==3.0.1
# via bpython
idna==3.4
# via requests
importlib-metadata==6.0.0
# via django-simple-menu
imagesize==1.4.1
# via sphinx
jinja2==3.1.2
# via sphinx
lesscpy==0.15.1
# via
# -r requirements.in
# cdh-django-core
markupsafe==2.1.3
# via jinja2
mysqlclient==2.2.0
# via -r requirements.in
mysqlclient==2.1.1
# via -r requirements.in
packaging==23.0
# via build
pip-tools==6.12.1
# via -r requirements.in
packaging==23.2
# via
# build
# sphinx
pbr==6.0.0
# via sphinxcontrib-apidoc
pip-tools==7.3.0
# via
# -r requirements.in
# cdh-django-core
ply==3.11
# via lesscpy
pprintpp==0.4.0
# via sphinxcontrib-django
pscript==0.7.7
# via vbuild
pycparser==2.21
# via cffi
pyjwt==2.6.0
# via -r requirements.in
pyopenssl==23.0.0
pygments==2.17.1
# via
# bpython
# sphinx
pyjwt==2.8.0
# via
# -r requirements.in
# cdh-django-core
pyopenssl==23.3.0
# via pysaml2
pyproject-hooks==1.0.0
# via build
pysaml2==7.2.1
pysaml2==7.4.2
# via djangosaml2
pyscss==1.4.0
# via -r requirements.in
# via
# -r requirements.in
# cdh-django-core
python-dateutil==2.8.2
# via pysaml2
# via
# faker
# pysaml2
python-magic==0.4.27
# via -r requirements.in
pytz==2022.7.1
# via
# -r requirements.in
# cdh-django-core
pytz==2023.3.post1
# via
# djangorestframework
# pysaml2
requests==2.28.2
pyxdg==0.28
# via bpython
requests==2.31.0
# via
# -r requirements.in
# bpython
# cdh-django-core
# pysaml2
# sphinx
six==1.16.0
# via
# pysaml2
# blessed
# pyscss
# python-dateutil
sqlparse==0.4.3
snowballstemmer==2.2.0
# via sphinx
sphinx==7.2.6
# via
# cdh-django-core
# sphinxcontrib-apidoc
# sphinxcontrib-applehelp
# sphinxcontrib-devhelp
# sphinxcontrib-django
# sphinxcontrib-htmlhelp
# sphinxcontrib-qthelp
# sphinxcontrib-serializinghtml
# uu-sphinx-theme
sphinxcontrib-apidoc==0.4.0
# via cdh-django-core
sphinxcontrib-applehelp==1.0.7
# via sphinx
sphinxcontrib-devhelp==1.0.5
# via sphinx
sphinxcontrib-django==2.5
# via sphinxcontrib-django2
sphinxcontrib-django2==1.9
# via cdh-django-core
sphinxcontrib-htmlhelp==2.0.4
# via sphinx
sphinxcontrib-jsmath==1.0.1
# via sphinx
sphinxcontrib-qthelp==1.0.6
# via sphinx
sphinxcontrib-serializinghtml==1.1.9
# via sphinx
sqlparse==0.4.4
# via
# django
# django-debug-toolbar
tomli==2.0.1
# via
# build
# pyproject-hooks
typing-extensions==4.4.0
# via django-modeltranslation
urllib3==1.26.14
urllib3==2.1.0
# via requests
vbuild==0.8.1
# via -r requirements.in
wheel==0.38.4
uu-sphinx-theme @ git+https://github.com/CentreForDigitalHumanities/sphinx-theme.git@main
# via cdh-django-core
vbuild==0.8.2
# via
# -r requirements.in
# cdh-django-core
wcwidth==0.2.10
# via blessed
wheel==0.41.3
# via pip-tools
xmlschema==2.1.1
wrapt==1.16.0
# via deprecated
xmlschema==2.5.0
# via pysaml2
zipp==3.11.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down
18 changes: 9 additions & 9 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ classifiers = [
"Operating System :: Linux",
]
dependencies = [
"Django >=2.0,<5.0",
"Django >=2.0,<5.1",
"Deprecated",
]

[project.urls]
repository = "https://github.com/DH-IT-Portal-Development/django-shared-core"
documentation = "https://dh-it-portal-development.github.io/django-shared-core/"
repository = "https://github.com/CentreForDigitalHumanities/django-shared-core"
documentation = "https://centrefordigitalhumanities.github.io/django-shared-core/"

[project.optional-dependencies]
all = [
Expand All @@ -48,32 +48,32 @@ core = [
"djangorestframework",
"django-csp",
"cryptography",
"Django >=4.0,<5.0",
"Django >=4.0,<5.1",
]
federated-auth = [
"djangosaml2 <1.7",
"djangosaml2",
]
files = [
"python-magic",
"Django >=4.0,<5.0",
"Django >=4.0,<5.1",
]
integration_platform = [
"cdh-django-core[rest]",
"Django >=3.0,<5.0",
"Django >=3.0,<5.1",
]
rest = [
"requests",
"PyJWT",
"djangorestframework",
"django-filter",
"Django >=3.0,<5.0",
"Django >=3.0,<5.1",
]
vue = [
"pyscss",
"lesscpy",
"closure",
"vbuild",
"Django >=3.0,<5.0",
"Django >=3.0,<5.1",
]
docs = [
"sphinx",
Expand Down
Loading