From fb75c96af34e707a24e2003e10a139a23ca394bd Mon Sep 17 00:00:00 2001
From: Nico Vermaas <vermaas@astron.nl>
Date: Mon, 8 Aug 2022 13:22:56 +0200
Subject: [PATCH] add ldv_migrate script
---
ldv_migrate/bin_xxx/ldv_migrate | 4 ----
.../ldv_migrate/connection/retrieve_db_connection.py | 6 +-----
.../ldv_migrate/migrate_ldvadmin_to_ldvspec.py | 12 ++----------
3 files changed, 3 insertions(+), 19 deletions(-)
delete mode 100644 ldv_migrate/bin_xxx/ldv_migrate
diff --git a/ldv_migrate/bin_xxx/ldv_migrate b/ldv_migrate/bin_xxx/ldv_migrate
deleted file mode 100644
index 329efa4..0000000
--- a/ldv_migrate/bin_xxx/ldv_migrate
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env python3
-
-import ldv_migrate
-migrate_ldvadmin_to_ldvspec.main()
\ No newline at end of file
diff --git a/ldv_migrate/ldv_migrate/connection/retrieve_db_connection.py b/ldv_migrate/ldv_migrate/connection/retrieve_db_connection.py
index 5fbb505..21f5684 100644
--- a/ldv_migrate/ldv_migrate/connection/retrieve_db_connection.py
+++ b/ldv_migrate/ldv_migrate/connection/retrieve_db_connection.py
@@ -1,16 +1,12 @@
import sys
import psycopg2
-try:
- from connection.config import read_config
-except:
- from ldv_migrate.connection.config import read_config
-
import logging
import argparse
from sshtunnel import SSHTunnelForwarder
import os
+from ldv_migrate.connection.config import read_config
def connect_postgresql(section):
""" Connect to the PostgreSQL database server """
diff --git a/ldv_migrate/ldv_migrate/migrate_ldvadmin_to_ldvspec.py b/ldv_migrate/ldv_migrate/migrate_ldvadmin_to_ldvspec.py
index 6d9f2f0..e6bee1b 100644
--- a/ldv_migrate/ldv_migrate/migrate_ldvadmin_to_ldvspec.py
+++ b/ldv_migrate/ldv_migrate/migrate_ldvadmin_to_ldvspec.py
@@ -22,17 +22,9 @@ import argparse
import sys
import math
-try:
- # local imports
- import connection.retrieve_db_connection as connector
- from ldv_specification_interface import LDVSpecInterface
-
-except:
- # installation imports
- import ldv_migrate.connection.retrieve_db_connection as connector
- from ldv_migrate.ldv_specification_interface import LDVSpecInterface
-
+import ldv_migrate.connection.retrieve_db_connection as connector
+from ldv_migrate.ldv_specification_interface import LDVSpecInterface
logger = logging.getLogger(__file__)
handler = logging.StreamHandler(sys.stdout)
--
GitLab