diff --git a/.travis.yml b/.travis.yml index 0150728..354819d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,37 +1,43 @@ sudo: false language: python -env: - - TOXENV=py27-dj_1.8-bootstrap_7.0.0-crispy_1.5.0-tests - - TOXENV=py27-dj_1.8-bootstrap_7.0.0-crispy_1.5.1-tests - - TOXENV=py34-dj_1.8-bootstrap_7.0.0-crispy_1.5.0-tests - - TOXENV=py34-dj_1.8-bootstrap_7.0.0-crispy_1.5.1-tests - - TOXENV=py27-dj_1.9-bootstrap_7.1.0-crispy_1.6.0-tests - - 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 + +matrix: + include: + - { python: 2.7, env: TOXENV=py27-dj_1.8-bootstrap_7.1-crispy_1.5-tests } + - { python: 3.4, env: TOXENV=py34-dj_1.8-bootstrap_7.1-crispy_1.5-tests } + - { python: 2.7, env: TOXENV=py27-dj_1.9-bootstrap_7.1-crispy_1.5-tests } + - { python: 2.7, env: TOXENV=py27-dj_1.9-bootstrap_7.1-crispy_1.6-tests } + - { python: 2.7, env: TOXENV=py27-dj_1.9-bootstrap_8.1-crispy_1.5-tests } + - { python: 2.7, env: TOXENV=py27-dj_1.9-bootstrap_8.1-crispy_1.6-tests } + - { python: 2.7, env: TOXENV=py27-dj_1.9-bootstrap_8.2-crispy_1.5-tests } + - { python: 2.7, env: TOXENV=py27-dj_1.9-bootstrap_8.2-crispy_1.6-tests } + - { python: 3.4, env: TOXENV=py34-dj_1.9-bootstrap_7.1-crispy_1.5-tests } + - { python: 3.4, env: TOXENV=py34-dj_1.9-bootstrap_7.1-crispy_1.6-tests } + - { python: 3.4, env: TOXENV=py34-dj_1.9-bootstrap_8.1-crispy_1.5-tests } + - { python: 3.4, env: TOXENV=py34-dj_1.9-bootstrap_8.1-crispy_1.6-tests } + - { python: 3.4, env: TOXENV=py34-dj_1.9-bootstrap_8.2-crispy_1.5-tests } + - { python: 3.4, env: TOXENV=py34-dj_1.9-bootstrap_8.2-crispy_1.6-tests } + - { python: 2.7, env: TOXENV=py27-dj_1.10-bootstrap_7.1-crispy_1.5-tests } + - { python: 2.7, env: TOXENV=py27-dj_1.10-bootstrap_7.1-crispy_1.6-tests } + - { python: 2.7, env: TOXENV=py27-dj_1.10-bootstrap_8.1-crispy_1.5-tests } + - { python: 2.7, env: TOXENV=py27-dj_1.10-bootstrap_8.1-crispy_1.6-tests } + - { python: 2.7, env: TOXENV=py27-dj_1.10-bootstrap_8.2-crispy_1.5-tests } + - { python: 2.7, env: TOXENV=py27-dj_1.10-bootstrap_8.2-crispy_1.6-tests } + - { python: 3.4, env: TOXENV=py34-dj_1.10-bootstrap_7.1-crispy_1.5-tests } + - { python: 3.4, env: TOXENV=py34-dj_1.10-bootstrap_7.1-crispy_1.6-tests } + - { python: 3.4, env: TOXENV=py34-dj_1.10-bootstrap_8.1-crispy_1.5-tests } + - { python: 3.4, env: TOXENV=py34-dj_1.10-bootstrap_8.1-crispy_1.6-tests } + - { python: 3.4, env: TOXENV=py34-dj_1.10-bootstrap_8.2-crispy_1.5-tests } + - { python: 3.4, env: TOXENV=py34-dj_1.10-bootstrap_8.2-crispy_1.6-tests } + - { python: 2.7, env: TOXENV=py27-dj_1.11-bootstrap_8.2-crispy_1.6-tests } + - { python: 3.4, env: TOXENV=py34-dj_1.11-bootstrap_8.2-crispy_1.6-tests } + - { python: 2.7, env: TOXENV=py27-flake } + - { python: 3.4, env: TOXENV=py34-flake } + - { python: 3.4, env: TOXENV=py34-isort } + + allow_failures: + - env: TOXENV=py27-dj_1.11-bootstrap_8.2-crispy_1.6-tests + - env: TOXENV=py34-dj_1.11-bootstrap_8.2-crispy_1.6-tests install: - pip install tox>=2.5.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 01432af..3f6bc93 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,20 +1,24 @@ # CHANGELOG for django-popup-view-field +## 0.3.0 (2017-03-07) + +* Support for Django 1.11 + ## 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 +* Remove PopupViewField from django_popup_view_field.__init__, + now you must import PopupViewField from django_popup_view_field.fields - * Sorting imports using isort +* Sorting imports using isort - * Checking the order of imports in the tox +* Checking the order of imports in the tox - * Checking support for django-bootstrap3 v8.1.0 +* Checking support for django-bootstrap3 v8.1.0 - * Added django-bootstrap3 v8.1.0 to tox +* Added django-bootstrap3 v8.1.0 to tox - * Adding version in django_popup_view_field.__init__ +* Adding version in django_popup_view_field.__init__ ## 0.1 (2016-12-27) - * Initial version + tests + Travis CI +* Initial version + tests + Travis CI diff --git a/django_popup_view_field/__init__.py b/django_popup_view_field/__init__.py index f295503..65a0704 100644 --- a/django_popup_view_field/__init__.py +++ b/django_popup_view_field/__init__.py @@ -1,2 +1,2 @@ -VERSION = (0, 2, 0) +VERSION = (0, 3, 0) __version__ = ".".join(str(i) for i in VERSION) diff --git a/django_popup_view_field/templates/django_popup_view_field/popup_view_widget.html b/django_popup_view_field/templates/django_popup_view_field/popup_view_widget.html new file mode 100644 index 0000000..3704e22 --- /dev/null +++ b/django_popup_view_field/templates/django_popup_view_field/popup_view_widget.html @@ -0,0 +1,29 @@ +{% spaceless %} +