Release 2.0 (#55)

* Added pypi actions and updated setup to remove EOL packages

* 2.0.0

Author: marksweb

.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 }}

.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

CHANGELOG.txt renamed to 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)
 ==================
 

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.

djangocms_column/__init__.py

@@ -1 +1 @@
-__version__ = '1.11.0'
+__version__ = '2.0.0'

setup.py

@@ -1,35 +1,38 @@
 #!/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 = [
     'Development Status :: 5 - Production/Stable',
     '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
 )