diff --git a/HISTORY.rst b/HISTORY.rst index d7b0a3f..d91c9ef 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -6,6 +6,16 @@ History .. towncrier release notes start +2.2.0 (2020-04-23) +================== + +Features +-------- + +- Add Django 3.0 / django CMS 3.7.2 support (#142) +- Replace makefile with invoke (#143) + + 2.1.1 (2020-02-04) ================== diff --git a/app_helper/__init__.py b/app_helper/__init__.py index ec79396..d757b5a 100644 --- a/app_helper/__init__.py +++ b/app_helper/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import absolute_import, print_function, unicode_literals -__version__ = "2.2.0.dev1" +__version__ = "2.2.0" __author__ = "Iacopo Spalletti " __all__ = ["runner"] diff --git a/changes/142.feature b/changes/142.feature deleted file mode 100644 index 1cd3bad..0000000 --- a/changes/142.feature +++ /dev/null @@ -1 +0,0 @@ -Add Django 3.0 / django CMS 3.7.2 support diff --git a/changes/143.feature b/changes/143.feature deleted file mode 100644 index e79b196..0000000 --- a/changes/143.feature +++ /dev/null @@ -1 +0,0 @@ -Replace makefile with invoke diff --git a/setup.cfg b/setup.cfg index ce4c240..6b4c094 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,7 +1,7 @@ [bumpversion] -current_version = 2.2.0.dev1 +current_version = 2.2.0 parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\.?)(?P[a-z]*)(?P\d*) -serialize = +serialize = {major}.{minor}.{patch}.{release}{relver} {major}.{minor}.{patch} commit = True @@ -12,7 +12,7 @@ message = Release {new_version} [bumpversion:part:release] optional_value = gamma -values = +values = dev a b @@ -25,7 +25,7 @@ values = name = django-app-helper version = attr: app_helper.__version__ url = https://github.com/nephila/django-app-helper -project_urls = +project_urls = Documentation = https://django-app-helper.readthedocs.io/ author = Iacopo Spalletti author_email = i.spalletti@nephila.it @@ -34,7 +34,7 @@ long_description = file: README.rst, HISTORY.rst long_description_content_type = text/x-rst license = GPLv2+ license_file = LICENSE -classifiers = +classifiers = License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+) Development Status :: 5 - Production/Stable Framework :: Django @@ -52,12 +52,12 @@ classifiers = [options] include_package_data = True -install_requires = +install_requires = dj-database-url docopt - mock;python_version<"3.3" + mock;python_version<"3.3" six -setup_requires = +setup_requires = setuptools packages = find: python_requires = >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.* @@ -69,8 +69,8 @@ zip_safe = False app_helper = *.html *.png *.gif *js *jpg *jpeg *svg *py *mo *po [options.entry_points] -console_scripts = - django-app-helper = app_helper.main:main +console_scripts = + django-app-helper = app_helper.main:main [options.extras_require] pyflakes = pyflakes<2.1;django-cms>=3.4,<3.8 @@ -84,4 +84,3 @@ formats = zip [bdist_wheel] universal = 1 -