Automatic merge pull request #3383 from turtle321/INSPIR-549, jenkins…

…-inspire-next_merge-141

inspirehep/modules/orcid/api.py

@@ -263,4 +263,4 @@ def _get_api():
     client_key = app.config['ORCID_APP_CREDENTIALS']['consumer_key']
     client_secret = app.config['ORCID_APP_CREDENTIALS']['consumer_secret']
     sandbox = app.config['ORCID_SANDBOX']
-    return MemberAPI(client_key, client_secret, sandbox)
+    return MemberAPI(client_key, client_secret, sandbox, timeout=30)

requirements.txt

@@ -26,9 +26,6 @@
 # SWORD2 client fork
 -e git+https://github.com/inspirehep/python-client-sword2.git#egg=sword2
 
-# python-orcid with support for v2.0 API and XML
--e git+https://github.com/ORCID/[email protected]#egg=orcid
-
 # flower until flower > 0.9.2 is released
 # https://github.com/mher/flower/commit/30022a93bdacd2826d7ffa32b52bd3e406cb33c1
 -e git+https://github.com/mher/flower.git#egg=flower

setup.py

@@ -97,6 +97,7 @@
     'latexcodec~=1.0,>=1.0.5',
     'librabbitmq~=1.0,>=1.6.1',
     'marshmallow~=2.0,>=2.15.0',  # See: inveniosoftware/invenio-records-rest#186
+    'orcid~=1.0,>=1.0.2',
     'plotextractor~=0.0,>=0.1.6',
     'pyOpenSSL~=17.0,>=17.5.0',
     'pybtex~=0.0,>=0.21',