From 7b4eba4a486fcbb5cb9ed1f1e29f9912548c4b51 Mon Sep 17 00:00:00 2001 From: Wes Okes Date: Wed, 10 Jul 2019 20:21:04 -0400 Subject: [PATCH 1/4] version support --- .travis.yml | 19 ++++++++----------- setup.py | 5 +++-- smart_manager/docs/release_notes.rst | 6 ++++++ smart_manager/version.py | 2 +- tox.ini | 10 ++++++---- 5 files changed, 24 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index d876e94..f3a1ac4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,31 +1,28 @@ +dist: xenial language: python - sudo: false python: - - "2.7" - - "3.4" - - "3.5" - "3.6" + - "3.7" env: matrix: - - DJANGO=1.11 - DJANGO=2.0 + - DJANGO=2.1 + - DJANGO=2.2 - DJANGO=master addons: - postgresql: '9.5' + postgresql: '9.6' matrix: + exclude: + - { python: "3.7", env: DJANGO=2.0 } + include: - { python: "3.6", env: TOXENV=flake8 } - exclude: - - { python: "2.7", env: DJANGO=master } - - { python: "2.7", env: DJANGO=2.0 } - - { python: "3.4", env: DJANGO=master } - allow_failures: - env: DJANGO=master diff --git a/setup.py b/setup.py index 8d6276c..4fbf8e7 100644 --- a/setup.py +++ b/setup.py @@ -29,15 +29,16 @@ def get_version(): packages=find_packages(), classifiers=[ 'Programming Language :: Python', - 'Programming Language :: Python :: 3.4', - 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Operating System :: OS Independent', 'Framework :: Django', 'Framework :: Django :: 1.11', 'Framework :: Django :: 2.0', + 'Framework :: Django :: 2.1', + 'Framework :: Django :: 2.2', ], license='MIT', install_requires=[ diff --git a/smart_manager/docs/release_notes.rst b/smart_manager/docs/release_notes.rst index bb5e7a5..b67be4f 100644 --- a/smart_manager/docs/release_notes.rst +++ b/smart_manager/docs/release_notes.rst @@ -1,6 +1,12 @@ Release Notes ============= +v1.2.0 +------ +* Python 3.7 +* Django 2.1 +* Django 2.2 + v1.1.0 ------ * Tox diff --git a/smart_manager/version.py b/smart_manager/version.py index 1a72d32..58d478a 100644 --- a/smart_manager/version.py +++ b/smart_manager/version.py @@ -1 +1 @@ -__version__ = '1.1.0' +__version__ = '1.2.0' diff --git a/tox.ini b/tox.ini index 2019bb5..25649cc 100644 --- a/tox.ini +++ b/tox.ini @@ -1,16 +1,18 @@ [tox] envlist = flake8 - py{27,34,35,36}-django111 - py{34,35,36}-django20 - py{35,36}-djangomaster + py{36}-django20 + py{36,37}-django21 + py{36,37}-django22 + py{36,37}-djangomaster [testenv] setenv = DB = postgres deps = - django111: Django>=1.11,<2.0 django20: Django>=2.0,<2.1 + django21: Django>=2.1,<2.2 + django22: Django>=2.2,<2.3 djangomaster: https://github.com/django/django/archive/master.tar.gz -rrequirements/requirements-testing.txt commands = From 39f2f2603273f88e999986663b04c3a35257985b Mon Sep 17 00:00:00 2001 From: Wes Okes Date: Thu, 11 Jul 2019 13:35:19 -0400 Subject: [PATCH 2/4] env --- tox.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 25649cc..3ac6ca8 100644 --- a/tox.ini +++ b/tox.ini @@ -25,6 +25,7 @@ commands = flake8 smart_manager [travis:env] DJANGO = - 1.11: django111 2.0: django20 + 2.1: django21 + 2.2: django22 master: djangomaster From 7fa6a73c6e0260e43935d73306d580944887bc35 Mon Sep 17 00:00:00 2001 From: Wes Okes Date: Thu, 11 Jul 2019 13:59:55 -0400 Subject: [PATCH 3/4] setup --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 4fbf8e7..d6473aa 100644 --- a/setup.py +++ b/setup.py @@ -22,6 +22,7 @@ def get_version(): version=get_version(), description='Make templates that manage models', long_description=open('README.md').read(), + long_description_content_type='text/markdown', url='https://github.com/ambitioninc/django-smart-manager', author='Wes Kendall', author_email='opensource@ambition.com', From 0e07c5745cc45e3a0b48735be8c470ad9e3a6b39 Mon Sep 17 00:00:00 2001 From: Wes Okes Date: Thu, 11 Jul 2019 14:29:13 -0400 Subject: [PATCH 4/4] requirements --- setup.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index d6473aa..eb6a95e 100644 --- a/setup.py +++ b/setup.py @@ -36,15 +36,14 @@ def get_version(): 'License :: OSI Approved :: MIT License', 'Operating System :: OS Independent', 'Framework :: Django', - 'Framework :: Django :: 1.11', 'Framework :: Django :: 2.0', 'Framework :: Django :: 2.1', 'Framework :: Django :: 2.2', ], license='MIT', install_requires=[ - 'Django>=1.11', - 'django-manager-utils>=1.0.0', + 'Django>=2.0', + 'django-manager-utils>=1.4.0', 'jsonfield>=0.9.20', ], tests_require=[