Merge branch 'hotfix/1.6.1'

ecds · Aug 8, 2016 · d9bd7aa · d9bd7aa
2 parents 125d6d6 + cf0b185
commit d9bd7aa
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -3,6 +3,12 @@
 CHANGELOG
 =========
 
+Release 1.6.1
+-------------
+
+* Require eulfedora 1.6 or greater for debug filter and connection retries
+
+
 Release 1.6 - Group Annotation
 ------------------------------
 

diff --git a/readux/__init__.py b/readux/__init__.py
@@ -1,4 +1,4 @@
-__version_info__ = (1, 6, 0, None)
+__version_info__ = (1, 6, 1, None)
 
 
 # Dot-connect all but the last. Last is dash-connected if not None.

diff --git a/readux/settings.py b/readux/settings.py
@@ -153,6 +153,10 @@
 
 LOGIN_REDIRECT_URL = '/'
 
+# use eulfedora filter to keep fedora credentials from showing up
+# in debug stack traces and emails when an exception occurs in an api request
+DEFAULT_EXCEPTION_REPORTER_FILTER = 'eulfedora.util.SafeExceptionReporterFilter'
+
 # additional github permissions, for annotated volume export to github
 SOCIAL_AUTH_GITHUB_SCOPE = ['public_repo']
 

diff --git a/requirements/minimum.txt b/requirements/minimum.txt
@@ -1,6 +1,6 @@
 Django>=1.8,<1.9
 eulxml>=0.22
-eulfedora>=1.5
+eulfedora>=1.6
 # dev eulcm content model objects (until initial eulcm release)
 -e git://github.com/emory-libraries/eulcm.git@4c97a98c79#egg=eulcm
 # require at least downtime 1.0.4 for exempting exact urls
@@ -14,7 +14,8 @@ django-widget-tweaks
 # NOTE: also want new enough dev version for python-requests support
 -e git+https://github.com/rlskoeser/sunburnt.git@solr4-join-support#egg=sunburnt
 # sunburnt requires *either* httplib2 or python-requests
-requests
+# eulfedora not yet compatible with requests 2.11
+requests<2.11
 eulcommon
 # pidman client
 -e git+https://github.com/emory-libraries/pidmanclient.git@release-1.2.0#egg=pidservices