diff --git a/.github/workflows/publish-to-live-pypi.yml b/.github/workflows/publish-to-live-pypi.yml index bbc343c..4d29d7a 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/django-classy-tags + permissions: + id-token: write steps: - uses: actions/checkout@v3 - - name: Set up Python 3.9 + - name: Set up Python 3.10 uses: actions/setup-python@v4 with: - python-version: 3.9 + python-version: '3.10' - 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 diff --git a/.github/workflows/publish-to-test-pypi.yml b/.github/workflows/publish-to-test-pypi.yml index b053594..21ea519 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: test + url: https://test.pypi.org/p/django-classy-tags + permissions: + id-token: write steps: - uses: actions/checkout@v3 - - name: Set up Python 3.9 + - name: Set up Python 3.10 uses: actions/setup-python@v4 with: - python-version: 3.9 + python-version: '3.10' - 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/ - skip_existing: true + repository-url: https://test.pypi.org/legacy/ + skip-existing: true diff --git a/CHANGELOG.rst b/CHANGELOG.rst index a8a8395..2cac7bf 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,9 +5,11 @@ Changelog unreleased ========== -4.0.0 2022-12-01 +4.1.0 2023-07-29 ================ +* Django 4.2 support + 4.0.0 2022-12-01 ================ diff --git a/classytags/__init__.py b/classytags/__init__.py index d6497a8..fa721b4 100644 --- a/classytags/__init__.py +++ b/classytags/__init__.py @@ -1 +1 @@ -__version__ = '4.0.0' +__version__ = '4.1.0' diff --git a/docs/conf.py b/docs/conf.py index 7173dbb..f8f38af 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -50,9 +50,9 @@ # built documents. # # The short X.Y version. -version = '4.0.0' +version = '4.1.0' # The full version, including alpha/beta/rc tags. -release = '4.0.0' +release = '4.1.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.cfg b/setup.cfg index 12a18dd..ae47eeb 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 4.0.0 +current_version = 4.1.0 commit = True tag = False diff --git a/setup.py b/setup.py index a1ba1b8..ac020a2 100644 --- a/setup.py +++ b/setup.py @@ -16,14 +16,15 @@ 'License :: OSI Approved :: BSD License', 'Operating System :: OS Independent', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', 'Framework :: Django', 'Framework :: Django :: 3.2', 'Framework :: Django :: 4.0', 'Framework :: Django :: 4.1', + 'Framework :: Django :: 4.2', 'Topic :: Internet :: WWW/HTTP', 'Topic :: Internet :: WWW/HTTP :: Dynamic Content', 'Topic :: Software Development', @@ -35,7 +36,7 @@ setup( name='django-classy-tags', - version='4.0.0', + version='4.1.0', author='Jonas Obrist', author_email='ojiidotch@gmail.com', maintainer='Django CMS Association and contributors', @@ -46,7 +47,7 @@ long_description=long_description, long_description_content_type='text/x-rst', packages=find_packages(exclude=['tests']), - python_requires='>=3.7', + python_requires='>=3.8', include_package_data=True, zip_safe=False, install_requires=REQUIREMENTS,