From 0483cf148d43d8c7adad79ad07b3ad3286bf93d2 Mon Sep 17 00:00:00 2001 From: Pascal Date: Fri, 21 Oct 2022 13:24:21 +0200 Subject: [PATCH 1/3] Update django and ci --- .github/workflows/test.yml | 13 +++++++++---- CHANGELOG.md | 4 +++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f21adb1..46ed49e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,15 +7,20 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.7', '3.8', 'pypy3'] - django-version: ['2.2', '3.1', '3.2'] + python-version: ['3.7', '3.8', '3.9', '3.10'] + django-version: ['3.2', '4.0', '4.1'] pytest-version: ['pytest'] pytest-django-version: ['pytest-django'] + exclude: + - python-version: '3.7' + django-version: '4.0' + - python-version: '3.7' + django-version: '4.1' steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} @@ -41,4 +46,4 @@ jobs: coverage xml - name: Upload coverage to Codecov - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v3 diff --git a/CHANGELOG.md b/CHANGELOG.md index e451efc..88da74b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,9 +10,11 @@ PyPi: [https://pypi.org/project/django-request-cache/](https://pypi.org/project/ ### Removed - Dropped support for Python 3.5 and 3.6 - Dropped support for Django 2.1 +- Dropped support for Django 2.2 ### Added - Added support for Python 3.9 and 3.10 - Added support for Django 3.1 and 3.2 +- Added support for Django 4.0 and 4.1 ## [1.2](https://pypi.org/project/django-request-cache/1.2/) ### Added @@ -26,4 +28,4 @@ PyPi: [https://pypi.org/project/django-request-cache/](https://pypi.org/project/ ## [1.0](https://pypi.org/project/django-request-cache/1.0/) ### Added -- Initial Release \ No newline at end of file +- Initial Release From 599e7f6395fa12bd8d3984f780fead5254f76612 Mon Sep 17 00:00:00 2001 From: Pascal Date: Fri, 21 Oct 2022 13:33:42 +0200 Subject: [PATCH 2/3] change classifiers and installs --- setup.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 8a582b2..89396c3 100644 --- a/setup.py +++ b/setup.py @@ -19,16 +19,15 @@ author='Harald Nezbeda', author_email='hnezbeda@anexia-it.com', install_requires=[ - "django>=2.2,!=3.0.*", "django_userforeignkey" ], classifiers=[ 'Development Status :: 5 - Production/Stable', 'Environment :: Web Environment', 'Framework :: Django', - 'Framework :: Django :: 2.2', - 'Framework :: Django :: 3.1', 'Framework :: Django :: 3.2', + 'Framework :: Django :: 4.0', + 'Framework :: Django :: 4.1', 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Operating System :: OS Independent', From b648acdd06e3a6a087872e53199aa3c8ee5cf880 Mon Sep 17 00:00:00 2001 From: Pascal Date: Fri, 21 Oct 2022 13:35:15 +0200 Subject: [PATCH 3/3] remove tab --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 46ed49e..b639813 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ jobs: django-version: ['3.2', '4.0', '4.1'] pytest-version: ['pytest'] pytest-django-version: ['pytest-django'] - exclude: + exclude: - python-version: '3.7' django-version: '4.0' - python-version: '3.7'