From b5273d133395f3e12f4f97dec85ec341757b0bbb Mon Sep 17 00:00:00 2001 From: Josh Yu Date: Thu, 16 May 2024 10:20:07 +0800 Subject: [PATCH] Release 1.6.0 (#2) * Bump version to 1.6.0 * update release date --------- Co-authored-by: Josh Yu --- CHANGELOG.rst | 7 +++++++ djangocms_content_expiry/__init__.py | 2 +- tests/requirements/requirements_base.txt | 4 ++-- tox.ini | 7 ++++--- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index a01d549..35e2736 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,13 @@ Changelog unreleased ========== +1.6.0 (2024-05-16) +================== +* addd support for django 4.2 +* add support for Python 3.10 +* drop support for django < 3.2 + + 1.5.0 (2022-09-13) ================== * feat: Changed compliance number length to 30 characters diff --git a/djangocms_content_expiry/__init__.py b/djangocms_content_expiry/__init__.py index 74fa4e2..3e08891 100644 --- a/djangocms_content_expiry/__init__.py +++ b/djangocms_content_expiry/__init__.py @@ -1,3 +1,3 @@ -__version__ = "1.5.0" +__version__ = "1.6.0" default_app_config = "djangocms_content_expiry.apps.DjangocmsContentExpiryConfig" diff --git a/tests/requirements/requirements_base.txt b/tests/requirements/requirements_base.txt index 41aa8e1..5f22579 100644 --- a/tests/requirements/requirements_base.txt +++ b/tests/requirements/requirements_base.txt @@ -25,6 +25,6 @@ unittest-xml-reporting==1.11.0 # Unreleased django-cms 4.0 compatible packages https://github.com/django-cms/django-cms/tarball/release/4.0.1.x#egg=django-cms -https://github.com/joshyu/djangocms-alias/tarball/feat/django-42-compatible#egg=djangocms-alias -https://github.com/FidelityInternational/djangocms-moderation/tarball/feature/django-42-compat#egg=djangocms-moderation +https://github.com/django-cms/djangocms-alias/tarball/support/django-cms-4.0.x#egg=djangocms-alias +https://github.com/django-cms/djangocms-moderation/tarball/master#egg=djangocms-moderation https://github.com/django-cms/djangocms-versioning/tarball/support/django-cms-4.0.x#egg=djangocms-versioning diff --git a/tox.ini b/tox.ini index ea3b272..3120bd4 100644 --- a/tox.ini +++ b/tox.ini @@ -8,12 +8,13 @@ skip_missing_interpreters=True [testenv] deps = - -r{toxinidir}/tests/requirements.txt + flake8: -r{toxinidir}/tests/requirements/requirements_base.txt + isort: -r{toxinidir}/tests/requirements/requirements_base.txt dj32: Django>=3.2,<4.0 dj42: Django>=4.2,<5.0 - - cms40: https://github.com/divio/django-cms/archive/release/4.0.x.zip + dj32: -r{toxinidir}/tests/requirements/django-3_2.txt + dj42: -r{toxinidir}/tests/requirements/django-4_2.txt basepython = py38: python3.8