Checking support for django-bootstrap3 v8.1.0 and add isort to tox

djk2 · Feb 20, 2017 · 13208e1 · 13208e1
1 parent 63931bb
commit 13208e1
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 19 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,20 +9,29 @@ env:
     - TOXENV=py27-dj_1.9-bootstrap_7.1.0-crispy_1.6.1-tests
     - TOXENV=py27-dj_1.9-bootstrap_7.0.0-crispy_1.6.0-tests
     - TOXENV=py27-dj_1.9-bootstrap_7.0.0-crispy_1.6.1-tests
+    - TOXENV=py27-dj_1.9-bootstrap_8.1.0-crispy_1.6.0-tests
+    - TOXENV=py27-dj_1.9-bootstrap_8.1.0-crispy_1.6.1-tests
     - TOXENV=py34-dj_1.9-bootstrap_7.1.0-crispy_1.6.0-tests
     - TOXENV=py34-dj_1.9-bootstrap_7.1.0-crispy_1.6.1-tests
     - TOXENV=py34-dj_1.9-bootstrap_7.0.0-crispy_1.6.0-tests
     - TOXENV=py34-dj_1.9-bootstrap_7.0.0-crispy_1.6.1-tests
+    - TOXENV=py34-dj_1.9-bootstrap_8.1.0-crispy_1.6.0-tests
+    - TOXENV=py34-dj_1.9-bootstrap_8.1.0-crispy_1.6.1-tests
     - TOXENV=py27-dj_1.10-bootstrap_7.1.0-crispy_1.6.1-tests
     - TOXENV=py27-dj_1.10-bootstrap_7.1.0-crispy_1.6.1-tests
     - TOXENV=py27-dj_1.10-bootstrap_7.0.0-crispy_1.6.1-tests
     - TOXENV=py27-dj_1.10-bootstrap_7.0.0-crispy_1.6.1-tests
+    - TOXENV=py27-dj_1.10-bootstrap_8.1.0-crispy_1.6.1-tests
+    - TOXENV=py27-dj_1.10-bootstrap_8.1.0-crispy_1.6.1-tests
     - TOXENV=py34-dj_1.10-bootstrap_7.1.0-crispy_1.6.1-tests
     - TOXENV=py34-dj_1.10-bootstrap_7.1.0-crispy_1.6.1-tests
     - TOXENV=py34-dj_1.10-bootstrap_7.0.0-crispy_1.6.1-tests
     - TOXENV=py34-dj_1.10-bootstrap_7.0.0-crispy_1.6.1-tests
+    - TOXENV=py34-dj_1.10-bootstrap_8.1.0-crispy_1.6.1-tests
+    - TOXENV=py34-dj_1.10-bootstrap_8.1.0-crispy_1.6.1-tests
     - TOXENV=py27-flake
     - TOXENV=py34-flake
+    - TOXENV=py34-isort
 
 install:
     - pip install tox>=2.5.0

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # CHANGELOG for django-popup-view-field
 
+## 0.2.0 (2017-02-20)
+
+    * Remove PopupViewField from django_popup_view_field.__init__,
+      now you must import PopupViewField from django_popup_view_field.fields
+
+    * Sorting imports using isort
+
+    * Checking the order of imports in the tox
+
+    * Checking support for django-bootstrap3 v8.1.0
+
+    * Added django-bootstrap3 v8.1.0 to tox
+
+    * Adding version in django_popup_view_field.__init__
+
 ## 0.1 (2016-12-27)
 
     * Initial version + tests + Travis CI
diff --git a/README.rst b/README.rst
@@ -267,7 +267,7 @@ Create Form with PopupViewField
 *forms.py* ::
 
     from django import forms
-    from django_popup_view_field import PopupViewField
+    from django_popup_view_field.fields import PopupViewField
     from myapp.popups import ColorsPopupView
 
     class ColorForm(forms.Form):
@@ -398,7 +398,7 @@ Form with PopupViewField
 *forms.py* ::
 
     from django import forms
-    from django_popup_view_field import PopupViewField
+    from django_popup_view_field.fields import PopupViewField
     from myapp.popups import AlphabetPopupView
 
     class AlphabetForm(forms.Form):

diff --git a/demo/demo/forms.py b/demo/demo/forms.py
@@ -1,7 +1,7 @@
 from crispy_forms.helper import FormHelper
 from django import forms
 
-from django_popup_view_field import PopupViewField
+from django_popup_view_field.fields import PopupViewField
 
 from .popups import ColorPopupView, CountryPopupView, SexPopupView
 

diff --git a/django_popup_view_field/__init__.py b/django_popup_view_field/__init__.py
@@ -1,7 +1,2 @@
-# encoding: utf-8
-from .fields import PopupViewField
-
-
-__version__ = "0.1"
-
-VERSION = __version__
+VERSION = (0, 2, 0)
+__version__ = ".".join(str(i) for i in VERSION)
diff --git a/django_popup_view_field/urls.py b/django_popup_view_field/urls.py
@@ -17,19 +17,19 @@
 app_name = 'django_popup_view_field'
 
 
-urlpatterns = [
-    url(r'^(?P<view_class_name>\w+)/$', GetPopupView.as_view(), name="get_popup_view"),
-]
-
 if VERSION < (1, 10):
-    urlpatterns += [
+    urlpatterns = [
         url(r'^jsi18n/$', javascript_catalog, name='javascript-catalog'),
     ]
 else:
-    urlpatterns += [
+    urlpatterns = [
         url(
             r'^jsi18n/$',
             JavaScriptCatalog.as_view(),
             name='javascript-catalog'
         )
     ]
+
+urlpatterns += [
+    url(r'^(?P<view_class_name>\w+)/$', GetPopupView.as_view(), name="get_popup_view"),
+]
diff --git a/setup.py b/setup.py
@@ -1,5 +1,6 @@
 # encoding:utf-8
 from setuptools import setup, find_packages
+from django_popup_view_field import __version__ as version
 
 
 def readme():
@@ -9,7 +10,7 @@ def readme():
 
 setup(
     name='django-popup-view-field',
-    version='0.1',
+    version=version,
     description='Field and widget can render bootstrap dialog window with content from django view',
     url='https://github.com/djk2/django-popup-view-field',
     author='Grzegorz Tężycki',

diff --git a/tox.ini b/tox.ini
@@ -2,8 +2,8 @@
 minversion = 1.8
 envlist=
     {py27,py34}-dj_1.8-bootstrap_7.0.0-crispy_{1.5.0,1.5.1}-tests,
-    {py27,py34}-dj_1.9-bootstrap_{7.1.0,7.0.0}-crispy_{1.6.0,1.6.1}-tests,
-    {py27,py34}-dj_1.10-bootstrap_{7.1.0,7.0.0}-crispy_{1.6.1,1.6.1}-tests,
+    {py27,py34}-dj_1.9-bootstrap_{7.1.0,7.0.0,8.1.0}-crispy_{1.6.0,1.6.1}-tests,
+    {py27,py34}-dj_1.10-bootstrap_{7.1.0,7.0.0,8.1.0}-crispy_{1.6.1,1.6.1}-tests,
     {py27,py34}-flake,
     py34-isort
 
@@ -16,6 +16,7 @@ pip_pre = true
 
 deps =
     flake8
+    isort
     dj_1.8: Django>=1.8,<1.9
     dj_1.9: Django>=1.9,<1.10
     dj_1.10: Django>=1.9,<1.11
@@ -25,6 +26,7 @@ deps =
     crispy_1.6.1: django-crispy-forms==1.6.1
     bootstrap_7.0.0: django-bootstrap3==7.0.0
     bootstrap_7.1.0: django-bootstrap3==7.1.0
+    bootstrap_8.1.0: django-bootstrap3==8.1.0
 
 commands =
     tests: ./run_test.py