diff --git a/Sphinx/conf.py b/Sphinx/conf.py index a188b94..d8f9e2c 100644 --- a/Sphinx/conf.py +++ b/Sphinx/conf.py @@ -24,7 +24,7 @@ author = 'John Good' # The full version, including alpha/beta/rc tags -release = '3.0.0' +release = '3.0.1' # -- General configuration --------------------------------------------------- diff --git a/TAP/tap.py b/TAP/tap.py index ef6a4d8..3442d23 100755 --- a/TAP/tap.py +++ b/TAP/tap.py @@ -212,7 +212,7 @@ def __run__(self, **kwargs): if self.debug: logging.debug('') - logging.debug('nexsciTAP version 1.2.1\n\n') + logging.debug('nexsciTAP version 3.0.1\n\n') logging.debug('HTTP request keywords:\n') self.lang = 'ADQL' @@ -2974,7 +2974,7 @@ def __printVosiTables__ (self, connectInfo, vosipath, **kwargs): logging.debug('') logging.debug('call vosiTables') - vosiTables (dbms=dbms, \ + vosiTables (connectInfo=self.config.connectInfo, dbms=dbms, \ dbserver=dbserver, \ userid=userid, \ password=password, \ diff --git a/TAP/vositables.py b/TAP/vositables.py index 58cba34..d414081 100644 --- a/TAP/vositables.py +++ b/TAP/vositables.py @@ -211,6 +211,12 @@ def __init__(self, **kwargs): # # { Connect to DBMS # + if('connectInfo' in kwargs): + self.connectInfo = kwargs['connectInfo'] + else: + self.msg = 'Required connectInfo dict is missing.' + raise Exception (self.msg) + self.tap_schema_file = self.connectInfo['tap_schema_file'] self.tap_schema = self.connectInfo['tap_schema'] self.schemas_table = self.connectInfo['schemas_table'] diff --git a/setup.py b/setup.py index ac52e50..ed0d920 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from setuptools import setup setup(name='nexsciTAP', - version='3.0.0', + version='3.0.1', author='John Good', author_email='jcg@caltech.edu', license='LICENSE',