Merge branch 'release/8.2.3'

Author: dyve

.travis.yml

@@ -1,45 +1,18 @@
-# We do not use sudo
 sudo: false
-
-# Python versions for matrix
 language: python
-python:
-  - "2.7"
-  - "3.2"
-  - "3.3"
-  - "3.4"
-  - "3.5"
-  - "3.6"
 
-# Django versions for matrix
-env:
-  - DJANGO_VERSION='>=1.8,<1.9'
-  - DJANGO_VERSION='>=1.9,<1.10'
-  - DJANGO_VERSION='>=1.10,<1.11'
+python:
+    - "2.7"
+    - "3.3"
+    - "3.4"
+    - "3.5"
+    - "3.6"
 
-# Command to install dependencies, e.g. pip install -r requirements.txt
 install:
-  - pip install Django$DJANGO_VERSION
-  # Coverage 4.0 no longer supports py32. Install an older version before
-  # coveralls tries to install the latest
-  - if [[ $TRAVIS_PYTHON_VERSION == '3.2' ]]; then travis_retry pip install 'coverage<4.0'; fi
-  - pip install coveralls
+    - pip install tox-travis coveralls
 
-# Command to run tests, e.g. python setup.py test
 script:
-  - coverage run --source=bootstrap3 manage.py test
-
-matrix:
-  exclude:
-    - python: "3.2"
-      env: DJANGO_VERSION='>=1.9,<1.10'
-    - python: "3.2"
-      env: DJANGO_VERSION='>=1.10,<1.11'
-    - python: "3.3"
-      env: DJANGO_VERSION='>=1.9,<1.10'
-    - python: "3.3"
-      env: DJANGO_VERSION='>=1.10,<1.11'
+    - tox
 
-# Report to coveralls
 after_success:
-  - coveralls
+    - coveralls

HISTORY.rst

@@ -4,8 +4,20 @@ History
 -------
 
 
-8.2.2 (017-04-03)
-+++++++++++++++++
+8.2.3 (2017-05-05)
+++++++++++++++++++
+
+* Renamed requirements.txt to requirements-dev.txt
+* Tweaks to tests and CI (see #400)
+* Prepared test for geometry fields (disabled, blocked by Django update, see #392)
+* Bug fixes for add ons and placeholders (thanks @jaimesanz, @cybojenix and @marc-gist)
+* Improve documentation for pagination with GET parameters (thanks @nspo)
+* Add unicode test for help_text
+* Removed tests for Python 3.2 from tox and Travis CI (no longer supported by Django 1.8)
+
+
+8.2.2 (2017-04-03)
+++++++++++++++++++
 
 * Fix invalid HTML in help texts (thanks @luksen)
 * Added `mark_safe` to placeholder (thanks @ppo)

README.rst

@@ -23,8 +23,9 @@ Write Django as usual, and let ``django-bootstrap3`` make template output into B
 Requirements
 ------------
 
-- Python 2.7, 3.2, 3.3, 3.4, or 3.5
+- Python 2.7, 3.3, 3.4, or 3.5
 - Django >= 1.8
+- For details, see https://docs.djangoproject.com/en/dev/faq/install/#faq-python-version-support
 
 *The latest version supporting Python 2.6 and Django < 1.8 is the 6.x.x branch.*
 

bootstrap3/__init__.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '8.2.2'
+__version__ = '8.2.3'

bootstrap3/bootstrap.py

@@ -77,16 +77,16 @@ def javascript_url():
     """
     Return the full url to the Bootstrap JavaScript file
     """
-    return get_bootstrap_setting('javascript_url') or \
-           bootstrap_url('js/bootstrap.min.js')
+    url = get_bootstrap_setting('javascript_url')
+    return url if url else bootstrap_url('js/bootstrap.min.js')
 
 
 def css_url():
     """
     Return the full url to the Bootstrap CSS file
     """
-    return get_bootstrap_setting('css_url') or \
-           bootstrap_url('css/bootstrap.min.css')
+    url = get_bootstrap_setting('css_url')
+    return url if url else bootstrap_url('css/bootstrap.min.css')
 
 
 def theme_url():

bootstrap3/forms.py

@@ -4,7 +4,7 @@
 from django.contrib.admin.widgets import AdminFileWidget
 from django.forms import (
     HiddenInput, FileInput, CheckboxSelectMultiple, Textarea, TextInput,
-    PasswordInput
+    PasswordInput, NumberInput, EmailInput, URLInput,
 )
 from django.forms.widgets import CheckboxInput
 from django.utils.safestring import mark_safe
@@ -179,8 +179,6 @@ def is_widget_with_placeholder(widget):
     """
     Is this a widget that should have a placeholder?
     Only text, search, url, tel, e-mail, password, number have placeholders
-    These are all derived form TextInput, except for Textarea
     """
-    # PasswordInput inherits from Input in Django 1.4.
-    # It was changed to inherit from TextInput in 1.5.
-    return isinstance(widget, (TextInput, Textarea, PasswordInput))
+    return isinstance(widget, (TextInput, Textarea, NumberInput, EmailInput,
+                               URLInput, PasswordInput))

bootstrap3/renderers.py

@@ -8,8 +8,8 @@
     ReadOnlyPasswordHashWidget = None
 
 from django.forms import (
-    TextInput, DateInput, FileInput, CheckboxInput, MultiWidget,
-    ClearableFileInput, Select, RadioSelect, CheckboxSelectMultiple
+    TextInput, DateInput, FileInput, CheckboxInput, MultiWidget, ClearableFileInput,
+    Select, RadioSelect, CheckboxSelectMultiple, NumberInput, EmailInput, URLInput
 )
 # Django 1.9 moved SelectDateWidget to django.forms.widget from
 # django.forms.extras. Django 2.0 will remove the old import location.
@@ -443,7 +443,8 @@ def wrap_widget(self, html):
         return html
 
     def make_input_group(self, html):
-        if (self.addon_before or self.addon_after) and isinstance(self.widget, (TextInput, DateInput, Select)):
+        if (self.addon_before or self.addon_after) and isinstance(
+                self.widget, (TextInput, NumberInput, EmailInput, URLInput, DateInput, Select)):
             before = '<span class="{input_class}">{addon}</span>'.format(
                 input_class=self.addon_before_class, addon=self.addon_before) if self.addon_before else ''
             after = '<span class="{input_class}">{addon}</span>'.format(

bootstrap3/templatetags/bootstrap3.py

@@ -286,7 +286,8 @@ def bootstrap_formset_errors(*args, **kwargs):
             The formset that is being rendered
 
         layout
-            Context value that is available in the template ``bootstrap3/form_errors.html`` as ``layout``.
+            Context value that is available in the template ``bootstrap3/form_errors.html``
+            as ``layout``.
 
     **Usage**::
 
@@ -803,7 +804,8 @@ def bootstrap_pagination(page, **kwargs):
             :default: ``None``
 
         size
-            Controls the size of the pagination through CSS. Defaults to being normal sized.
+            Controls the size of the pagination through CSS.
+            Defaults to being normal sized.
 
             One of the following:
 

bootstrap3/tests.py

@@ -5,6 +5,7 @@
 
 from django import forms
 from django.contrib.admin.widgets import AdminSplitDateTime
+from django.contrib.gis import forms as gisforms
 from django.contrib.messages import constants as DEFAULT_MESSAGE_LEVELS
 from django.forms.formsets import formset_factory
 from django.template import engines
@@ -58,6 +59,7 @@ class TestForm(forms.Form):
         label='Sender © unicode',
         help_text='E.g., "[email protected]"')
     secret = forms.CharField(initial=42, widget=forms.HiddenInput)
+    weird = forms.CharField(help_text=u"strings are now utf-8 \u03BCnico\u0394é!")
     cc_myself = forms.BooleanField(
         required=False,
         help_text='cc stands for "carbon copy." You will get a copy in your mailbox.'
@@ -86,10 +88,15 @@ class TestForm(forms.Form):
         widget=forms.CheckboxSelectMultiple,
         help_text='Check as many as you like.',
     )
+    number = forms.FloatField()
+    url = forms.URLField()
     addon = forms.CharField(
         widget=forms.TextInput(attrs={'addon_before': 'before', 'addon_after': 'after'}),
     )
 
+    # TODO: Re-enable this after Django 1.11 #28105 is available
+    # polygon = gisforms.PointField()
+
     required_css_class = 'bootstrap3-req'
 
     # Set this to allow tests to work properly in Django 1.10+
@@ -704,3 +711,44 @@ def test_button_with_icon(self):
             res.strip(),
             '<button class="btn btn-default" type="submit"><span class="glyphicon glyphicon-info-sign"></span> test</button>'
         )
+
+
+class ShowPlaceholderTest(TestCase):
+    def test_placeholder_set_from_label(self):
+        res = render_form_field('sender')
+        self.assertIn('placeholder="Sender © unicode"', res)
+
+
+class ShowAddonsTest(TestCase):
+
+    def assertFieldHasAddons(self, field):
+        """Asserts that a given field has an after and before addon."""
+        addon_before = "bf"
+        addon_after = "af"
+
+        res = render_template_with_form(
+            '{{% bootstrap_field form.{0} addon_before="{1}"  addon_after="{2}" %}}'.format(
+                field, addon_before, addon_after)
+        )
+
+        self.assertIn('class="input-group"', res)
+        self.assertIn('class="input-group-addon">{0}'.format(addon_before), res)
+        self.assertIn('class="input-group-addon">{0}'.format(addon_after), res)
+
+    def test_show_addons_textinput(self):
+        self.assertFieldHasAddons("subject")
+
+    def test_show_addons_select(self):
+        self.assertFieldHasAddons("select1")
+
+    def test_show_addons_dateinput(self):
+        self.assertFieldHasAddons("date")
+
+    def test_show_addons_email(self):
+        self.assertFieldHasAddons("sender")
+
+    def test_show_addons_number(self):
+        self.assertFieldHasAddons("number")
+
+    def test_show_addons_url(self):
+        self.assertFieldHasAddons("url")

requirements.txt renamed to requirements-dev.txt

@@ -1,3 +1,3 @@
-Django>=1.4
+Django>=1.8
 Sphinx
 sphinx_rtd_theme

testsettings.py

@@ -17,6 +17,7 @@
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'django.contrib.gis',
 
     # We test this one
     'bootstrap3',
@@ -42,6 +43,8 @@
 
 ROOT_URLCONF = None
 
+STATIC_URL = '/static/'
+
 BOOTSTRAP3 = {
     'theme_url': '//example.com/theme.css',
     'javascript_in_head': True,

tox.ini

@@ -6,29 +6,27 @@
 [tox]
 minversion=1.8.0
 envlist =
-    py27-django18,
-    py27-django19,
-    py27-django110,
-    py27-django111,
-
-    py33-django18,
-
-    py34-django18,
-    py34-django19,
-    py34-django110,
-    py34-django111,
-
-    py35-django19,
-    py35-django110,
-    py35-django111,
-
-    py36-django110,
-    py36-django111
+    py27-django{18,19,110,111}
+    py33-django{18}
+    py34-django{18,19,110,111}
+    py35-django{19,110,111}
+    py36-django{110,111}
+    docs
 
 [testenv]
-commands = python manage.py test
+commands = coverage run --append --source='.' manage.py test -v1 --noinput
 deps =
     django18: Django>=1.8,<1.9
     django19: Django>=1.9,<1.10
     django110: Django>=1.10,<1.11
-    django111: Django>=1.11b1,<2.0
+    django111: Django>=1.11,<2.0
+    coverage
+
+[testenv:docs]
+changedir = docs
+deps =
+    django>=1.8
+    sphinx
+    sphinx_rtd_theme
+commands = sphinx-build -b html -d _build/doctrees   . _build/html
+