Skip to content

Commit 49ddcd6

Browse files
authored
Merge pull request #167 from anexia-it/django-4x
Update readme, compatibility matrix, prepare new release
2 parents ee7ec10 + 390f860 commit 49ddcd6

File tree

4 files changed

+35
-26
lines changed

4 files changed

+35
-26
lines changed

.github/workflows/test.yml

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,36 +8,32 @@ jobs:
88
fail-fast: false
99
matrix:
1010
python-version:
11-
- "3.5"
12-
- "3.6"
1311
- "3.7"
1412
- "3.8"
1513
- "3.9"
14+
- "3.10"
1615
django-version:
17-
- "2.2"
18-
- "3.1"
1916
- "3.2"
17+
- "4.0"
18+
- "4.1"
2019
drf-version:
21-
- "3.10"
22-
- "3.11"
2320
- "3.12"
21+
- "3.13"
2422
exclude:
25-
- python-version: "3.5"
26-
django-version: "3.1"
27-
- python-version: "3.5"
28-
django-version: "3.2"
29-
# DRF 3.10 imports FieldDoesNotExist from django.db.models,
30-
# which has been moved to django.core.exceptions as of Django 3.1
31-
- django-version: "3.1"
32-
drf-version: "3.10"
33-
- django-version: "3.2"
34-
drf-version: "3.10"
23+
- python-version: "3.7"
24+
django-version: "4.0"
25+
- python-version: "3.7"
26+
django-version: "4.1"
27+
- drf-version: "3.12"
28+
django-version: "4.0"
29+
- drf-version: "3.12"
30+
django-version: "4.1"
3531

3632
steps:
37-
- uses: actions/checkout@v2
33+
- uses: actions/checkout@v3
3834

3935
- name: Set up Python ${{ matrix.python-version }}
40-
uses: actions/setup-python@v2
36+
uses: actions/setup-python@v4
4137
with:
4238
python-version: ${{ matrix.python-version }}
4339

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
PyPi: [https://pypi.org/project/django-rest-passwordreset/](https://pypi.org/project/django-rest-passwordreset/).
88

9+
## [1.3.0]
10+
11+
### Added
12+
- Support for Python 3.10
13+
- Support for Django 3.2, 4.0, 4.1
14+
- Support for DRF 3.12, 3.13
15+
### Changed
16+
- Dropped support for Python 3.5, 3.6
17+
- Dropped support Django 2.2, 3.0, 3.1
18+
- Dropped support form DRF 3.11, 3.12
19+
920
## [1.2.1]
1021
### Fixed
1122
- CVE-2019-19844 potentials
@@ -45,6 +56,7 @@ PyPi: [https://pypi.org/project/django-rest-passwordreset/](https://pypi.org/pro
4556
## [0.9.0]
4657
- Initial Release
4758

59+
[1.3.0]: https://github.com/anexia-it/django-rest-passwordreset/compare/1.2.1...1.3.0
4860
[1.2.1]: https://github.com/anexia-it/django-rest-passwordreset/compare/1.2.0...1.2.1
4961
[1.2.0]: https://github.com/anexia-it/django-rest-passwordreset/compare/1.1.0...1.2.0
5062
[1.1.0]: https://github.com/anexia-it/django-rest-passwordreset/compare/1.0.0...1.1.0

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@ django-rest-passwordreset Version | Django Versions | Django Rest Framework Vers
268268
1.0 | 1.11, 2.0, 2.2 | 3.6 - 3.9 | 2.7
269269
1.1 | 1.11, 2.2 | 3.6 - 3.9 | 2.7
270270
1.2 | 2.2, 3.0, 3.1 | 3.10, 3.11 | 3.5 - 3.8
271+
1.3 | 3.2, 4.0, 4.1 | 3.12, 3.13 | 3.7 - 3.10
271272

272273

273274
## Documentation / Browsable API

setup.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,25 @@
1717
description='An extension of django rest framework, providing a configurable password reset strategy',
1818
long_description=README,
1919
long_description_content_type='text/markdown', # This is important for README.md in markdown format
20-
url='https://github.com/anx-ckreuzberger/django-rest-passwordreset',
21-
author='Christian Kreuzberger',
22-
author_email='ckreuzberger@anexia-it.com',
20+
url='https://github.com/anexia-it/django-rest-passwordreset',
21+
author='Harald Nezbeda',
22+
author_email='HNezbeda@anexia-it.com',
2323
classifiers=[
2424
'Development Status :: 5 - Production/Stable',
2525
'Environment :: Web Environment',
2626
'Framework :: Django',
27-
'Framework :: Django :: 2.2',
28-
'Framework :: Django :: 3.0',
29-
'Framework :: Django :: 3.1',
27+
'Framework :: Django :: 3.2',
28+
'Framework :: Django :: 4.0',
29+
'Framework :: Django :: 4.1',
3030
'Intended Audience :: Developers',
3131
'License :: OSI Approved :: BSD License',
3232
'Operating System :: OS Independent',
3333
'Programming Language :: Python',
3434
'Programming Language :: Python :: 3',
35-
'Programming Language :: Python :: 3.5',
36-
'Programming Language :: Python :: 3.6',
3735
'Programming Language :: Python :: 3.7',
3836
'Programming Language :: Python :: 3.8',
37+
'Programming Language :: Python :: 3.9',
38+
'Programming Language :: Python :: 3.10',
3939
'Topic :: Internet :: WWW/HTTP',
4040
'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
4141
],

0 commit comments

Comments
 (0)