Merge pull request #55 from JGCRI/install

Address install errors

.travis.yml

@@ -6,6 +6,9 @@ matrix:
       dist: xenial
 cache: pip
 install:
-  - pip install --process-dependency-links .[xanthos,tethys]
+  - pip install git+https://github.com/JGCRI/gcam_reader
+  - pip install git+https://github.com/JGCRI/tethys
+  - pip install git+https://github.com/JGCRI/xanthos
+  - pip install .
 script:
   - python -m unittest

cassandra/test/data/xanthos/trn_abcd_none.ini

@@ -57,6 +57,9 @@ PerformDiagnostics          = 0
 # create time series plots defined in [TimeSeriesPlot]; Default is 0 for False, 1 for True
 CreateTimeSeriesPlot        = 0
 
+# calculate drought statistics; Default is 0 for False, 1 for True
+CalculateDroughtStats       = 0
+
 # calculate accessible water; Default is 0 for False, 1 for True
 CalculateAccessibleWater    = 0
 
@@ -66,9 +69,6 @@ CalculateHydropowerPotential = 0
 # calculate hydropower actual; Default is 0 for False, 1 for True
 CalculateHydropowerActual   = 0
 
-# calculate drought statistics.  0 for False, 1 for True
-CalculateDroughtStats       = 0
-
 # run calibration mode; Default is 0 for False, 1 for True
 Calibrate                   = 0
 

requirements.txt

@@ -1,4 +1,2 @@
 configobj>=5.0.6
-gcam_reader>=0.5.0
 pandas>=0.20
-

setup.py

@@ -10,7 +10,7 @@ def readme():
 
 def get_requirements():
     with open('requirements.txt') as f:
-        return f.read().split()
+        return f.read().split('\n')
 
 
 setup(
@@ -28,14 +28,10 @@ def get_requirements():
     long_description=readme(),
     install_requires=get_requirements(),
     extras_require={
-        'xanthos': ["xanthos>=2.1.0"],
-        'tethys': ["tethys>=1.0.0"],
+        'gcam_reader': ["gcam_reader>=1.0.0"],
+        'xanthos': ["xanthos>=2.3.1"],
+        'tethys': ["tethys>=1.2.0"],
     },
-    dependency_links=[
-        'git+https://github.com/JGCRI/gcam_reader@master#egg=gcam_reader-0.5.0',
-        'git+https://github.com/JGCRI/tethys@master#egg=tethys-1.0.0',
-        'git+https://github.com/JGCRI/xanthos@master#egg=xanthos-2.1.0',
-    ],
     classifiers=[
         "Programming Language :: Python :: 3.6"
         "Programming Language :: Python :: 3.7"