Skip to content

Commit

Permalink
Merge pull request #48 from just-work/pyup-update-django-4.0.6-to-4.1
Browse files Browse the repository at this point in the history
Update django to 4.1
  • Loading branch information
tumb1er authored Aug 21, 2022
2 parents 793d533 + 8bce921 commit d3ddaf9
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 22 deletions.
33 changes: 14 additions & 19 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,19 @@ jobs:
max-parallel: 4
matrix:
python-version: [3.6, 3.7, 3.8, 3.9, "3.10"]
django-version: [2.2, 3.0, 3.1, 3.2]

steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Install Dependencies
run: |
python -m pip install --upgrade pip
pip install -q -e .
echo "Python ${{ matrix.python-version }} -> Django ${{ matrix.django-version }}"
sed -i '/Django==.*/d' ./requirements.txt # delete django dependency
pip install -r requirements.txt
python -m pip install "Django~=${{ matrix.django-version }}.0"
echo "Django: `django-admin --version`"
python --version
- name: Run Tests
run: |
python manage.py test
- uses: actions/checkout@v1
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install tox tox-gh-actions wheel
sed -i '/Django==.*/d' ./requirements.txt # delete django dependency
- name: Test with tox
run: |
tox
python setup.py sdist bdist_wheel install
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Django==4.0.6
Django==4.1
dj-inmemorystorage==2.1.0
django-testing-utils==0.4.0
django-testing-utils==0.5.0
4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def get_version():
author_email='[email protected]',
description='Background sitemap generation for Django',
install_requires=[
'Django>=2.2,<4.1',
'Django>=2.2,<4.2',
],
classifiers=[
'Development Status :: 4 - Beta',
Expand All @@ -79,6 +79,8 @@ def get_version():
'Framework :: Django :: 3.0',
'Framework :: Django :: 3.1',
'Framework :: Django :: 3.2',
'Framework :: Django :: 4.0',
'Framework :: Django :: 4.1',
'Operating System :: POSIX',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
Expand Down
33 changes: 33 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
[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

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

[testenv]
basepython =
py3.6: python3.6
py3.7: python3.7
py3.8: python3.8
py3.9: python3.9
py3.10: python3.10
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
commands = python manage.py test

0 comments on commit d3ddaf9

Please sign in to comment.