Skip to content

Commit

Permalink
Merge pull request #167 from anexia-it/django-4x
Browse files Browse the repository at this point in the history
Update readme, compatibility matrix, prepare new release
  • Loading branch information
beachmachine committed Sep 15, 2022
2 parents ee7ec10 + 390f860 commit 49ddcd6
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 26 deletions.
32 changes: 14 additions & 18 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,36 +8,32 @@ jobs:
fail-fast: false
matrix:
python-version:
- "3.5"
- "3.6"
- "3.7"
- "3.8"
- "3.9"
- "3.10"
django-version:
- "2.2"
- "3.1"
- "3.2"
- "4.0"
- "4.1"
drf-version:
- "3.10"
- "3.11"
- "3.12"
- "3.13"
exclude:
- python-version: "3.5"
django-version: "3.1"
- python-version: "3.5"
django-version: "3.2"
# DRF 3.10 imports FieldDoesNotExist from django.db.models,
# which has been moved to django.core.exceptions as of Django 3.1
- django-version: "3.1"
drf-version: "3.10"
- django-version: "3.2"
drf-version: "3.10"
- python-version: "3.7"
django-version: "4.0"
- python-version: "3.7"
django-version: "4.1"
- drf-version: "3.12"
django-version: "4.0"
- drf-version: "3.12"
django-version: "4.1"

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}

Expand Down
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

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

## [1.3.0]

### Added
- Support for Python 3.10
- Support for Django 3.2, 4.0, 4.1
- Support for DRF 3.12, 3.13
### Changed
- Dropped support for Python 3.5, 3.6
- Dropped support Django 2.2, 3.0, 3.1
- Dropped support form DRF 3.11, 3.12

## [1.2.1]
### Fixed
- CVE-2019-19844 potentials
Expand Down Expand Up @@ -45,6 +56,7 @@ PyPi: [https://pypi.org/project/django-rest-passwordreset/](https://pypi.org/pro
## [0.9.0]
- Initial Release

[1.3.0]: https://github.com/anexia-it/django-rest-passwordreset/compare/1.2.1...1.3.0
[1.2.1]: https://github.com/anexia-it/django-rest-passwordreset/compare/1.2.0...1.2.1
[1.2.0]: https://github.com/anexia-it/django-rest-passwordreset/compare/1.1.0...1.2.0
[1.1.0]: https://github.com/anexia-it/django-rest-passwordreset/compare/1.0.0...1.1.0
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,7 @@ django-rest-passwordreset Version | Django Versions | Django Rest Framework Vers
1.0 | 1.11, 2.0, 2.2 | 3.6 - 3.9 | 2.7
1.1 | 1.11, 2.2 | 3.6 - 3.9 | 2.7
1.2 | 2.2, 3.0, 3.1 | 3.10, 3.11 | 3.5 - 3.8
1.3 | 3.2, 4.0, 4.1 | 3.12, 3.13 | 3.7 - 3.10


## Documentation / Browsable API
Expand Down
16 changes: 8 additions & 8 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,25 @@
description='An extension of django rest framework, providing a configurable password reset strategy',
long_description=README,
long_description_content_type='text/markdown', # This is important for README.md in markdown format
url='https://github.com/anx-ckreuzberger/django-rest-passwordreset',
author='Christian Kreuzberger',
author_email='ckreuzberger@anexia-it.com',
url='https://github.com/anexia-it/django-rest-passwordreset',
author='Harald Nezbeda',
author_email='HNezbeda@anexia-it.com',
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Web Environment',
'Framework :: Django',
'Framework :: Django :: 2.2',
'Framework :: Django :: 3.0',
'Framework :: Django :: 3.1',
'Framework :: Django :: 3.2',
'Framework :: Django :: 4.0',
'Framework :: Django :: 4.1',
'Intended Audience :: Developers',
'License :: OSI Approved :: BSD License',
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'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',
'Topic :: Internet :: WWW/HTTP',
'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
],
Expand Down

0 comments on commit 49ddcd6

Please sign in to comment.