fixes travis config (I hope)

saxix · Nov 26, 2015 · 6c526bd · 6c526bd
1 parent abe66e3
commit 6c526bd
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,7 +22,7 @@ install:
   - pip install tox coverage coveralls>=0.5
 
 script:
-  - tox -e $TOXENV --recreate -- -vv --capture=no --cov=adminactions --cov-report=xml --cov-config=tests/.coveragerc
+  - tox -e $TOXENV --recreate -- tests -vv --capture=no --cov=adminactions --cov-report=xml --cov-config=tests/.coveragerc
 
 before_success:
   - coverage erase

diff --git a/CHANGES b/CHANGES
@@ -1,7 +1,7 @@
 Release 1.0 (dev)
 =================
 * minor refactoring
-*   official support for django 1.4 to 1.9
+* official support for django 1.4 to 1.9
 * official support for python 2.7, 3.3, 3.5
 * merge :ghissue:`77` - add initial form values for CSV export
 * merge :ghissue:`76` - reuse xls style while iterating over cells

diff --git a/src/adminactions/mass_update.py b/src/adminactions/mass_update.py
@@ -114,8 +114,7 @@ def __getitem__(self, field_class):
     df.NullBooleanField: [('swap', (negate, False, True, ""))],
     df.EmailField: [('change domain', (change_domain, True, True, "")),
                     ('upper', (string.upper, False, True, "convert to uppercase")),
-                    ('lower', (string.lower, False, True, "convert to lowercase")),
-                    ],
+                    ('lower', (string.lower, False, True, "convert to lowercase"))],
     df.URLField: [('change protocol', (change_protocol, True, True, ""))]
 })
 

diff --git a/src/adminactions/urls.py b/src/adminactions/urls.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, unicode_literals
 
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from adminactions.views import format_date