From c78a6181f5fb079902934b5cb972b531bccde6c3 Mon Sep 17 00:00:00 2001
From: nhertz <nhertz@nrao.edu>
Date: Wed, 9 Sep 2020 14:41:56 -0600
Subject: [PATCH] Actual last edits to setup.py files concerning package naming
changes; all necessary fields have been updated to reflect naming changes
---
apps/cli/executables/alma_reingester/setup.py | 2 +-
apps/cli/executables/ingestion/setup.py | 8 ++++----
apps/cli/executables/null/setup.py | 3 ---
apps/cli/executables/vlba_grabber/setup.py | 2 +-
apps/cli/executables/weblog_thumbs/setup.py | 2 +-
apps/cli/launchers/wf/setup.py | 2 +-
apps/cli/utilities/datafinder/setup.py | 2 +-
apps/cli/utilities/mr_books/setup.py | 2 +-
apps/cli/utilities/mr_clean/setup.py | 2 +-
apps/cli/utilities/proprietary_setter/setup.py | 2 +-
apps/cli/utilities/qa_results/setup.py | 2 +-
apps/cli/utilities/s_code_project_updater/setup.py | 2 +-
services/archive/setup.py | 2 +-
services/workflow/setup.py | 4 ++--
14 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/apps/cli/executables/alma_reingester/setup.py b/apps/cli/executables/alma_reingester/setup.py
index 01d37ee29..283276bc1 100644
--- a/apps/cli/executables/alma_reingester/setup.py
+++ b/apps/cli/executables/alma_reingester/setup.py
@@ -16,7 +16,7 @@ setup(
author_email='dms-ssa@nrao.edu',
url='TBD',
license="GPL",
- install_requires=['cx_Oracle', 'pycapo', 'psycopg2', 'events', 'schema'],
+ install_requires=['cx_Oracle', 'pycapo', 'psycopg2', 'ssa-events', 'ssa-schema'],
keywords=[],
packages=['alma_reingester'],
package_dir={'':'src'},
diff --git a/apps/cli/executables/ingestion/setup.py b/apps/cli/executables/ingestion/setup.py
index 2a90e81eb..6979853a2 100644
--- a/apps/cli/executables/ingestion/setup.py
+++ b/apps/cli/executables/ingestion/setup.py
@@ -22,11 +22,11 @@ setup(
'numpy',
'psycopg2',
'pycapo',
- 'pymygdala',
'requests',
- 'schema',
- 'sqlalchemy',
- 'weblog_thumbs'],
+ 'ssa-pymygdala',
+ 'ssa-schema',
+ 'ssa-weblog_thumbs',
+ 'sqlalchemy'],
keywords=[],
packages=['ingestion'],
package_dir={'':'src'},
diff --git a/apps/cli/executables/null/setup.py b/apps/cli/executables/null/setup.py
index c7d329407..3399db9f1 100644
--- a/apps/cli/executables/null/setup.py
+++ b/apps/cli/executables/null/setup.py
@@ -7,9 +7,6 @@ from setuptools import setup
VERSION = open('src/null/_version.py').readlines()[-1].split()[-1].strip("\"'")
README = Path('README.md').read_text()
-# requires = [
-# ]
-
tests_require = [
'pytest>=5.4,<6.0'
]
diff --git a/apps/cli/executables/vlba_grabber/setup.py b/apps/cli/executables/vlba_grabber/setup.py
index f6b5f801e..5ec7c3aea 100644
--- a/apps/cli/executables/vlba_grabber/setup.py
+++ b/apps/cli/executables/vlba_grabber/setup.py
@@ -16,7 +16,7 @@ setup(
author_email='dms-ssa@nrao.edu',
url='TBD',
license="GPL",
- install_requires=['requests', 'pymygdala', 'pycapo', 'beautifulsoup4'],
+ install_requires=['requests', 'ssa-pymygdala', 'pycapo', 'beautifulsoup4'],
keywords=[],
packages=['vlba_grabber'],
package_dir={'':'src'},
diff --git a/apps/cli/executables/weblog_thumbs/setup.py b/apps/cli/executables/weblog_thumbs/setup.py
index 1c2d896c1..2f83979e0 100644
--- a/apps/cli/executables/weblog_thumbs/setup.py
+++ b/apps/cli/executables/weblog_thumbs/setup.py
@@ -16,7 +16,7 @@ setup(
author_email='dms-ssa@nrao.edu',
url='TBD',
license="GPL",
- install_requires=['pymygdala'],
+ install_requires=['ssa-pymygdala'],
keywords=[],
packages=['weblog_thumbs'],
package_dir={'':'src'},
diff --git a/apps/cli/launchers/wf/setup.py b/apps/cli/launchers/wf/setup.py
index df4b7819d..792132cba 100644
--- a/apps/cli/launchers/wf/setup.py
+++ b/apps/cli/launchers/wf/setup.py
@@ -16,7 +16,7 @@ setup(
author_email='dms-ssa@nrao.edu',
url='TBD',
license="GPL",
- install_requires=['pika', 'psycopg2', 'cx_Oracle', 'pymygdala', 'pycapo', 'schema'],
+ install_requires=['pika', 'psycopg2', 'cx_Oracle', 'ssa-pymygdala', 'pycapo', 'ssa-schema'],
keywords=[],
packages=['wf'],
package_dir={'':'src'},
diff --git a/apps/cli/utilities/datafinder/setup.py b/apps/cli/utilities/datafinder/setup.py
index 0c527a77e..0f7072833 100644
--- a/apps/cli/utilities/datafinder/setup.py
+++ b/apps/cli/utilities/datafinder/setup.py
@@ -16,7 +16,7 @@ setup(
author_email='dms-ssa@nrao.edu',
url='TBD',
license="GPL",
- install_requires=['pandas', 'requests', 'schema', 'sqlalchemy', 'tqdm'],
+ install_requires=['pandas', 'requests', 'ssa-schema', 'sqlalchemy', 'tqdm'],
keywords=[],
packages=['datafinder'],
package_dir={'':'src'},
diff --git a/apps/cli/utilities/mr_books/setup.py b/apps/cli/utilities/mr_books/setup.py
index ab8b97f85..6fc448a3a 100644
--- a/apps/cli/utilities/mr_books/setup.py
+++ b/apps/cli/utilities/mr_books/setup.py
@@ -16,7 +16,7 @@ setup(
author_email='dms-ssa@nrao.edu',
url='TBD',
license="GPL",
- install_requires=['pendulum', 'pid', 'pycapo', 'pymygdala', 'schema', 'sqlalchemy'],
+ install_requires=['pendulum', 'pid', 'pycapo', 'ssa-pymygdala', 'ssa-schema', 'sqlalchemy'],
keywords=[],
packages=['mr_books'],
package_dir={'':'src'},
diff --git a/apps/cli/utilities/mr_clean/setup.py b/apps/cli/utilities/mr_clean/setup.py
index 65945b492..80b09c427 100644
--- a/apps/cli/utilities/mr_clean/setup.py
+++ b/apps/cli/utilities/mr_clean/setup.py
@@ -16,7 +16,7 @@ setup(
author_email='dms-ssa@nrao.edu',
url='TBD',
license="GPL",
- install_requires=['pendulum', 'pycapo', 'pymygdala'],
+ install_requires=['pendulum', 'pycapo', 'ssa-pymygdala'],
keywords=[],
packages=['mr_clean'],
package_dir={'':'src'},
diff --git a/apps/cli/utilities/proprietary_setter/setup.py b/apps/cli/utilities/proprietary_setter/setup.py
index 66397d214..df171e73c 100644
--- a/apps/cli/utilities/proprietary_setter/setup.py
+++ b/apps/cli/utilities/proprietary_setter/setup.py
@@ -16,7 +16,7 @@ setup(
author_email='dms-ssa@nrao.edu',
url='TBD',
license="GPL",
- install_requires=['pymygdala', 'schema', 'support'],
+ install_requires=['ssa-pymygdala', 'ssa-schema', 'ssa-support'],
keywords=[],
packages=['proprietary_setter'],
package_dir={'':'src'},
diff --git a/apps/cli/utilities/qa_results/setup.py b/apps/cli/utilities/qa_results/setup.py
index 1750c6d10..d6b41136c 100644
--- a/apps/cli/utilities/qa_results/setup.py
+++ b/apps/cli/utilities/qa_results/setup.py
@@ -16,7 +16,7 @@ setup(
author_email='dms-ssa@nrao.edu',
url='TBD',
license="GPL",
- install_requires=['pycapo', 'pymygdala'],
+ install_requires=['pycapo', 'ssa-pymygdala'],
keywords=[],
packages=['qa_results'],
package_dir={'':'src'},
diff --git a/apps/cli/utilities/s_code_project_updater/setup.py b/apps/cli/utilities/s_code_project_updater/setup.py
index 9aa45572a..0b4ce307e 100644
--- a/apps/cli/utilities/s_code_project_updater/setup.py
+++ b/apps/cli/utilities/s_code_project_updater/setup.py
@@ -16,7 +16,7 @@ setup(
author_email='dms-ssa@nrao.edu',
url='TBD',
license="GPL",
- install_requires=['pycapo', 'pymygdala', 'schema', 'sqlalchemy'],
+ install_requires=['pycapo', 'ssa-pymygdala', 'ssa-schema', 'sqlalchemy'],
tests_require=['pytest-mock'],
requires=['sqlalchemy', 'mysqldb'],
keywords=[],
diff --git a/services/archive/setup.py b/services/archive/setup.py
index f4bdad5d4..c11f2d354 100644
--- a/services/archive/setup.py
+++ b/services/archive/setup.py
@@ -43,7 +43,7 @@ requires = [
'pyramid_debugtoolbar',
'pyramid_tm',
'requests',
- 'schema',
+ 'ssa-schema',
'sqlalchemy',
'waitress',
'zope.sqlalchemy'
diff --git a/services/workflow/setup.py b/services/workflow/setup.py
index 71f6c4bb0..2d6903af4 100644
--- a/services/workflow/setup.py
+++ b/services/workflow/setup.py
@@ -43,10 +43,10 @@ requires = [
'pyramid_debugtoolbar',
'pyramid_tm',
'requests',
- 'schema',
+ 'ssa-schema',
'sqlalchemy',
'waitress',
- 'workspaces',
+ 'ssa-workspaces',
'zope.sqlalchemy'
]
--
GitLab