Skip to content

Commit

Permalink
chore: Prepare release 4.0 (#227)
Browse files Browse the repository at this point in the history
* Prepare release 4.0

* Correct python versions

* Update pypi actions

* Skip existing for test.pypi.org
  • Loading branch information
fsbraun authored Jul 23, 2024
1 parent 41025b4 commit 1d33608
Show file tree
Hide file tree
Showing 10 changed files with 40 additions and 30 deletions.
16 changes: 9 additions & 7 deletions .github/workflows/publish-to-live-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: >-
Expand All @@ -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 }}
16 changes: 9 additions & 7 deletions .github/workflows/publish-to-test-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: >-
Expand All @@ -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
9 changes: 5 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
11 changes: 6 additions & 5 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion djangocms_link/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '3.1.1'
__version__ = '4.0.0'
4 changes: 0 additions & 4 deletions tests/requirements/dj32_cms310.txt

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-r base.txt

Django>=3.2,<4.0
Django>=4.2,<5.0
django-cms>=3.11,<4.0
4 changes: 4 additions & 0 deletions tests/requirements/dj42_cms41.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-r base.txt

Django>=4.2,<5.0
django-cms>=4.1,<4.2
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-r base.txt

Django>=4.0,<4.1
Django>=5.0,<5.1
django-cms>=3.11,<4.0
4 changes: 4 additions & 0 deletions tests/requirements/dj50_cms41.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-r base.txt

Django>=5.0,<5.1
django-cms>=4.1,<4.2

0 comments on commit 1d33608

Please sign in to comment.