From 07321a220f08674eb0b421ffbace4792b452357c Mon Sep 17 00:00:00 2001
From: Daniel K Lyons <dlyons@nrao.edu>
Date: Mon, 15 Jun 2020 15:54:15 -0600
Subject: [PATCH] vlba_grabber, weblog_thumbs
---
.../vlba_grabber/{__init__.py => README.md} | 0
apps/cli/executables/vlba_grabber/setup.py | 29 +++++++++++++++++++
.../src/vlba_grabber}/__init__.py | 0
.../vlba_grabber/src/vlba_grabber/_version.py | 2 ++
.../{ => src/vlba_grabber}/ngas_retriever.py | 4 +--
apps/cli/executables/weblog_thumbs/README.md | 0
apps/cli/executables/weblog_thumbs/setup.py | 29 +++++++++++++++++++
.../src/weblog_thumbs/__init__.py | 0
.../src/weblog_thumbs/_version.py | 2 ++
.../weblog_thumbs}/thumbnail_finder.py | 6 ++--
.../{ => src/weblog_thumbs}/weblogUtil.py | 0
environment.yml | 1 +
12 files changed, 68 insertions(+), 5 deletions(-)
rename apps/cli/executables/vlba_grabber/{__init__.py => README.md} (100%)
create mode 100644 apps/cli/executables/vlba_grabber/setup.py
rename apps/cli/executables/{weblog_thumbs => vlba_grabber/src/vlba_grabber}/__init__.py (100%)
create mode 100644 apps/cli/executables/vlba_grabber/src/vlba_grabber/_version.py
rename apps/cli/executables/vlba_grabber/{ => src/vlba_grabber}/ngas_retriever.py (98%)
create mode 100644 apps/cli/executables/weblog_thumbs/README.md
create mode 100644 apps/cli/executables/weblog_thumbs/setup.py
create mode 100644 apps/cli/executables/weblog_thumbs/src/weblog_thumbs/__init__.py
create mode 100644 apps/cli/executables/weblog_thumbs/src/weblog_thumbs/_version.py
rename apps/cli/executables/weblog_thumbs/{ => src/weblog_thumbs}/thumbnail_finder.py (97%)
rename apps/cli/executables/weblog_thumbs/{ => src/weblog_thumbs}/weblogUtil.py (100%)
diff --git a/apps/cli/executables/vlba_grabber/__init__.py b/apps/cli/executables/vlba_grabber/README.md
similarity index 100%
rename from apps/cli/executables/vlba_grabber/__init__.py
rename to apps/cli/executables/vlba_grabber/README.md
diff --git a/apps/cli/executables/vlba_grabber/setup.py b/apps/cli/executables/vlba_grabber/setup.py
new file mode 100644
index 000000000..287ab6478
--- /dev/null
+++ b/apps/cli/executables/vlba_grabber/setup.py
@@ -0,0 +1,29 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+from pathlib import Path
+from setuptools import setup, find_packages
+
+VERSION = open('src/vlba_grabber/_version.py').readlines()[-1].split()[-1].strip("\"'")
+README = Path('README.md').read_text()
+
+setup(
+ name=Path().absolute().name,
+ version=VERSION,
+ description='NRAO Archive VLBA Grabber',
+ long_description=README,
+ author='NRAO SSA Team',
+ author_email='dms-ssa@nrao.edu',
+ url='TBD',
+ license="GPL",
+ install_requires=['requests', 'pymygdala', 'pycapo', 'beautifulsoup4'],
+ keywords=[],
+ packages=['vlba_grabber'],
+ package_dir={'':'src'},
+ classifiers=[
+ 'Programming Language :: Python :: 3.8'
+ ],
+ entry_points={
+ 'console_scripts': ['aocRetriever = vlba_grabber.ngas_retriever:ngas_retriever']
+ },
+)
diff --git a/apps/cli/executables/weblog_thumbs/__init__.py b/apps/cli/executables/vlba_grabber/src/vlba_grabber/__init__.py
similarity index 100%
rename from apps/cli/executables/weblog_thumbs/__init__.py
rename to apps/cli/executables/vlba_grabber/src/vlba_grabber/__init__.py
diff --git a/apps/cli/executables/vlba_grabber/src/vlba_grabber/_version.py b/apps/cli/executables/vlba_grabber/src/vlba_grabber/_version.py
new file mode 100644
index 000000000..e63ec3a14
--- /dev/null
+++ b/apps/cli/executables/vlba_grabber/src/vlba_grabber/_version.py
@@ -0,0 +1,2 @@
+""" Version information for this package, don't put anything else here. """
+___version___ = '4.0a1.dev1'
diff --git a/apps/cli/executables/vlba_grabber/ngas_retriever.py b/apps/cli/executables/vlba_grabber/src/vlba_grabber/ngas_retriever.py
similarity index 98%
rename from apps/cli/executables/vlba_grabber/ngas_retriever.py
rename to apps/cli/executables/vlba_grabber/src/vlba_grabber/ngas_retriever.py
index 8f15c23f1..db9040c44 100644
--- a/apps/cli/executables/vlba_grabber/ngas_retriever.py
+++ b/apps/cli/executables/vlba_grabber/src/vlba_grabber/ngas_retriever.py
@@ -12,8 +12,8 @@ import argparse as ap
import logging
import logging.handlers
-from pyat import version
-from pyat.pymygdala import LogHandler
+from _version import ___version___ as version
+from pymygdala import LogHandler
from pycapo import CapoConfig
from bs4 import BeautifulSoup
diff --git a/apps/cli/executables/weblog_thumbs/README.md b/apps/cli/executables/weblog_thumbs/README.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/apps/cli/executables/weblog_thumbs/setup.py b/apps/cli/executables/weblog_thumbs/setup.py
new file mode 100644
index 000000000..d2a34103e
--- /dev/null
+++ b/apps/cli/executables/weblog_thumbs/setup.py
@@ -0,0 +1,29 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+from pathlib import Path
+from setuptools import setup, find_packages
+
+VERSION = open('src/weblog_thumbs/_version.py').readlines()[-1].split()[-1].strip("\"'")
+README = Path('README.md').read_text()
+
+setup(
+ name=Path().absolute().name,
+ version=VERSION,
+ description='NRAO Archive Weblog Thumbs',
+ long_description=README,
+ author='NRAO SSA Team',
+ author_email='dms-ssa@nrao.edu',
+ url='TBD',
+ license="GPL",
+ install_requires=['pymygdala'],
+ keywords=[],
+ packages=['weblog_thumbs'],
+ package_dir={'':'src'},
+ classifiers=[
+ 'Programming Language :: Python :: 3.8'
+ ],
+ entry_points={
+ 'console_scripts': ['findThumbnail = weblog_thumbs.thumbnail_finder:weblog_raid']
+ },
+)
diff --git a/apps/cli/executables/weblog_thumbs/src/weblog_thumbs/__init__.py b/apps/cli/executables/weblog_thumbs/src/weblog_thumbs/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/apps/cli/executables/weblog_thumbs/src/weblog_thumbs/_version.py b/apps/cli/executables/weblog_thumbs/src/weblog_thumbs/_version.py
new file mode 100644
index 000000000..e63ec3a14
--- /dev/null
+++ b/apps/cli/executables/weblog_thumbs/src/weblog_thumbs/_version.py
@@ -0,0 +1,2 @@
+""" Version information for this package, don't put anything else here. """
+___version___ = '4.0a1.dev1'
diff --git a/apps/cli/executables/weblog_thumbs/thumbnail_finder.py b/apps/cli/executables/weblog_thumbs/src/weblog_thumbs/thumbnail_finder.py
similarity index 97%
rename from apps/cli/executables/weblog_thumbs/thumbnail_finder.py
rename to apps/cli/executables/weblog_thumbs/src/weblog_thumbs/thumbnail_finder.py
index 94e7e7574..a89848b0c 100644
--- a/apps/cli/executables/weblog_thumbs/thumbnail_finder.py
+++ b/apps/cli/executables/weblog_thumbs/src/weblog_thumbs/thumbnail_finder.py
@@ -3,9 +3,9 @@ import sys
import logging
import logging.handlers
import argparse as ap
-from pyat import version
-from pyat.pymygdala import LogHandler
-from pyat.weblog_thumbs.weblogUtil import Weblog
+from ._version import ___version___ as version
+from pymygdala import LogHandler
+from .weblogUtil import Weblog
# Global logger access:
logger = logging.getLogger("thumbnail_cheater")
diff --git a/apps/cli/executables/weblog_thumbs/weblogUtil.py b/apps/cli/executables/weblog_thumbs/src/weblog_thumbs/weblogUtil.py
similarity index 100%
rename from apps/cli/executables/weblog_thumbs/weblogUtil.py
rename to apps/cli/executables/weblog_thumbs/src/weblog_thumbs/weblogUtil.py
diff --git a/environment.yml b/environment.yml
index 861bc1776..4dfeddc72 100644
--- a/environment.yml
+++ b/environment.yml
@@ -25,3 +25,4 @@ dependencies:
- blessings=1.7
- pytest=5.4
- simplejson=3.17
+ - beautifulsoup4=4.9
\ No newline at end of file
--
GitLab