Merge pull request #8 from pysat/develop

v0.1.0

.travis.yml

@@ -3,6 +3,7 @@ dist: xenial
 matrix:
   include:
     - python: 2.7
+    - python: 3.5
     - python: 3.6
     - python: 3.7
 

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
+```

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.

setup.py

@@ -4,27 +4,21 @@
 # Full license can be found in License.md
 # -----------------------------------------------------------------------------
 
-import sys
 import os
-from codecs import open
+import codecs
 from setuptools import setup, find_packages
 
 
 here = os.path.abspath(os.path.dirname(__file__))
-with open(os.path.join(here, 'description.txt'), encoding='utf-8') as f:
+with codecs.open(os.path.join(here, 'description.txt'), encoding='utf-8') as f:
     long_description = f.read()
 version_filename = os.path.join('pysatSeasons', 'version.txt')
-with open(os.path.join(here, version_filename)) as version_file:
+with codecs.open(os.path.join(here, version_filename)) as version_file:
     version = version_file.read().strip()
 
 # 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', 'numpy', 'pandas', 'matplotlib']
 
 
 # Run setup