Skip to content

Commit

Permalink
Merge pull request #110 from romgar/add_coverage_for_django_1_11
Browse files Browse the repository at this point in the history
Add coverage for django 1 11. Fixes #110
  • Loading branch information
romgar committed Jul 7, 2017
2 parents a0c5ccb + e3a647a commit 715eccf
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
4 changes: 3 additions & 1 deletion ChangeLog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@ master (unreleased)

- Drop support for unsupported Django versions: 1.4, 1.5, 1.6 and 1.7 series.
- Fixes issue with verbose mode when the object has not been yet saved in the database (MR #99). Thanks vapkarian.
- Add test coverage for Django 1.11.


*Bugfix:*

- Correctly handle :code:`ForeignKey.db_column` :code:`{}_id` in :code:`update_fields`
- Correctly handle :code:`ForeignKey.db_column` :code:`{}_id` in :code:`update_fields`. Thanks Hugo Smett.


.. _v1.2.1:
Expand Down
9 changes: 7 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = django18,django19,django110,coverage,postgresql
envlist = django18,django19,django110,django111,coverage,postgresql

[testenv]
setenv =
Expand Down Expand Up @@ -27,13 +27,18 @@ deps =
django>=1.10,<1.10.99
{[testenv]deps}

[testenv:django111]
deps =
django>=1.11,<1.11.99
{[testenv]deps}

[testenv:postgresql]
setenv =
PYTHONPATH = {toxinidir}
commands =
py.test --ds=tests.postgresql_django_settings -v
deps =
django>=1.10,<1.10.99
django>=1.11,<1.11.99
psycopg2
{[testenv]deps}

Expand Down

0 comments on commit 715eccf

Please sign in to comment.