From b1c21274e367d78ad179af415f83b610cba7bcd6 Mon Sep 17 00:00:00 2001 From: Mark Walker Date: Mon, 11 Apr 2022 17:21:05 +0100 Subject: [PATCH] Release 2.0 (#55) * Added pypi actions and updated setup to remove EOL packages * 2.0.0 --- .github/workflows/publish-to-live-pypi.yml | 39 +++++++++++++++++++++ .github/workflows/publish-to-test-pypi.yml | 40 ++++++++++++++++++++++ CHANGELOG.txt => CHANGELOG.rst | 6 ++++ README.rst | 2 +- djangocms_column/__init__.py | 2 +- setup.py | 17 +++++---- 6 files changed, 98 insertions(+), 8 deletions(-) create mode 100644 .github/workflows/publish-to-live-pypi.yml create mode 100644 .github/workflows/publish-to-test-pypi.yml rename CHANGELOG.txt => CHANGELOG.rst (66%) diff --git a/.github/workflows/publish-to-live-pypi.yml b/.github/workflows/publish-to-live-pypi.yml new file mode 100644 index 0000000..1607f77 --- /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@v1 + 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 }} diff --git a/.github/workflows/publish-to-test-pypi.yml b/.github/workflows/publish-to-test-pypi.yml new file mode 100644 index 0000000..d590f48 --- /dev/null +++ b/.github/workflows/publish-to-test-pypi.yml @@ -0,0 +1,40 @@ +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@v1 + 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 diff --git a/CHANGELOG.txt b/CHANGELOG.rst similarity index 66% rename from CHANGELOG.txt rename to CHANGELOG.rst index 9a8de12..56dac7a 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.rst @@ -3,6 +3,12 @@ Changelog ========= +2.0.0 (2022-04-11) +================== + +* Drop support for django 3.0, 3.1 and python 3.6 +* Add support for python 3.10 and allow django-cms to dictate the upper django version. + 1.11.0 (2020-08-10) ================== diff --git a/README.rst b/README.rst index 36af128..7a24dff 100644 --- a/README.rst +++ b/README.rst @@ -7,7 +7,7 @@ A Multi Column Plugin for django CMS. Installation ------------ -This plugin requires `django CMS` 3.4.5 or higher to be properly installed. +This plugin requires `django CMS` 3.8 or higher to be properly installed. * In your projects virtualenv, run ``pip install djangocms-column``. * Add ``'djangocms_column'`` to your ``INSTALLED_APPS`` setting. diff --git a/djangocms_column/__init__.py b/djangocms_column/__init__.py index da77e85..afced14 100644 --- a/djangocms_column/__init__.py +++ b/djangocms_column/__init__.py @@ -1 +1 @@ -__version__ = '1.11.0' +__version__ = '2.0.0' diff --git a/setup.py b/setup.py index 840205a..d1a5955 100644 --- a/setup.py +++ b/setup.py @@ -1,11 +1,13 @@ #!/usr/bin/env python +from pathlib import Path + from setuptools import setup from djangocms_column import __version__ INSTALL_REQUIRES = [ - 'django-cms>=3.4.5', - 'Django>=1.11,<3.3' + 'django-cms>=3.8.0', + 'Django>=2.2' # the maximum version should be dictated by the cms ] CLASSIFIERS = [ @@ -13,23 +15,24 @@ 'Environment :: Web Environment', 'Framework :: Django', 'Framework :: Django :: 2.2', - 'Framework :: Django :: 3.0', - 'Framework :: Django :: 3.1', 'Framework :: Django :: 3.2', 'Intended Audience :: Developers', 'License :: OSI Approved :: BSD License', 'Operating System :: OS Independent', 'Programming Language :: Python', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', 'Topic :: Communications', 'Topic :: Internet :: WWW/HTTP :: Dynamic Content', 'Topic :: Internet :: WWW/HTTP :: Dynamic Content :: Message Boards', ] +this_directory = Path(__file__).parent +long_description = (this_directory / "README.rst").read_text() + setup( name='djangocms-column', version=__version__, @@ -45,7 +48,9 @@ license='LICENSE.txt', platforms=['OS Independent'], classifiers=CLASSIFIERS, - long_description=open('README.rst').read(), + long_description=long_description, + long_description_content_type='text/x-rst', include_package_data=True, + python_requires='>=3.7', zip_safe=False )