Merge pull request #1 from dyve/develop

与原作者保持一致

Author: fangpeng

.travis.yml

@@ -1,34 +1,47 @@
-language: python
-
 # Python versions for matrix
+language: python
 python:
   - "2.7"
   - "2.6"
   - "3.2"
   - "3.3"
+  - "3.4"
 
 # Django versions for matrix
 env:
-  - DJANGO_VERSION=1.4.10
-  - DJANGO_VERSION=1.5.5
-  - DJANGO_VERSION=1.6.2
+  - DJANGO_VERSION=1.4.16
+  - DJANGO_VERSION=1.5.11
+  - DJANGO_VERSION=1.6.8
+  - DJANGO_VERSION=1.7.1
 
 # Command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
 install:
   - pip install -q Django==$DJANGO_VERSION --use-mirrors --quiet
+  - pip install coveralls
 
 # Command to run tests, e.g. python setup.py test
 script:
-  - python manage.py test
+  - coverage run --source=bootstrap3 manage.py test
 
-# Support Python3 only with Django 1.6
+# Support Python3 only with Django 1.6+
+# Support Django 1.7+ only with Python 2.7+
 matrix:
   exclude:
     - python: "3.2"
-      env: DJANGO_VERSION=1.4.10
+      env: DJANGO_VERSION=1.4.16
     - python: "3.3"
-      env: DJANGO_VERSION=1.4.10
+      env: DJANGO_VERSION=1.4.16
+    - python: "3.4"
+      env: DJANGO_VERSION=1.4.16
     - python: "3.2"
-      env: DJANGO_VERSION=1.5.5
+      env: DJANGO_VERSION=1.5.11
     - python: "3.3"
-      env: DJANGO_VERSION=1.5.5
+      env: DJANGO_VERSION=1.5.11
+    - python: "3.4"
+      env: DJANGO_VERSION=1.5.11
+    - python: "2.6"
+      env: DJANGO_VERSION=1.7.1
+
+# Report to coveralls
+after_success:
+  - coveralls

AUTHORS.rst

@@ -1,25 +1,26 @@
 =======
-Credits
+Authors
 =======
 
 Development Lead
 ----------------
 
-* Dylan Verheul <dylan[email protected]>
+* Dylan Verheul <dylan@dyve.net>
 
 Contributors
 ------------
 
-Allard Stijnman <[email protected]>
-Austin Whittier <[email protected]>
-Caio Ariede <[email protected]>
-Fabio C. Barrionuevo da Luz <[email protected]>
-Jay Pipes <[email protected]>
-Jonas Hagstedt <[email protected]>
-Jordan Starcher <[email protected]>
-Juan Carlos <[email protected]>
-Markus Holtermann <[email protected]>
-Nick S <[email protected]>
-Owais Lone <[email protected]>
-Richard Hajdu <[email protected]>
-pmav99 <[email protected]> 
+* Allard Stijnman <[email protected]>
+* Austin Whittier <[email protected]>
+* Caio Ariede <[email protected]>
+* Fabio C. Barrionuevo da Luz <[email protected]>
+* Fabio Perfetti <[email protected]>
+* Jay Pipes <[email protected]>
+* Jonas Hagstedt <[email protected]>
+* Jordan Starcher <[email protected]>
+* Juan Carlos <[email protected]>
+* Markus Holtermann <[email protected]>
+* Nick S <[email protected]>
+* Owais Lone <[email protected]>
+* pmav99 <[email protected]>
+* Richard Hajdu <[email protected]>

HISTORY.rst

@@ -3,6 +3,132 @@
 History
 -------
 
+
+5.0.3 (2014-12-02)
+++++++++++++++++++
+
+* Fixing tests for older Django and Python versions
+
+
+5.0.2 (2014-11-24)
+++++++++++++++++++
+
+* Cleaning up some mess in 5.0.1 created by PyPI malfunction
+
+
+5.0.1 (2014-11-21)
+++++++++++++++++++
+
+* Bug fixes and update to Bootstrap 3.3.1
+
+
+4.11.0 (2014-08-19)
++++++++++++++++++++
+
+* Improved handling and control of form classes for error and success
+
+
+4.10.1 (2014-08-18)
++++++++++++++++++++
+
+* Bug fixes, test fixes, documentation fixes
+
+
+4.10.0 (2014-08-12)
++++++++++++++++++++
+
+* Template tag `bootstrap_icon` now supports a `title` parameter
+
+
+4.9.2 (2014-08-11)
+++++++++++++++++++
+
+* Fixed bug causing problems with setting classes for horizontal forms
+
+
+4.9.1 (2014-08-10)
+++++++++++++++++++
+
+* Fixed test for Django 1.4
+
+
+4.9.0 (2014-08-09)
+++++++++++++++++++
+
+* New parameter `href` for `bootstrap_button`, if provided will render `a` tag instead of `button` tag
+
+
+4.8.2 (2014-07-10)
+++++++++++++++++++
+
+* Internal fixes to master branch
+
+
+4.8.1 (2014-07-10)
+++++++++++++++++++
+
+* Make extra classes override bootstrap defaults
+
+
+4.8.0 (2014-07-10)
+++++++++++++++++++
+
+* Introduced new setting `set_placeholder`, default True
+
+
+4.7.1 (2014-07-07)
+++++++++++++++++++
+
+* Fixed rendering of various sizes (as introduced in 4.7.0)
+* Upgrade to Bootstrap 3.2.0 as default version
+
+
+4.7.0 (2014-06-04)
+++++++++++++++++++
+
+* `size` option added to formsets, forms, fields and buttons
+
+
+4.6.0 (2014-05-22)
+++++++++++++++++++
+
+* new `bootstrap_formset_errors` tag
+
+
+4.5.0 (2014-05-21)
+++++++++++++++++++
+
+* bug fixes in formsets
+* new formset renderer
+* new `bootstrap_form_errors` tag
+
+
+4.4.2 (2014-05-20)
+++++++++++++++++++
+
+* documentation now mentions templates
+
+
+4.4.1 (2014-05-08)
+++++++++++++++++++
+
+* bug fixes
+* documentation fixes
+* test coverage on coveralls.io
+
+
+4.4.0 (2014-05-01)
+++++++++++++++++++
+
+* added `bootstrap_alert` template tag
+
+
+4.3.0 (2014-04-25)
+++++++++++++++++++
+
+* added `required_css_class` and `error_css_class` as optional settings (global) and parameters (form and field rendering)
+
+
 4.2.0 (2014-04-06)
 ++++++++++++++++++
 
@@ -91,7 +217,7 @@ History
 
 * project refactored
 * added skeleton for creating documentation (fix issue #30)
-* fixed FileField issues
+* fixed `FileField` issues
 
 
 

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2013 Dylan Verheul
+Copyright 2013-2014 Dylan Verheul
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -10,4 +10,4 @@ Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.
+limitations under the License.

MANIFEST.in

@@ -5,4 +5,3 @@ include LICENSE
 include README.rst
 recursive-include bootstrap3 *.html *.png *.gif *js *jpg *jpeg *svg *py
 recursive-include demo *.html *.png *.gif *js *jpg *jpeg *svg *py
-

README.rst

@@ -1,27 +1,25 @@
-=================
-django-bootstrap3
-=================
+============================
+Welcome to django-bootstrap3
+============================
 
 .. image:: https://travis-ci.org/dyve/django-bootstrap3.png?branch=master
     :target: https://travis-ci.org/dyve/django-bootstrap3
 
+.. image:: https://coveralls.io/repos/dyve/django-bootstrap3/badge.png?branch=develop
+  :target: https://coveralls.io/r/dyve/django-bootstrap3?branch=develop
+
 .. image:: https://badge.fury.io/py/django-bootstrap3.png
     :target: http://badge.fury.io/py/django-bootstrap3
 
 .. image:: https://pypip.in/d/django-bootstrap3/badge.png
     :target: https://crate.io/packages/django-bootstrap3?version=latest
 
-Bootstrap support for Django projects
 
-**You can support this project on GitTip, https://www.gittip.com/dyve/.**
-   
-Documentation
--------------
+Use Bootstrap in your Django templates, the Django way.
 
-The full documentation is at http://django-bootstrap3.readthedocs.org/.
 
-Quickstart
-----------
+Installation
+------------
 
 1. Install using pip:
 
@@ -35,17 +33,13 @@ Quickstart
 
 3. In your templates, load the ``bootstrap3`` library and use the ``bootstrap_*`` tags:
 
-   .. code:: Django
-
-    {% load bootstrap3 %}
 
-    {# Load CSS and JavaScript #}
+Example template
+----------------
 
-    {% bootstrap_css %}
-    {% bootstrap_javascript %}
+   .. code:: Django
 
-    {# Display django.contrib.messages as Bootstrap alerts #}
-    {% bootstrap_messages %}
+    {% load bootstrap3 %}
 
     {# Display a form #}
 
@@ -60,17 +54,16 @@ Quickstart
     </form>
 
 
+Documentation
+-------------
 
-Features
---------
-
-Define your forms in Django, use ``django-bootstrap3`` to render them in Bootstrap. That's the dream.
+The full documentation is at http://django-bootstrap3.readthedocs.org/.
 
 
 Requirements
 ------------
 
-- Python 2.6, 2.7 and 3.3
+- Python 2.6, 2.7, 3.2 or 3.3
 - Django >= 1.4
 
 Contributions and pull requests for other Django and Python versions are welcome.
@@ -87,7 +80,9 @@ https://github.com/dyve/django-bootstrap3/issues
 License
 -------
 
-You can use this under Apache 2.0. See LICENSE file for details.
+You can use this under Apache 2.0. See `LICENSE
+<LICENSE>`_ file for details.
+
 
 Author
 ------

bootstrap3/__init__.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '4.2.0'
+__version__ = '5.0.3'