Merge pull request #178 from andamian/auth

Moved auth out of extensions subpackage
astropy · Sep 20, 2019 · cc8d4aa · cc8d4aa
2 parents 87068c9 + 7e8646d
commit cc8d4aa
Show file tree

Hide file tree

Showing 15 changed files with 13 additions and 17 deletions.
diff --git a/examples/auth/cadc_auth_example.py b/examples/auth/cadc_auth_example.py
@@ -6,9 +6,8 @@
 import getpass
 
 import requests
-
 import pyvo
-import pyvo.extensions.auth.authsession
+from pyvo.auth import authsession
 
 # Gather login information
 data = {
@@ -28,7 +27,7 @@
 cookie = '\"' + response.text + '\"'
 
 # Configure the session and run the query
-auth = pyvo.extensions.auth.authsession.AuthSession()
+auth = authsession.AuthSession()
 auth.credentials.set_cookie('CADC_SSO', cookie)
 service = pyvo.dal.TAPService('https://www.cadc-ccda.hia-iha.nrc-cnrc.gc.ca/tap', auth)
 job = service.search('SELECT * from TAP_SCHEMA.tables')

diff --git a/examples/auth/cert_auth_example.py b/examples/auth/cert_auth_example.py
@@ -5,10 +5,10 @@
 Tests for pyvo.extensions.authsession
 """
 import pyvo
-import pyvo.extensions.auth.authsession
+from pyvo.auth import authsession
 
 certificate_path = input('Path to client certificate file:')
-auth = pyvo.extensions.auth.authsession.AuthSession()
+auth = authsession.AuthSession()
 auth.credentials.set_client_certificate(certificate_path)
 service = pyvo.dal.TAPService('https://www.cadc-ccda.hia-iha.nrc-cnrc.gc.ca/tap', auth)
 job = service.search('SELECT * from TAP_SCHEMA.tables')

diff --git a/examples/auth/gaia_auth_example.py b/examples/auth/gaia_auth_example.py
@@ -4,12 +4,10 @@
 Example for authenticating with Gaia TAP service
 """
 import getpass
-
 import requests
 
 import pyvo
-import pyvo.extensions.auth.authsession
-from pyvo.extensions.auth.securitymethods import ANONYMOUS
+from pyvo.auth import securitymethods, authsession
 
 # Gather login information
 data = {
@@ -30,8 +28,8 @@
 response.raise_for_status()
 
 # Use this session with the auth cookie for all requests to Gaia.
-auth = pyvo.extensions.auth.authsession.AuthSession()
-auth.credentials.set(ANONYMOUS, session)
+auth = authsession.AuthSession()
+auth.credentials.set(securitymethods.ANONYMOUS, session)
 service = pyvo.dal.TAPService('http://gea.esac.esa.int/tap-server/tap', auth)
 job = service.search('SELECT * from TAP_SCHEMA.tables')
 print(job)
diff --git a/pyvo/__init__.py b/pyvo/__init__.py
@@ -36,7 +36,7 @@
 if not _ASTROPY_SETUP_:
     from . import registry
     from .dal import ssa, sia, sla, scs, tap
-
+    from . import auth
     from .registry import search as regsearch
     from .dal import (
         imagesearch, spectrumsearch, conesearch, linesearch, tablesearch,

diff --git a/pyvo/extensions/__init__.py → pyvo/auth/__init__.py b/pyvo/extensions/__init__.py → pyvo/auth/__init__.py
diff --git a/pyvo/extensions/auth/authsession.py → pyvo/auth/authsession.py b/pyvo/extensions/auth/authsession.py → pyvo/auth/authsession.py
diff --git a/pyvo/extensions/auth/authurls.py → pyvo/auth/authurls.py b/pyvo/extensions/auth/authurls.py → pyvo/auth/authurls.py
@@ -1,7 +1,7 @@
 import collections
 import logging
 
-import pyvo.extensions.auth.securitymethods as securitymethods
+from . import securitymethods
 
 
 class AuthURLs():

diff --git a/pyvo/extensions/auth/credentialstore.py → pyvo/auth/credentialstore.py b/pyvo/extensions/auth/credentialstore.py → pyvo/auth/credentialstore.py
@@ -2,7 +2,7 @@
 
 from pyvo.utils.http import create_session
 
-import pyvo.extensions.auth.securitymethods as securitymethods
+from . import securitymethods
 
 
 class CredentialStore(object):

diff --git a/pyvo/extensions/auth/securitymethods.py → pyvo/auth/securitymethods.py b/pyvo/extensions/auth/securitymethods.py → pyvo/auth/securitymethods.py
diff --git a/pyvo/extensions/auth/__init__.py → pyvo/auth/tests/__init__.py b/pyvo/extensions/auth/__init__.py → pyvo/auth/tests/__init__.py
diff --git a/pyvo/extensions/auth/tests/conftest.py → pyvo/auth/tests/conftest.py b/pyvo/extensions/auth/tests/conftest.py → pyvo/auth/tests/conftest.py
diff --git a/...ions/auth/tests/data/tap/capabilities.xml → pyvo/auth/tests/data/tap/capabilities.xml b/...ions/auth/tests/data/tap/capabilities.xml → pyvo/auth/tests/data/tap/capabilities.xml
diff --git a/pyvo/extensions/auth/tests/setup_package.py → pyvo/auth/tests/setup_package.py b/pyvo/extensions/auth/tests/setup_package.py → pyvo/auth/tests/setup_package.py
@@ -4,4 +4,4 @@
 
 def get_package_data():
     paths = [os.path.join('data/tap', '*.xml')]
-    return {'pyvo.extensions.auth.tests': paths}
+    return {'pyvo.auth.tests': paths}
diff --git a/pyvo/extensions/auth/tests/test_auth.py → pyvo/auth/tests/test_auth.py b/pyvo/extensions/auth/tests/test_auth.py → pyvo/auth/tests/test_auth.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 """
-Tests for pyvo.extensions.auth
+Tests for pyvo.auth
 """
 import base64
 from requests.cookies import RequestsCookieJar
@@ -12,7 +12,7 @@
 from astropy.utils.data import get_pkg_data_contents
 
 import pyvo.dal
-from pyvo.extensions.auth.authsession import AuthSession
+from pyvo.auth.authsession import AuthSession
 
 from pyvo.dal.tests.test_tap import MockAsyncTAPServer
 

diff --git a/pyvo/extensions/auth/tests/__init__.py b/pyvo/extensions/auth/tests/__init__.py