fix for urllib3 bug

https://stackoverflow.com/a/28485976

debian/changelog

+ligo-gracedb (2.7.4-1) unstable; urgency=low
+  * fix for requests/urllib3 bug
+  * fix for json response for update event CLI command
+  * packaging changes
+
+ -- Alexander E. Pace <alexander.pace@ligo.org>  Mon, 14 Dec 2020 20:53:47 +0000
+
 ligo-gracedb (2.7.3-1) unstable; urgency=low
   * json() method for file retrieval. 
 
- -- Alexander E. Pace <alexander.pace@ligo.org> Mon, 23 Nov 2020 20:54:49 +0000
+ -- Alexander E. Pace <alexander.pace@ligo.org>  Mon, 23 Nov 2020 20:54:49 +0000
 
 ligo-gracedb (2.7.2-1) unstable; urgency=low
   * Bugfix for certificate check failure with tuple'd credentials
 
- -- Alexander E. Pace <alexander.pace@ligo.org> Mon, 16 Nov 2020 21:03:38 +0000
+ -- Alexander E. Pace <alexander.pace@ligo.org>  Mon, 16 Nov 2020 21:03:38 +0000
 
 ligo-gracedb (2.7.1-1) unstable; urgency=low
   * Improved exception handling for HTTPErrors

debian/control

@@ -5,7 +5,7 @@ Priority: optional
 Build-Depends: debhelper (>= 9), dh-python, python-all-dev, python3-all-dev, python-setuptools, python3-setuptools, python-six, python3-six, help2man
 Standards-Version: 3.8.4
 X-Python-Version: >=2.7
-X-Python3-Version: >=3.6
+X-Python3-Version: >=3.5
 
 Package: python-ligo-gracedb
 Architecture: all
@@ -21,7 +21,7 @@ Description: Gravitational-wave Candidate Event Database - Python
 
 Package: python3-ligo-gracedb
 Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends}, python3-ligo-common, python3-future, python3-setuptools, python3-cryptography, python3-requests (>= 2.16.0)
+Depends: ${misc:Depends}, ${python3:Depends}, python3-ligo-common, python3-future, python3-setuptools, python3-cryptography, python3-requests
 Provides: ${python3:Provides}
 Description: Gravitational-wave Candidate Event Database - Python 3
  The gravitational-wave candidate event database (GraceDB) is a prototype

ligo-gracedb.spec

 %define name              ligo-gracedb
-%define version           2.7.3
-%define unmangled_version 2.7.3
+%define version           2.7.4
+%define unmangled_version 2.7.4
 %define release           1
 
 Summary:   Gravity Wave Candidate Event Database
@@ -62,7 +62,7 @@ Requires: python%{python3_pkgversion}-six
 Requires: python%{python3_pkgversion}-ligo-common
 Requires: python%{python3_pkgversion}-future
 Requires: python%{python3_pkgversion}-cryptography
-Requires: python%{python3_pkgversion}-requests >= 2.16.0
+Requires: python%{python3_pkgversion}-requests 
 
 %{?python_provide:%python_provide python%{python3_pkgversion}-%{name}}
 

ligo/gracedb/adapter.py

@@ -29,8 +29,9 @@
 
 from functools import partial
 from requests.adapters import HTTPAdapter
-from urllib3.connection import HTTPSConnection
-from urllib3.connectionpool import HTTPSConnectionPool, HTTPConnectionPool
+from requests.packages.urllib3.connection import HTTPSConnection
+from requests.packages.urllib3.connectionpool \
+    import HTTPSConnectionPool, HTTPConnectionPool
 from .cert import check_certificate_expiration
 
 

ligo/gracedb/cli/client.py

@@ -217,7 +217,7 @@ def main(args=None):
                 print(output)
                 sys.exit(1)
             # Handle errors raised in load_json_or_die()
-            if response.status_code == 204:
+            if response.status_code in [202, 204]:
                 output = {}
                 print(output)
                 sys.exit(1)

ligo/gracedb/version.py

-__version__ = '2.7.3'
+__version__ = '2.7.4'

setup.py

@@ -104,7 +104,7 @@ setup(
     install_requires=['future>=0.15.0',
                       'six>=1.9.0',
                       'cryptography>=1.7.2',
-                      'requests>=2.16.0',
+                      'requests>=2.6.0',
                       ],
     setup_requires=SETUP_REQUIRES,
     tests_require=tests_require,