Skip to content

Commit

Permalink
Merge pull request #68 from bonhams-tech/pyup-update-django-4.1-to-5.0
Browse files Browse the repository at this point in the history
Update django to 5.0
  • Loading branch information
tumb1er committed Apr 17, 2024
2 parents d3ddaf9 + 44c032a commit 221c114
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 28 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: [3.6, 3.7, 3.8, 3.9, "3.10"]
python-version: [3.8, 3.9, "3.10", "3.11", "3.12"]

steps:
- uses: actions/checkout@v1
Expand All @@ -19,7 +19,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install tox tox-gh-actions wheel
pip install setuptools tox tox-gh-actions wheel
sed -i '/Django==.*/d' ./requirements.txt # delete django dependency
- name: Test with tox
run: |
Expand Down
5 changes: 3 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Django==4.1
Django==5.0
dj-inmemorystorage==2.1.0
django-testing-utils==0.5.0
django-testing-utils==0.7.0
setuptools==69.5.1
15 changes: 6 additions & 9 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def get_version():

setup(
name='django-sitemap-generate',
version=get_version() or 'dev',
version=get_version() or '9999999',
long_description=long_description,
long_description_content_type='text/markdown',
packages=find_packages(),
Expand All @@ -70,23 +70,20 @@ def get_version():
author_email='zimbler@gmail.com',
description='Background sitemap generation for Django',
install_requires=[
'Django>=2.2,<4.2',
'Django>=3.2,<5.1',
],
classifiers=[
'Development Status :: 4 - Beta',
'Environment :: Console',
'Framework :: Django :: 2.2',
'Framework :: Django :: 3.0',
'Framework :: Django :: 3.1',
'Framework :: Django :: 3.2',
'Framework :: Django :: 4.0',
'Framework :: Django :: 4.1',
'Framework :: Django :: 4.2',
'Framework :: Django :: 5.0',
'Operating System :: POSIX',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
('Topic :: Internet :: WWW/HTTP :: Dynamic Content :: '
'Content Management System'),
]
Expand Down
24 changes: 9 additions & 15 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,33 +1,27 @@
[tox]
envlist =
{py3.6,py3.7,py3.8,py3.9,py3.10}-django2.2
{py3.6,py3.7,py3.8,py3.9,py3.10}-django3.0
{py3.6,py3.7,py3.8,py3.9,py3.10}-django3.1
{py3.6,py3.7,py3.8,py3.9,py3.10}-django3.2
{py3.8,py3.9,py3.10}-django4.0
{py3.8,py3.9,py3.10}-django4.1
{py3.8,py3.9,py3.10}-django3.2
{py3.8,py3.9,py3.10}-django4.2
{py3.10,py3.11,py3.12}-django5.0

[gh-actions]
python =
3.6: py3.6
3.7: py3.7
3.8: py3.8
3.9: py3.9
3.10: py3.10
3.11: py3.11
3.12: py3.12

[testenv]
basepython =
py3.6: python3.6
py3.7: python3.7
py3.8: python3.8
py3.9: python3.9
py3.10: python3.10
py3.11: python3.11
py3.12: python3.12
deps =
-r requirements.txt
django2.2: Django~=2.2.0
django3.0: Django~=3.0.0
django3.1: Django~=3.1.0
django3.2: Django~=3.2.0
django4.0: Django~=4.0.0
django4.1: Django~=4.1.0
django4.1: Django~=4.2.0
django5.0: Django~=5.0.0
commands = python manage.py test

0 comments on commit 221c114

Please sign in to comment.