From 1d336085e646680336d99114c19a8324329bd383 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Tue, 23 Jul 2024 09:53:08 +0200 Subject: [PATCH] chore: Prepare release 4.0 (#227) * Prepare release 4.0 * Correct python versions * Update pypi actions * Skip existing for test.pypi.org --- .github/workflows/publish-to-live-pypi.yml | 16 +++++++++------- .github/workflows/publish-to-test-pypi.yml | 16 +++++++++------- .github/workflows/test.yml | 9 +++++---- CHANGELOG.rst | 11 ++++++----- djangocms_link/__init__.py | 2 +- tests/requirements/dj32_cms310.txt | 4 ---- .../{dj32_cms311.txt => dj42_cms311.txt} | 2 +- tests/requirements/dj42_cms41.txt | 4 ++++ .../{dj40_cms311.txt => dj50_cms311.txt} | 2 +- tests/requirements/dj50_cms41.txt | 4 ++++ 10 files changed, 40 insertions(+), 30 deletions(-) delete mode 100644 tests/requirements/dj32_cms310.txt rename tests/requirements/{dj32_cms311.txt => dj42_cms311.txt} (67%) create mode 100644 tests/requirements/dj42_cms41.txt rename tests/requirements/{dj40_cms311.txt => dj50_cms311.txt} (67%) create mode 100644 tests/requirements/dj50_cms41.txt diff --git a/.github/workflows/publish-to-live-pypi.yml b/.github/workflows/publish-to-live-pypi.yml index 8f95f0f5..8e0f9bf0 100644 --- a/.github/workflows/publish-to-live-pypi.yml +++ b/.github/workflows/publish-to-live-pypi.yml @@ -9,12 +9,17 @@ jobs: build-n-publish: name: Build and publish 📦 to pypi runs-on: ubuntu-latest + environment: + name: pypi + url: https://pypi.org/p/djangocms-link + permissions: + id-token: write steps: - - uses: actions/checkout@master - - name: Set up Python 3.10 - uses: actions/setup-python@v1 + - uses: actions/checkout@v4 + - name: Set up Python 3.12 + uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: '3.12' - name: Install pypa/build run: >- @@ -34,6 +39,3 @@ jobs: - name: Publish 📦 to PyPI if: startsWith(github.ref, 'refs/tags') uses: pypa/gh-action-pypi-publish@release/v1 - with: - user: __token__ - password: ${{ secrets.PYPI_API_TOKEN }} diff --git a/.github/workflows/publish-to-test-pypi.yml b/.github/workflows/publish-to-test-pypi.yml index d48d245a..b88f0215 100644 --- a/.github/workflows/publish-to-test-pypi.yml +++ b/.github/workflows/publish-to-test-pypi.yml @@ -9,12 +9,17 @@ jobs: build-n-publish: name: Build and publish 📦 to TestPyPI runs-on: ubuntu-latest + environment: + name: pypi + url: https://test.pypi.org/p/djangocms-link + permissions: + id-token: write steps: - - uses: actions/checkout@master - - name: Set up Python 3.10 - uses: actions/setup-python@v1 + - uses: actions/checkout@v4 + - name: Set up Python 3.12 + uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: '3.12' - name: Install pypa/build run: >- @@ -34,7 +39,4 @@ jobs: - name: Publish 📦 to Test PyPI uses: pypa/gh-action-pypi-publish@release/v1 with: - user: __token__ - password: ${{ secrets.TEST_PYPI_API_TOKEN }} - repository_url: https://test.pypi.org/legacy/ skip_existing: true diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2ca90cc9..96f8208d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,11 +8,12 @@ jobs: strategy: fail-fast: false matrix: - python-version: [ 3.8, 3.9, "3.10"] # latest release minus two + python-version: [ "3.10", "3.11", "3.12"] # latest release minus two requirements-file: [ - dj32_cms310.txt, - dj32_cms311.txt, - dj40_cms311.txt, + dj42_cms311.txt, + dj42_cms41.txt, + dj50_cms311.txt, + dj50_cms41.txt, ] os: [ ubuntu-20.04, diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 1d365c79..5c709c32 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,12 +2,13 @@ Changelog ========= -Unreleased -========== +4.0.0 (2024-07-22) +================ -* Added support for python 3.9 and 3.10 -* Dropped support for django < 3.2 -* Dropped support for python < 3.8 +* Added support for django CMS 4.1 +* Added support for python 3.10 to 3.12 +* Dropped support for django < 4.2 +* Dropped support for python < 3.10 * fix: Remove deprecated test suite assertEquals * fix: Remove outdated treebeard dependency diff --git a/djangocms_link/__init__.py b/djangocms_link/__init__.py index 726691bc..d6497a81 100644 --- a/djangocms_link/__init__.py +++ b/djangocms_link/__init__.py @@ -1 +1 @@ -__version__ = '3.1.1' +__version__ = '4.0.0' diff --git a/tests/requirements/dj32_cms310.txt b/tests/requirements/dj32_cms310.txt deleted file mode 100644 index 76b64d76..00000000 --- a/tests/requirements/dj32_cms310.txt +++ /dev/null @@ -1,4 +0,0 @@ --r base.txt - -Django>=3.2,<4.0 -django-cms>=3.10,<3.11 diff --git a/tests/requirements/dj32_cms311.txt b/tests/requirements/dj42_cms311.txt similarity index 67% rename from tests/requirements/dj32_cms311.txt rename to tests/requirements/dj42_cms311.txt index cdbd1e62..23f2164f 100644 --- a/tests/requirements/dj32_cms311.txt +++ b/tests/requirements/dj42_cms311.txt @@ -1,4 +1,4 @@ -r base.txt -Django>=3.2,<4.0 +Django>=4.2,<5.0 django-cms>=3.11,<4.0 diff --git a/tests/requirements/dj42_cms41.txt b/tests/requirements/dj42_cms41.txt new file mode 100644 index 00000000..4f0b9d93 --- /dev/null +++ b/tests/requirements/dj42_cms41.txt @@ -0,0 +1,4 @@ +-r base.txt + +Django>=4.2,<5.0 +django-cms>=4.1,<4.2 diff --git a/tests/requirements/dj40_cms311.txt b/tests/requirements/dj50_cms311.txt similarity index 67% rename from tests/requirements/dj40_cms311.txt rename to tests/requirements/dj50_cms311.txt index cbd14b73..1db4b67f 100644 --- a/tests/requirements/dj40_cms311.txt +++ b/tests/requirements/dj50_cms311.txt @@ -1,4 +1,4 @@ -r base.txt -Django>=4.0,<4.1 +Django>=5.0,<5.1 django-cms>=3.11,<4.0 diff --git a/tests/requirements/dj50_cms41.txt b/tests/requirements/dj50_cms41.txt new file mode 100644 index 00000000..1c578f2c --- /dev/null +++ b/tests/requirements/dj50_cms41.txt @@ -0,0 +1,4 @@ +-r base.txt + +Django>=5.0,<5.1 +django-cms>=4.1,<4.2