Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
lscsoft
gracedb-client
Commits
b20efe67
Commit
b20efe67
authored
Dec 14, 2020
by
Alexander Pace
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix for urllib3 bug
https://stackoverflow.com/a/28485976
parent
f05bdaab
Pipeline
#176476
passed with stages
in 16 minutes and 24 seconds
Changes
7
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
20 additions
and
12 deletions
+20
-12
debian/changelog
debian/changelog
+9
-2
debian/control
debian/control
+2
-2
ligo-gracedb.spec
ligo-gracedb.spec
+3
-3
ligo/gracedb/adapter.py
ligo/gracedb/adapter.py
+3
-2
ligo/gracedb/cli/client.py
ligo/gracedb/cli/client.py
+1
-1
ligo/gracedb/version.py
ligo/gracedb/version.py
+1
-1
setup.py
setup.py
+1
-1
No files found.
debian/changelog
View file @
b20efe67
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
View file @
b20efe67
...
...
@@ -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
View file @
b20efe67
%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
View file @
b20efe67
...
...
@@ -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
View file @
b20efe67
...
...
@@ -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
View file @
b20efe67
__version__
=
'2.7.
3
'
__version__
=
'2.7.
4
'
setup.py
View file @
b20efe67
...
...
@@ -104,7 +104,7 @@ setup(
install_requires
=
[
'future>=0.15.0'
,
'six>=1.9.0'
,
'cryptography>=1.7.2'
,
'requests>=2.
1
6.0'
,
'requests>=2.6.0'
,
],
setup_requires
=
SETUP_REQUIRES
,
tests_require
=
tests_require
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment