From 2de3bff67617ea99a1a9769764b668a3eab67a8c Mon Sep 17 00:00:00 2001
From: Nico Vermaas <vermaas@astron.nl>
Date: Tue, 2 Aug 2022 13:26:10 +0200
Subject: [PATCH] moved 'scripts' folder outside of app source moved
'connection' module inside 'scripts' folder added requirements.txt fixed
faulty import
---
ldvspec/{connection => }/__init__.py | 0
ldvspec/lofardata/templates/lofardata/index.html | 2 +-
ldvspec/{connection/test.py => scripts/__init__.py} | 0
ldvspec/scripts/connection/__init__.py | 0
ldvspec/{ => scripts}/connection/config.py | 0
ldvspec/{ => scripts}/connection/database.cfg | 0
ldvspec/{ => scripts}/connection/retrieve_db_connection.py | 2 +-
ldvspec/scripts/connection/test.py | 0
.../{lofardata => }/scripts/ldv_specification_interface.py | 0
.../{lofardata => }/scripts/migrate_ldvadmin_to_ldvspec.py | 5 ++++-
ldvspec/scripts/requirements.txt | 2 ++
11 files changed, 8 insertions(+), 3 deletions(-)
rename ldvspec/{connection => }/__init__.py (100%)
rename ldvspec/{connection/test.py => scripts/__init__.py} (100%)
create mode 100644 ldvspec/scripts/connection/__init__.py
rename ldvspec/{ => scripts}/connection/config.py (100%)
rename ldvspec/{ => scripts}/connection/database.cfg (100%)
rename ldvspec/{ => scripts}/connection/retrieve_db_connection.py (98%)
create mode 100644 ldvspec/scripts/connection/test.py
rename ldvspec/{lofardata => }/scripts/ldv_specification_interface.py (100%)
rename ldvspec/{lofardata => }/scripts/migrate_ldvadmin_to_ldvspec.py (98%)
create mode 100644 ldvspec/scripts/requirements.txt
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 2b7e98c7..6b0cc119 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 00000000..e69de29b
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 c7a65417..481e4050 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 00000000..e69de29b
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 e85e7961..eb1fabfc 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 00000000..a2c601d2
--- /dev/null
+++ b/ldvspec/scripts/requirements.txt
@@ -0,0 +1,2 @@
+sshtunnel==0.4.0
+requests==2.28.1
--
GitLab