Merge ce0918b into 042e06e

pysat · Sep 22, 2019 · 69bbed8 · 69bbed8
2 parents 042e06e + ce0918b
commit 69bbed8
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -13,10 +13,24 @@ pysatSeasons allows users to run basic seasonal analysis over N-dimensional data
 
 Main Features
 -------------
-- Instrument independent analysis routines.
+- Seasonal averaging routine for 1D and 2D data.
+- Occurrence probability routines, daily or by orbit.
+- Scatterplot of data_label(s) as functions of labelx,y
+    over a season.
 
-Documentation
----------------------
-`Full Documentation <http://pysat.readthedocs.io/en/latest/>`_
 
-`JGR-Space Physics Publication <https://doi.org/10.1029/2018JA025297>`_
+# Installation
+
+First, checkout the repository:
+
+```
+  git clone https://github.com/pysat/pysatSeasons.git
+```
+
+Change directories into the repository folder and run the setup.py file.  For
+a local install use the "--user" flag after "install".
+
+```
+  cd pysatSeasons/
+  python setup.py install
+```
diff --git a/description.txt b/description.txt
@@ -2,10 +2,7 @@ pysatSeasons allows users to run basic seasonal analysis over N-dimensional data
 
 Main Features
 -------------
-- Instrument independent analysis routines.
-
-Documentation
----------------------
-`Full Documentation <http://pysat.readthedocs.io/en/latest/>`_
-
-`JGR-Space Physics Publication <https://doi.org/10.1029/2018JA025297>`_
+- Seasonal averaging routine for 1D and 2D data.
+- Occurrence probability routines, daily or by orbit.
+- Scatterplot of data_label(s) as functions of labelx,y
+    over a season.
diff --git a/setup.py b/setup.py
@@ -4,7 +4,6 @@
 # Full license can be found in License.md
 # -----------------------------------------------------------------------------
 
-import sys
 import os
 from codecs import open
 from setuptools import setup, find_packages
@@ -19,12 +18,7 @@
 
 # change setup.py for readthedocs - commented for now
 # on_rtd = os.environ.get('READTHEDOCS') == 'True'
-if sys.version_info.major == 2:
-    install_requires = ['xarray<0.12', 'pandas>=0.23, <0.25',
-                        'numpy>=1.12, <1.17', 'scipy<1.3', 'pysat']
-else:
-    install_requires = ['xarray', 'pandas>=0.23, <0.25', 'numpy>=1.12',
-                        'pysat']
+install_requires = ['pysat', 'matplotlib']
 
 
 # Run setup