From 5d78014378f019f581dc86e27c8f540b990cb407 Mon Sep 17 00:00:00 2001 From: Mario Rosa Date: Sun, 21 Jan 2024 15:41:02 -0500 Subject: [PATCH 1/8] Update tox.ini --- tox.ini | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 0e937f7..4e5e63b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,14 @@ [tox] envlist = py{36,37,38,39,310,py3}-django32 - py{38,39,310,311,py3}-django{41,42,main} + py{38,39,310,311,py3}-django{41,42} + py{312}-django{42} + py{310,311,312,py3}-django{50,main} [testenv] deps = djangomain: https://github.com/django/django/tarball/main + # January 2024 - April 2025 + django50: django<5.1 # LTS April 2023 - April 2026 django42: django<4.3 # August 2022 - December 2023 From dc1fcf0ce84b038cd56b72eb47094e2cdad89d7e Mon Sep 17 00:00:00 2001 From: Mario Rosa Date: Sun, 21 Jan 2024 15:57:59 -0500 Subject: [PATCH 2/8] Update main.yml --- .github/workflows/main.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 259f997..5065a5b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,7 +23,7 @@ jobs: toxenv: py39-django32 - python: "3.10" toxenv: py310-django32 - - python: "pypy-3.9" + - python: "pypy-3.10" toxenv: pypy3-django32 - python: "3.8" @@ -34,7 +34,7 @@ jobs: toxenv: py310-django41 - python: "3.11" toxenv: py311-django41 - - python: "pypy-3.9" + - python: "pypy-3.10" toxenv: pypy3-django41 - python: "3.8" @@ -45,8 +45,17 @@ jobs: toxenv: py310-django42 - python: "3.11" toxenv: py311-django42 - - python: "pypy-3.9" + - python: "pypy-3.10" toxenv: pypy3-django42 + + - python: "3.10" + toxenv: py310-django50 + - python: "3.11" + toxenv: py311-django50 + - python: "3.12" + toxenv: py312-django50 + - python: "pypy-3.10" + toxenv: pypy3-django50 steps: - uses: actions/checkout@v2 - name: Setup Python From 605b2333fc72728f3e4f194a1603b18ddf4ceedf Mon Sep 17 00:00:00 2001 From: Mario Rosa Date: Sun, 21 Jan 2024 16:12:11 -0500 Subject: [PATCH 3/8] Update setup.py --- setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py index b2d2d58..691837a 100644 --- a/setup.py +++ b/setup.py @@ -50,6 +50,7 @@ def find_version(*parts): 'Framework :: Django :: 3.2', 'Framework :: Django :: 4.1', 'Framework :: Django :: 4.2', + 'Framework :: Django :: 5.0', 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Operating System :: OS Independent', @@ -61,6 +62,7 @@ def find_version(*parts): 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', 'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: PyPy', 'Topic :: Utilities', From ad1a95bb0e4370d73aee4fbdeb333263eee426f1 Mon Sep 17 00:00:00 2001 From: Mario Rosa Date: Sun, 21 Jan 2024 16:13:38 -0500 Subject: [PATCH 4/8] Update __init__.py --- src/django_cleanup/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/django_cleanup/__init__.py b/src/django_cleanup/__init__.py index cfc4286..567c9f3 100644 --- a/src/django_cleanup/__init__.py +++ b/src/django_cleanup/__init__.py @@ -4,4 +4,4 @@ will delete files on model instance deletion. ''' -__version__ = '8.0.0' +__version__ = '8.1.0' From c3f04842b7b83fb77f20c0a189dd44977b073eb0 Mon Sep 17 00:00:00 2001 From: Mario Rosa Date: Sun, 21 Jan 2024 16:15:23 -0500 Subject: [PATCH 5/8] Update README.rst --- README.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index 83409a3..99f2e5c 100644 --- a/README.rst +++ b/README.rst @@ -11,7 +11,7 @@ is set as the :code:`FileField`'s default value will not be deleted. Compatibility ------------- -- Django 3.2, 4.1, 4.2 (`See Django Supported Versions `_) +- Django 3.2, 4.1, 4.2, 5.0 (`See Django Supported Versions `_) - Python 3.6+ - Compatible with `sorl-thumbnail `_ - Compatible with `easy-thumbnail `_ @@ -164,9 +164,9 @@ Install, setup and use pyenv_ to install all the required versions of cPython (see the `tox.ini `_). Setup pyenv_ to have all versions of python activated within your local django-cleanup repository. -Ensuring that the python 3.11 that was installed is first priority. +Ensuring that the python 3.12 that was installed is first priority. -Install tox_ on python 3.11 and run the :code:`tox` command from your local django-cleanup +Install tox_ on python 3.12 and run the :code:`tox` command from your local django-cleanup repository. How to write tests From b3db303bf2ab0c85021556f570f6e176ecdbf986 Mon Sep 17 00:00:00 2001 From: Mario Rosa Date: Sun, 21 Jan 2024 16:18:29 -0500 Subject: [PATCH 6/8] Update CHANGELOG.md --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1be583a..4171475 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ 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.1.0] - 2024-01-xx +### Added +- Run tests for django 5.0 and python 3.12. + ## [8.0.0] - 2023-06-14 ### Added - Run tests for django 4.2. PR [#100] from [@johnthagen](https://github.com/johnthagen). @@ -89,7 +93,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/8.0.0...HEAD +[Unreleased]: https://github.com/un1t/django-cleanup/compare/8.1.0...HEAD +[8.1.0]: https://github.com/un1t/django-cleanup/compare/8.0.0...8.1.0 [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 From eb51bc05b5aee67c4118b9d80740001842656921 Mon Sep 17 00:00:00 2001 From: Mario Rosa Date: Sun, 21 Jan 2024 16:21:27 -0500 Subject: [PATCH 7/8] Update tox.ini --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 4e5e63b..e37ca54 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ envlist = py{36,37,38,39,310,py3}-django32 py{38,39,310,311,py3}-django{41,42} - py{312}-django{42} + py{312}-django42 py{310,311,312,py3}-django{50,main} [testenv] deps = From 2ed9b374c549c12abc5bb3fe0a8423a8e6cde777 Mon Sep 17 00:00:00 2001 From: Mario Rosa Date: Sun, 28 Jan 2024 18:50:52 -0500 Subject: [PATCH 8/8] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4171475..2591bcb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ 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.1.0] - 2024-01-xx +## [8.1.0] - 2024-01-28 ### Added - Run tests for django 5.0 and python 3.12.