Merge pull request #44 from haakenlid/master

Change enum34 dependency to enum-compat and freeze coveralls at version 1.1
miki725 · Aug 17, 2017 · d9428fe · d9428fe
2 parents 66f3ac2 + 9c2f6fe
commit d9428fe
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,7 +17,7 @@ before_install:
 install:
   - pip install $DJANGO
   - pip install -r requirements-dev.txt
-  - pip install coveralls
+  - pip install coveralls==1.1  # travis pypy not compatible with later versions
   - pip freeze
 
 # command to run tests, e.g. python setup.py test

diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -11,3 +11,4 @@ Contributors
 
 * João Neto - https://github.com/netjinho
 * Jorik Kraaikamp - https://github.com/JostCrow
+* Håken Lid - https://github.com/haakenlid
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
 cached-property
 Django>=1.8
-enum34
+enum-compat
 six
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,3 +11,4 @@ Contributors

		* João Neto - https://github.com/netjinho
		* Jorik Kraaikamp - https://github.com/JostCrow
		* Håken Lid - https://github.com/haakenlid