From 1e2c12e10fca316c5d181005dad2616113997c68 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Wed, 6 Dec 2023 14:27:24 +0100 Subject: [PATCH 01/12] Update CHANGELOG.rst --- CHANGELOG.rst | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 5e0aae6..eee9e2f 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,11 +2,24 @@ Changelog ========= -Unreleased +3.1.0 (2023-12-06) ================== -* Removed (pinned) django-treebeard dependency - +## What's Changed +* Add GitHub Actions by @crydotsnake in https://github.com/django-cms/djangocms-style/pull/56 +* FEATURE: adjust setup metadata by @crydotsnake in https://github.com/django-cms/djangocms-style/pull/58 +* FEATURE: add github pr template by @crydotsnake in https://github.com/django-cms/djangocms-style/pull/57 +* Removed pinned django-treebeard by @tidenhub in https://github.com/django-cms/djangocms-style/pull/59 +* Feat: Django 4.2 support by @mogoh in https://github.com/django-cms/djangocms-style/pull/61 +* chore: Improve ruff config by @marksweb in https://github.com/django-cms/djangocms-style/pull/64 + +## New Contributors +* @crydotsnake made their first contribution in https://github.com/django-cms/djangocms-style/pull/56 +* @tidenhub made their first contribution in https://github.com/django-cms/djangocms-style/pull/59 +* @mogoh made their first contribution in https://github.com/django-cms/djangocms-style/pull/61 +* @marksweb made their first contribution in https://github.com/django-cms/djangocms-style/pull/64 + +**Full Changelog**: https://github.com/django-cms/djangocms-style/compare/3.0.0...3.1.0 3.0.0 (2020-09-02) ================== From b5f04ad636c43159c42a03e45f2db9a2118da061 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Wed, 6 Dec 2023 14:27:48 +0100 Subject: [PATCH 02/12] Update __init__.py --- djangocms_style/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/djangocms_style/__init__.py b/djangocms_style/__init__.py index 528787c..f5f41e5 100644 --- a/djangocms_style/__init__.py +++ b/djangocms_style/__init__.py @@ -1 +1 @@ -__version__ = "3.0.0" +__version__ = "3.1.0" From 628320fd6f477f1f943796b3786895aac2ac2e1e Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Wed, 6 Dec 2023 15:02:54 +0100 Subject: [PATCH 03/12] Create publish-to-test-pypi.yml --- .github/workflows/publish-to-test-pypi.yml | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 .github/workflows/publish-to-test-pypi.yml diff --git a/.github/workflows/publish-to-test-pypi.yml b/.github/workflows/publish-to-test-pypi.yml new file mode 100644 index 0000000..29b089a --- /dev/null +++ b/.github/workflows/publish-to-test-pypi.yml @@ -0,0 +1,41 @@ +name: Publish Python 🐍 distributions 📦 to TestPyPI + +on: + push: + branches: + - master + +jobs: + build-n-publish: + name: Build and publish Python 🐍 distributions 📦 to TestPyPI + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + - name: Set up Python 3.9 + uses: actions/setup-python@v4 + with: + python-version: 3.9 + + - name: Install pypa/build + run: >- + python -m + pip install + build + --user + - name: Build a binary wheel and a source tarball + run: >- + python -m + build + --sdist + --wheel + --outdir dist/ + . + + - name: Publish distribution 📦 to Test PyPI + uses: pypa/gh-action-pypi-publish@master + with: + user: __token__ + password: ${{ secrets.TEST_PYPI_API_TOKEN }} + repository_url: https://test.pypi.org/legacy/ + skip_existing: true + From 6e7d99e3b23f296bf42247065b2527f8966905fc Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Wed, 6 Dec 2023 15:03:26 +0100 Subject: [PATCH 04/12] Create publish-to-live-pypi.yml --- .github/workflows/publish-to-live-pypi.yml | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .github/workflows/publish-to-live-pypi.yml diff --git a/.github/workflows/publish-to-live-pypi.yml b/.github/workflows/publish-to-live-pypi.yml new file mode 100644 index 0000000..7134b5e --- /dev/null +++ b/.github/workflows/publish-to-live-pypi.yml @@ -0,0 +1,39 @@ +name: Publish Python 🐍 distributions 📦 to pypi + +on: + release: + types: + - published + +jobs: + build-n-publish: + name: Build and publish Python 🐍 distributions 📦 to pypi + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + - name: Set up Python 3.9 + uses: actions/setup-python@v4 + with: + python-version: 3.9 + + - name: Install pypa/build + run: >- + python -m + pip install + build + --user + - name: Build a binary wheel and a source tarball + run: >- + python -m + build + --sdist + --wheel + --outdir dist/ + . + + - name: Publish distribution 📦 to PyPI + if: startsWith(github.ref, 'refs/tags') + uses: pypa/gh-action-pypi-publish@master + with: + user: __token__ + password: ${{ secrets.PYPI_API_TOKEN }} From 993f41c4f85996c02e5061ed354b2e1cf461ed76 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Wed, 6 Dec 2023 15:04:35 +0100 Subject: [PATCH 05/12] Update publish-to-live-pypi.yml to use py3.11 --- .github/workflows/publish-to-live-pypi.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-to-live-pypi.yml b/.github/workflows/publish-to-live-pypi.yml index 7134b5e..22ff285 100644 --- a/.github/workflows/publish-to-live-pypi.yml +++ b/.github/workflows/publish-to-live-pypi.yml @@ -11,10 +11,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@master - - name: Set up Python 3.9 + - name: Set up Python 3.11 uses: actions/setup-python@v4 with: - python-version: 3.9 + python-version: 3.11 - name: Install pypa/build run: >- From d85f32c400602ac06918f06d57f917234b26d158 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Wed, 6 Dec 2023 15:04:54 +0100 Subject: [PATCH 06/12] Update publish-to-test-pypi.yml to use py3.11 --- .github/workflows/publish-to-test-pypi.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-to-test-pypi.yml b/.github/workflows/publish-to-test-pypi.yml index 29b089a..feb916c 100644 --- a/.github/workflows/publish-to-test-pypi.yml +++ b/.github/workflows/publish-to-test-pypi.yml @@ -11,10 +11,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@master - - name: Set up Python 3.9 + - name: Set up Python 3.11 uses: actions/setup-python@v4 with: - python-version: 3.9 + python-version: 3.11 - name: Install pypa/build run: >- From 9f422d04df5c43791406d67daf9bbca29b4d513e Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Wed, 6 Dec 2023 15:14:31 +0100 Subject: [PATCH 07/12] Update publish-to-test-pypi.yml --- .github/workflows/publish-to-test-pypi.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/publish-to-test-pypi.yml b/.github/workflows/publish-to-test-pypi.yml index feb916c..b8c5cee 100644 --- a/.github/workflows/publish-to-test-pypi.yml +++ b/.github/workflows/publish-to-test-pypi.yml @@ -38,4 +38,3 @@ jobs: password: ${{ secrets.TEST_PYPI_API_TOKEN }} repository_url: https://test.pypi.org/legacy/ skip_existing: true - From c63197764e700efddacb60acf153239b22015cc5 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Wed, 6 Dec 2023 15:39:19 +0100 Subject: [PATCH 08/12] Update publish-to-live-pypi.yml --- .github/workflows/publish-to-live-pypi.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/publish-to-live-pypi.yml b/.github/workflows/publish-to-live-pypi.yml index 22ff285..84db02b 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 Python 🐍 distributions 📦 to pypi runs-on: ubuntu-latest + environment: + name: pypi + url: https://pypi.org/p/djangocms-snippet + permissions: + id-token: write steps: - - uses: actions/checkout@master - - name: Set up Python 3.11 + - uses: actions/checkout@v4 + - name: Set up Python 3.10 uses: actions/setup-python@v4 with: - python-version: 3.11 + python-version: '3.11' - name: Install pypa/build run: >- @@ -33,7 +38,4 @@ jobs: - name: Publish distribution 📦 to PyPI if: startsWith(github.ref, 'refs/tags') - uses: pypa/gh-action-pypi-publish@master - with: - user: __token__ - password: ${{ secrets.PYPI_API_TOKEN }} + uses: pypa/gh-action-pypi-publish@release/v1 From a03427f64f6cd50f3191837a875b50dedb2cf53d Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Wed, 6 Dec 2023 15:40:13 +0100 Subject: [PATCH 09/12] Update publish-to-test-pypi.yml --- .github/workflows/publish-to-test-pypi.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/publish-to-test-pypi.yml b/.github/workflows/publish-to-test-pypi.yml index b8c5cee..0cedd53 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 Python 🐍 distributions 📦 to TestPyPI runs-on: ubuntu-latest + environment: + name: pypi + url: https://test.pypi.org/p/djangocms-snippet + permissions: + id-token: write steps: - - uses: actions/checkout@master - - name: Set up Python 3.11 + - uses: actions/checkout@v4 + - name: Set up Python 3.10 uses: actions/setup-python@v4 with: - python-version: 3.11 + python-version: '3.11' - name: Install pypa/build run: >- @@ -32,9 +37,7 @@ jobs: . - name: Publish distribution 📦 to Test PyPI - uses: pypa/gh-action-pypi-publish@master + uses: pypa/gh-action-pypi-publish@release/v1 with: - user: __token__ - password: ${{ secrets.TEST_PYPI_API_TOKEN }} - repository_url: https://test.pypi.org/legacy/ + repository-url: https://test.pypi.org/legacy/ skip_existing: true From 49205d498c99731cf33e00e97ce18c69e9840152 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Wed, 6 Dec 2023 16:38:49 +0100 Subject: [PATCH 10/12] Update publish-to-test-pypi.yml --- .github/workflows/publish-to-test-pypi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-to-test-pypi.yml b/.github/workflows/publish-to-test-pypi.yml index 0cedd53..6a82e7c 100644 --- a/.github/workflows/publish-to-test-pypi.yml +++ b/.github/workflows/publish-to-test-pypi.yml @@ -40,4 +40,4 @@ jobs: uses: pypa/gh-action-pypi-publish@release/v1 with: repository-url: https://test.pypi.org/legacy/ - skip_existing: true + skip-existing: true From 09c72c50a30b1adeed7ddcd3fd205ead0748e434 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Wed, 6 Dec 2023 17:51:57 +0100 Subject: [PATCH 11/12] Update publish-to-live-pypi.yml --- .github/workflows/publish-to-live-pypi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-to-live-pypi.yml b/.github/workflows/publish-to-live-pypi.yml index 84db02b..9152ae3 100644 --- a/.github/workflows/publish-to-live-pypi.yml +++ b/.github/workflows/publish-to-live-pypi.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest environment: name: pypi - url: https://pypi.org/p/djangocms-snippet + url: https://pypi.org/p/djangocms-style permissions: id-token: write steps: From 959e7fd85821b7739a189c3100c7e72d190a55f0 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Wed, 6 Dec 2023 17:52:14 +0100 Subject: [PATCH 12/12] Update publish-to-test-pypi.yml --- .github/workflows/publish-to-test-pypi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-to-test-pypi.yml b/.github/workflows/publish-to-test-pypi.yml index 6a82e7c..d86704e 100644 --- a/.github/workflows/publish-to-test-pypi.yml +++ b/.github/workflows/publish-to-test-pypi.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest environment: name: pypi - url: https://test.pypi.org/p/djangocms-snippet + url: https://test.pypi.org/p/djangocms-style permissions: id-token: write steps: