From 33d70b23e5e8fa964e8f369ddfa20d9db9b412fd Mon Sep 17 00:00:00 2001
From: Bryant Chow <bryant.h.c@gmail.com>
Date: Tue, 4 Jan 2022 16:41:27 -0900
Subject: [PATCH] update setup.py to explicitely name dependencies, including
 two public repositories. should aid in pip installation

---
 requirements.txt |  4 ++--
 setup.cfg        |  2 +-
 setup.py         | 27 +++++++++++++++------------
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index ec2a9f36..2002476b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,6 +4,6 @@ pyasdf==0.7.2
 pandas==1.1.0
 pypdf2==1.26.0
 pyyaml==5.4
-https://github.com/bch0w/pyflex/archive/refs/tags/0.2.0.tar.gz
-# http://github.com/bch0w/pyflex/tarball/return_reject_windows
+basemap==1.3.0
+https://github.com/bch0w/pyflex/tarball/master
 http://github.com/krischer/pyadjoint/tarball/master
diff --git a/setup.cfg b/setup.cfg
index b88034e4..08aedd7e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,2 @@
 [metadata]
-description-file = README.md
+description_file = README.md
diff --git a/setup.py b/setup.py
index bfb31e74..cf2f383b 100644
--- a/setup.py
+++ b/setup.py
@@ -1,16 +1,7 @@
 import os
 from setuptools import setup, find_packages
 
-
-# Get the list of required dependencies from requirements.txt
-path_pyatoa = os.path.dirname(os.path.realpath(__file__))
-req_file = os.path.join(path_pyatoa, "requirements.txt")
-if os.path.exists(req_file):
-    with open(req_file, "r") as f:
-        install_requires = list(f.read().splitlines())
-else:
-    install_requires = []
-
+# Remove the public repos (not hosted) from install requires, put in dependency
 setup(name='pyatoa',
       version='0.1.0',
       description="Python's Adjoint Tomography Operations Assistant",
@@ -19,6 +10,18 @@
       author='Bryant Chow',
       author_email='bhchow@alaska.edu',
       license='GPL-3.0',
+      python_requires=">=3.7",
       packages=find_packages(),
-      install_requires=[],
-      zip_safe=False)
+      install_requires=[
+          "obspy==1.2.2",
+          "matplotlib==3.0.3",
+          "pyasdf==0.7.2",
+          "pandas==1.1.0",
+          "pypdf2==1.26.0",
+          "pyyaml==5.4",
+          "basemap==1.3.0",
+          "pyflex @ git+https://github.com/bch0w/pyflex@0.2.0",
+          "pyadjoint @ git+https://github.com/krischer/pyadjoint"
+          ], 
+      zip_safe=False
+      )