From 13208e13ceb83ae112923b659e7ebc2e675e543d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Grzegorz=20T=C4=99=C5=BCycki?= Date: Mon, 20 Feb 2017 21:49:51 +0100 Subject: [PATCH] Checking support for django-bootstrap3 v8.1.0 and add isort to tox --- .travis.yml | 9 +++++++++ CHANGELOG.md | 15 +++++++++++++++ README.rst | 4 ++-- demo/demo/forms.py | 2 +- django_popup_view_field/__init__.py | 9 ++------- django_popup_view_field/urls.py | 12 ++++++------ setup.py | 3 ++- tox.ini | 6 ++++-- 8 files changed, 41 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index f2bbab6..0150728 100644 --- 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 index a510772..01432af 100644 --- 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 index bb108ce..eec4fbc 100644 --- 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 index 851fb16..51e5796 100644 --- 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 index 2ad4b32..f295503 100644 --- 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 index 3b5673b..189b8aa 100644 --- 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\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\w+)/$', GetPopupView.as_view(), name="get_popup_view"), +] diff --git a/setup.py b/setup.py index 302efa8..22f23e7 100644 --- 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 index 8e56308..333c48e 100644 --- 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