diff --git a/ldvspec/connection/__init__.py b/ldvspec/__init__.py similarity index 100% rename from ldvspec/connection/__init__.py rename to ldvspec/__init__.py diff --git a/ldvspec/lofardata/templates/lofardata/index.html b/ldvspec/lofardata/templates/lofardata/index.html index 2b7e98c72e31a51140ef2a0c2bb3eb5442cdfb2d..6b0cc1195dc4f4c1a86d794af709522ab056601f 100644 --- a/ldvspec/lofardata/templates/lofardata/index.html +++ b/ldvspec/lofardata/templates/lofardata/index.html @@ -16,7 +16,7 @@ </tbody> </table> - <p class="footer"> Version 1.0.0 (2 aug 2022 - 13:00) + <p class="footer"> Version 1.0.0 (2 aug 2022 - 13:30) </div> diff --git a/ldvspec/connection/test.py b/ldvspec/scripts/__init__.py similarity index 100% rename from ldvspec/connection/test.py rename to ldvspec/scripts/__init__.py diff --git a/ldvspec/scripts/connection/__init__.py b/ldvspec/scripts/connection/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/ldvspec/connection/config.py b/ldvspec/scripts/connection/config.py similarity index 100% rename from ldvspec/connection/config.py rename to ldvspec/scripts/connection/config.py diff --git a/ldvspec/connection/database.cfg b/ldvspec/scripts/connection/database.cfg similarity index 100% rename from ldvspec/connection/database.cfg rename to ldvspec/scripts/connection/database.cfg diff --git a/ldvspec/connection/retrieve_db_connection.py b/ldvspec/scripts/connection/retrieve_db_connection.py similarity index 98% rename from ldvspec/connection/retrieve_db_connection.py rename to ldvspec/scripts/connection/retrieve_db_connection.py index c7a65417099482a6a28c9270fd8d94fd11058d51..481e4050e5f6a7b424dc1a10a3f2b462091ca361 100644 --- a/ldvspec/connection/retrieve_db_connection.py +++ b/ldvspec/scripts/connection/retrieve_db_connection.py @@ -1,7 +1,7 @@ import sys import psycopg2 -from ldvspec.connection.config import read_config +from ldvspec.scripts.connection.config import read_config import logging import argparse from sshtunnel import SSHTunnelForwarder diff --git a/ldvspec/scripts/connection/test.py b/ldvspec/scripts/connection/test.py new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/ldvspec/lofardata/scripts/ldv_specification_interface.py b/ldvspec/scripts/ldv_specification_interface.py similarity index 100% rename from ldvspec/lofardata/scripts/ldv_specification_interface.py rename to ldvspec/scripts/ldv_specification_interface.py diff --git a/ldvspec/lofardata/scripts/migrate_ldvadmin_to_ldvspec.py b/ldvspec/scripts/migrate_ldvadmin_to_ldvspec.py similarity index 98% rename from ldvspec/lofardata/scripts/migrate_ldvadmin_to_ldvspec.py rename to ldvspec/scripts/migrate_ldvadmin_to_ldvspec.py index e85e7961adcad6d321d9c0579492986eb80ea675..eb1fabfc28168e8804f24cc2cda8cbfe8ca04d09 100644 --- a/ldvspec/lofardata/scripts/migrate_ldvadmin_to_ldvspec.py +++ b/ldvspec/scripts/migrate_ldvadmin_to_ldvspec.py @@ -21,8 +21,11 @@ import logging import argparse import sys import math + +from ldvspec.scripts.connection import retrieve_db_connection as connector from ldv_specification_interface import LDVSpecInterface -import ldvspec.connection.retrieve_db_connection as connector +#import connection.retrieve_db_connection as connector + logger = logging.getLogger(__file__) handler = logging.StreamHandler(sys.stdout) diff --git a/ldvspec/scripts/requirements.txt b/ldvspec/scripts/requirements.txt new file mode 100644 index 0000000000000000000000000000000000000000..a2c601d28250c9eaa3fd4654c65220016d285c47 --- /dev/null +++ b/ldvspec/scripts/requirements.txt @@ -0,0 +1,2 @@ +sshtunnel==0.4.0 +requests==2.28.1