Skip to content

Commit

Permalink
Merge branch 'remove_dbs3_set_required_set_disabled'
Browse files Browse the repository at this point in the history
* remove_dbs3_set_required_set_disabled:
  Small fix to testing
  Prepare 11.0.0
  • Loading branch information
dyve committed Aug 30, 2018
2 parents 4b50be9 + fc98515 commit eab9d79
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
History
-------

Development
+++++++++++
11.0.0 (2018-08-30)
+++++++++++++++++++

* Support `crossorigin` and `integrity` in urls (#443)
* Switch to explicit Travis tests (#444)
Expand Down
2 changes: 1 addition & 1 deletion bootstrap3/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*-

__version__ = "10.0.1"
__version__ = "11.0.0"
5 changes: 3 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,15 @@ envlist =
setenv =
PYTHONWARNINGS=module::DeprecationWarning
commands =
coverage run --source=bootstrap3 manage.py test -v1 --noinput
coverage report -m
coverage run --append --source=bootstrap3 manage.py test -v1 --noinput
deps =
coverage
1.11: Django>=1.11,<2.0
2.0: Django>=2.0,<2.1
2.1: Django==2.1
master: https://github.com/django/django/archive/master.tar.gz
after_success:
coveralls

[testenv:docs]
basepython = python
Expand Down

0 comments on commit eab9d79

Please sign in to comment.