Dropped support django <2.0, prepare for release

Author: boxed

HISTORY.rst

@@ -1,6 +1,16 @@
 Changelog
 ---------
 
+7.0.0 (2019-06-10)
+~~~~~~~~~~~~~~~~~~
+
+* Renamed package from `tri.form` to `tri_form`. This is a breaking change
+
+* Dropped python2 support
+
+* Dropped Django < 2.0 support
+
+
 6.0.2 (2019-06-03)
 ~~~~~~~~~~~~~~~~~~
 

docs/conf.py

@@ -32,7 +32,7 @@
 
 from tri_declarative import generate_rst_docs
 
-generate_rst_docs('.', [tri.form.Form, tri.form.Field], (tri.form.MISSING,))
+generate_rst_docs('.', [tri_form.Form, tri_form.Field], (tri_form.MISSING,))
 
 
 # -- General configuration -----------------------------------------------------
@@ -69,9 +69,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = tri.form.__version__
+version = tri_form.__version__
 # The full version, including alpha/beta/rc tags.
-release = tri.form.__version__
+release = tri_form.__version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

examples/examples/settings.py

@@ -35,7 +35,7 @@
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'tri.form',
+    'tri_form',
     'examples',
 )
 

lib/tri_form/__init__.py

@@ -60,7 +60,7 @@
 # Prevent django templates from calling That Which Must Not Be Called
 Namespace.do_not_call_in_templates = True
 
-__version__ = '6.0.2'  # pragma: no mutate
+__version__ = '7.0.0'  # pragma: no mutate
 
 
 def capitalize(s):

requirements.txt

@@ -1,3 +1,3 @@
-tri.declarative >=2.0.0,<3.0.0
-tri.struct >= 2.5.3
+tri.declarative>=3.0.0,<4.0.0
+tri.struct>=3.0.0,<4.0.0
 six

setup.py

@@ -89,8 +89,6 @@ def run(self):
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Natural Language :: English',
-        "Programming Language :: Python :: 2",
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.6',
     ],

test_requirements.txt

@@ -1,3 +1,3 @@
 beautifulsoup4==4.7.1
-pytest==4.3.1
+pytest==4.6.2
 -rrequirements.txt

tests/settings.py

@@ -24,7 +24,7 @@
 INSTALLED_APPS = [
     'django.contrib.auth',
     'django.contrib.contenttypes',
-    'tri.form',
+    'tri_form',
     'tests'
 ]
 

tests/test_forms.py

@@ -81,8 +81,8 @@ class MyTestForm(Form):
 
 
 def test_repr():
-    assert '<tri.form.Field foo>' == repr(Field(name='foo'))
-    assert '<tri.form.Field foo>' == str(Field(name='foo'))
+    assert '<tri_form.Field foo>' == repr(Field(name='foo'))
+    assert '<tri_form.Field foo>' == str(Field(name='foo'))
 
 
 def test_required_choice():

tox.ini

@@ -1,15 +1,13 @@
 [tox]
-envlist = py27-django{19,110,111},py36-django{110,111,20,21},py37-django{20,21},py36-flask
+envlist = py36-django{20,21,22},py36-flask
 
 [testenv]
 commands = {envpython} -m pytest {posargs}
 deps =
-    django19: Django >= 1.9, <1.10
-    django110: Django >= 1.10, <1.11
-    django111: Django >= 1.11, <1.12
     django20: Django >= 2.0, <2.1
     django21: Django >= 2.1, <2.2
-    django{19,110,111,20,21}: pytest-django
+    django22: Django >= 2.2, <2.3
+    django{20,21,22}: pytest-django
     flask: flask
     -rtest_requirements.txt
 usedevelop = True
@@ -34,11 +32,11 @@ deps =
 basepython = python3.6
 usedevelop = True
 commands =
-    {envpython} -m pytest --cov tri.form --cov-config .coveragerc {posargs}
+    {envpython} -m pytest --cov tri_form --cov-config .coveragerc {posargs}
     coverage report -m
     coverage html
 deps =
-    Django >= 2.1, <2.2
+    Django >= 2.2, <2.3
     coverage
     pytest-cov
     pytest-django
@@ -50,7 +48,7 @@ usedevelop = True
 commands =
     {envpython} -m flake8 lib/tri tests setup.py {posargs}
 deps =
-    Django >= 2.1, <2.2
+    Django >= 2.2, <2.3
     flake8
 
 [testenv:venv]
@@ -59,7 +57,7 @@ usedevelop = True
 basepython = python3.6
 commands = {posargs:python --version}
 deps =
-    Django >= 2.1, <2.2
+    Django >= 2.2, <2.3
     -rvenv_requirements.txt
 whitelist_externals =
     make
@@ -75,12 +73,3 @@ deps =
     -rvenv_requirements.txt
 whitelist_externals =
     make
-
-[testenv:ipython]
-basepython = python3.6
-usedevelop = True
-commands = ipython {posargs}
-deps =
-    ipython
-    Django >= 2.1, <2.2
-    -rtest_requirements.txt