Merge pull request #7 from pysat/develop

v0.1.1

.travis.yml

@@ -17,6 +17,9 @@ before_install:
   - pip install pytest-cov
   - pip install coveralls
   - pip install future
+  # Install version specific packages for 2.7 and 3.5
+  - pip install 'pandas<0.25'
+  - pip install xarray
   - pip install matplotlib
   - pip install apexpy
 
@@ -27,11 +30,10 @@ before_install:
   - git clone https://github.com/pysat/pysat.git >/dev/null
   - echo 'installing pysat'
   - cd ./pysat
-  - git checkout no_sgp4
+  - git checkout develop
   # set up data directory
-  - mkdir /home/travis/build/pysat/pysatData
+  - mkdir /home/travis/build/pysatData
   # install pysat
-  - cd /home/travis/build/pysat/pysat
   - python setup.py install >/dev/null
 
   # install pyglow, space science models
@@ -42,7 +44,7 @@ before_install:
   - cd ./pyglow
   - make -C src/pyglow/models source >/dev/null
   - python setup.py install >/dev/null
-  - cd /home/travis/build/pysat/pysatMissionPlanning
+  - cd ../pysatMissionPlanning
 
 install:
   - python setup.py install

CHANGELOG.md

@@ -2,5 +2,9 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [0.1.0] - 2019-xx-xx
+## [0.1.1] - 2019-10-22
+- pypi compatibility
+- Add DOI badge
+
+## [0.1.0] - 2019-10-07
 - Initial release

MANIFEST.in

@@ -0,0 +1,13 @@
+include *.py
+include *.f
+include *.c
+recursive-include pysatMissionPlanning *.py
+include *.md
+include description.txt
+include LICENSE
+include pysatMissionPlanning/version.txt
+prune pysatMissionPlanning/tests
+prune docs
+prune demo
+exclude *.pdf
+exclude *.png

README.md

@@ -6,6 +6,7 @@
 # pysatMissionPlanning
 [![Build Status](https://travis-ci.org/pysat/pysatMissionPlanning.svg?branch=master)](https://travis-ci.org/pysat/pysatMissionPlanning)
 [![Coverage Status](https://coveralls.io/repos/github/pysat/pysatMissionPlanning/badge.svg?branch=master)](https://coveralls.io/github/pysat/pysatMissionPlanning?branch=master)
+[![DOI](https://zenodo.org/badge/209358908.svg)](https://zenodo.org/badge/latestdoi/209358908)
 
 pysatMissionPlanning allows users to run build simulated satellites for TLE info and add empirical data.  It includes the pysat_sgp4 instrument module which can be imported into pysat.
 
@@ -17,7 +18,7 @@ Main Features
 
 Documentation
 ---------------------
-`Full Documentation for main package <http://pysat.readthedocs.io/en/latest/>`_
+[Full Documentation for main package](http://pysat.readthedocs.io/en/latest/)
 
 
 # Installation

pysatMissionPlanning/__init__.py

@@ -1,6 +1,12 @@
 from __future__ import print_function
 from __future__ import absolute_import
 
-from . import instruments
+import os
+from pysatMissionPlanning import instruments
 
 __all__ = ['instruments']
+
+# set version
+here = os.path.abspath(os.path.dirname(__file__))
+with open(os.path.join(here, 'version.txt')) as version_file:
+    __version__ = version_file.read().strip()

pysatMissionPlanning/version.txt

@@ -1 +1 @@
-0.1.0
+0.1.1

setup.py

@@ -19,28 +19,30 @@
 # change setup.py for readthedocs - commented for now
 # on_rtd = os.environ.get('READTHEpysatMissionPlanningDOCS') == 'True'
 
-install_requires = ['pysat', 'numpy', 'pandas', 'matplotlib', 'sgp4',
-                    'pyEphem', 'apexpy', 'aacgmv2', 'pysatMagVect', 'pyglow']
+install_requires = ['pysat', 'sgp4', 'pyEphem', 'matplotlib',
+                    'apexpy', 'aacgmv2', 'pysatMagVect', 'pyglow']
 
 
 # Run setup
 
 setup(name='pysatMissionPlanning',
       version=version,
-      url='github.com/pysat/pysatMissionPlanning',
+      url='https://github.com/pysat/pysatMissionPlanning',
       author='Russell Stoneback, Jeff Klenzing',
       author_email='rstoneba@utdallas.edu',
       description='Mission Planning toolkit for pysat',
       long_description=long_description,
+      long_description_content_type='text/markdown',
       packages=find_packages(),
       classifiers=[
           "Development Status :: 4 - Beta",
+          "Topic :: Scientific/Engineering :: Astronomy",
           "Topic :: Scientific/Engineering :: Physics",
+          "Topic :: Scientific/Engineering :: Atmospheric Science",
           "Intended Audience :: Science/Research",
-          "License :: BSD",
+          "License :: OSI Approved :: BSD License",
           "Natural Language :: English",
           "Programming Language :: Python :: 2.7",
-          "Programming Language :: Python :: 3.4",
           "Programming Language :: Python :: 3.5",
           "Programming Language :: Python :: 3.6",
           "Programming Language :: Python :: 3.7",