Skip to content

Commit

Permalink
Merge pull request #103 from un1t/feature/8.0
Browse files Browse the repository at this point in the history
Feature/8.0
  • Loading branch information
vinnyrose committed Jun 14, 2023
2 parents 2bc1a08 + 40078da commit d6ef9fa
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 21 deletions.
24 changes: 13 additions & 11 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,9 @@ jobs:
toxenv: py39-django32
- python: "3.10"
toxenv: py310-django32
- python: "pypy-3.8"
- python: "pypy-3.9"
toxenv: pypy3-django32

- python: "3.8"
toxenv: py38-django40
- python: "3.9"
toxenv: py39-django40
- python: "3.10"
toxenv: py310-django40
- python: "pypy-3.8"
toxenv: pypy3-django40

- python: "3.8"
toxenv: py38-django41
- python: "3.9"
Expand All @@ -43,8 +34,19 @@ jobs:
toxenv: py310-django41
- python: "3.11"
toxenv: py311-django41
- python: "pypy-3.8"
- python: "pypy-3.9"
toxenv: pypy3-django41

- python: "3.8"
toxenv: py38-django42
- python: "3.9"
toxenv: py39-django42
- python: "3.10"
toxenv: py310-django42
- python: "3.11"
toxenv: py311-django42
- python: "pypy-3.9"
toxenv: pypy3-django42
steps:
- uses: actions/checkout@v2
- name: Setup Python
Expand Down
11 changes: 10 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
## [8.0.0] - 2023-06-14
### Added
- Run tests for django 4.2. PR [#100] from [@johnthagen](https://github.com/johnthagen).

### Removed
- Dropped support for django 4.0.

## [7.0.0] - 2023-02-11
### Added
- Run tests for django 4.1.
Expand Down Expand Up @@ -82,7 +89,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [0.1.4] - 2012-08-16
## [0.1.0] - 2012-08-14

[Unreleased]: https://github.com/un1t/django-cleanup/compare/7.0.0...HEAD
[Unreleased]: https://github.com/un1t/django-cleanup/compare/8.0.0...HEAD
[8.0.0]: https://github.com/un1t/django-cleanup/compare/7.0.0...8.0.0
[7.0.0]: https://github.com/un1t/django-cleanup/compare/6.0.0...7.0.0
[6.0.0]: https://github.com/un1t/django-cleanup/compare/5.2.0...6.0.0
[5.2.0]: https://github.com/un1t/django-cleanup/compare/5.1.0...5.2.0
Expand Down Expand Up @@ -118,6 +126,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
[0.1.4]: https://github.com/un1t/django-cleanup/compare/0.1.0...0.1.4
[0.1.0]: https://github.com/un1t/django-cleanup/releases/tag/0.1.0

[#100]: https://github.com/un1t/django-cleanup/pull/100
[#98]: https://github.com/un1t/django-cleanup/issues/98
[#96]: https://github.com/un1t/django-cleanup/issues/96
[#89]: https://github.com/un1t/django-cleanup/issues/89
Expand Down
6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ is set as the :code:`FileField`'s default value will not be deleted.

Compatibility
-------------
- Django 3.2, 4.0, 4.1 (`See Django Supported Versions <https://www.djangoproject.com/download/#supported-versions>`_)
- Django 3.2, 4.1, 4.2 (`See Django Supported Versions <https://www.djangoproject.com/download/#supported-versions>`_)
- Python 3.6+
- Compatible with `sorl-thumbnail <https://github.com/jazzband/sorl-thumbnail>`_
- Compatible with `easy-thumbnail <https://github.com/SmileyChris/easy-thumbnails>`_
Expand Down Expand Up @@ -164,9 +164,9 @@ Install, setup and use pyenv_ to install all the required versions of cPython
(see the `tox.ini <https://github.com/un1t/django-cleanup/blob/master/tox.ini>`_).

Setup pyenv_ to have all versions of python activated within your local django-cleanup repository.
Ensuring that the python 3.10 that was installed is first priority.
Ensuring that the python 3.11 that was installed is first priority.

Install tox_ on python 3.10 and run the :code:`tox` command from your local django-cleanup
Install tox_ on python 3.11 and run the :code:`tox` command from your local django-cleanup
repository.

How to write tests
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ def find_version(*parts):
'Environment :: Web Environment',
'Framework :: Django',
'Framework :: Django :: 3.2',
'Framework :: Django :: 4.0',
'Framework :: Django :: 4.1',
'Framework :: Django :: 4.2',
'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License',
'Operating System :: OS Independent',
Expand Down
2 changes: 1 addition & 1 deletion src/django_cleanup/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
will delete files on model instance deletion.
'''

__version__ = '7.0.0'
__version__ = '8.0.0'
1 change: 1 addition & 0 deletions test/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ pytest-pythonpath
pytest-cov
pytest-xdist
pytest-forked
asgiref<3.7.0
5 changes: 1 addition & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
[tox]
envlist =
py{36,37,38,39,310,py3}-django32
py{38,39,310,py3}-django40
py{38,39,310,311,py3}-django{41,main}
py{38,39,310,311,py3}-django{41,42,main}
[testenv]
deps =
djangomain: https://github.com/django/django/tarball/main
# LTS April 2023 - April 2026
django42: django<4.3
# August 2022 - December 2023
django41: django<4.2
# December 2021 - April 2023
django40: django<4.1
# LTS April 2021 - April 2024
django32: django<3.3
-rtest/requirements.txt
Expand Down

0 comments on commit d6ef9fa

Please sign in to comment.