Merge pull request #36 from pysat/v0.0.2_hotfix

rc V0.0.3

.travis.yml

@@ -41,13 +41,10 @@ install:
   # Create conda test environment
   - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION
   - conda activate test-environment
-  # Once pysat 3.0 is released, remove the custom pysat install and change
-  # this to:
-  # - while read requirement; do conda install --yes $requirement; done < requirements.txt
-  - conda install --yes numpy scipy pandas xarray requests netCDF4
+  - while read requirement; do conda install --yes $requirement; done < requirements.txt
   # Get latest coveralls from pip, not conda
   - pip install -r test_requirements.txt
-  # Custom pysat install
+  # Custom pysat install, remove after 3.0.0 conda release
   - cd ..
   - git clone --single-branch --branch develop-3 https://github.com/pysat/pysat.git
   - cd pysat

.zenodo.json

@@ -22,6 +22,6 @@
       {
         "name": "Carey Spence",
         "orcid": "0000-0001-8340-5625"
-      }, 
-    ],
+      }
+    ]
 }

CHANGELOG.md

@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.0.3] - 2021-01-15
+- Fixes bugs in configuration and zenodo files
+- Added pysat version restriction to requirements.txt
+
 ## [0.0.2] - 2021-01-11
 - Added real-time ACE instrument
 - Fixed bugs and restructured code to comply with changes in pysat-3.0

README.md

@@ -1,6 +1,6 @@
 <div align="left">
         <img height="0" width="0px">
-        <img width="20%" src="https://raw.githubusercontent.com/pysat/pysatSpaceWeather/main/docs/figures/pysatSpaceWeather.png" alt="pysatSpaceWeather" title="pysatSpaceWeather"</img>
+        <img width="20%" src="https://raw.githubusercontent.com/pysat/pysatSpaceWeather/main/docs/figures/pysatSpaceWeather.png" alt="pysatSpaceWeather" title="pysatSpaceWeather" </img>
 </div>
 
 # pysatSpaceWeather: pysat support for Space Weather Indices
@@ -31,7 +31,7 @@ Python 3.6+.
 | requests       |                   |
 | xarray         |                   |
 
-## GitHub Installatioon
+## GitHub Installation
 
 Currently, the main way to get pysatSpaceWeather is through github.
 
@@ -70,17 +70,14 @@ instrument.
 ```
 import pysat
 import pysatSpaceWeather
-from pysatSpaceWeather.instruments import sw_dst
-
-dst = pysat.Instrument(inst_module=sw_dst)
+dst = pysat.Instrument(inst_module=pysatSpaceWeather.instruments.sw_dist)
 ```
 
 Another way to use the instruments in an external repository is to register the
 instruments.  This only needs to be done the first time you load an instrument.
 Afterward, pysat will identify them using the `platform` and `name` keywords.
 
 ```
-
 pysat.utils.registry.register('pysatSpaceWeather.instruments.sw_dst')
 dst = pysat.Instrument('sw', 'dst')
 ```

docs/conf.py

@@ -63,9 +63,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'0.0.2'
+version = u'0.0.3'
 # The full version, including alpha/beta/rc tags.
-release = u'0.0.2-alpha'
+release = u'0.0.3-alpha'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

pysatSpaceWeather/version.txt

@@ -1 +1 @@
-0.0.2
+0.0.3

requirements.txt

@@ -1,6 +1,6 @@
 netCDF4
 numpy
 pandas
-pysat
+pysat >= 3.0.0
 requests
 xarray

setup.cfg

@@ -2,41 +2,46 @@
 name = pysatSpaceWeather
 version = file: pysatSpaceWeather/version.txt
 url = https://github.com/pysat/pysatSpaceWeather
-author = Jeff Klenzing
-author_email = [email protected]
+author = Angeline Burrell
+author_email = [email protected]
 description = 'pysat support for Space Weather Indices'
 keywords =
-  pysat
-  ionosphere
+    pysat
+    ionosphere
+    space weather
+    forecasting
+    indexes
 classifiers =
-  Development Status :: 3 - Alpha
-  Topic :: Scientific/Engineering :: Physics
-  Topic :: Scientific/Engineering :: Atmospheric Science
-  Intended Audience :: Science/Research
-  License :: OSI Approved :: BSD License
-  Natural Language :: English
-  Programming Language :: Python :: 3.5
-  Programming Language :: Python :: 3.6
-  Programming Language :: Python :: 3.7
-  Operating System :: MacOS :: MacOS X
-  Operating System :: POSIX :: Linux
+    Development Status :: 3 - Alpha
+    Topic :: Scientific/Engineering :: Physics
+    Topic :: Scientific/Engineering :: Atmospheric Science
+    Intended Audience :: Science/Research
+    License :: OSI Approved :: BSD License
+    Natural Language :: English
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
+    Operating System :: MacOS :: MacOS X
+    Operating System :: POSIX :: Linux
 license_file = LICENSE
 long_description = file: README.md
 long_description_content_type = text/markdown
 
-  [options]
-  python_requires = >= 3.5
-  setup_requires =
-    setuptools >= 38.6
-    pip >= 10
-  include_package_data = True
-  zip_safe = False
-  packages = find:
-  install_requires = file: requirements.txt
+[options]
+python_requires = >= 3.5
+setup_requires = setuptools >= 38.6; pip >= 10
+include_package_data = True
+zip_safe = False
+packages = find:
+install_requires = netCDF4
+		   numpy
+		   pandas
+		   pysat
+		   requests
+		   xarray
 
 [coverage:report]
-omit =
-  */instruments/templates/
+omit = */instruments/templates/
 
 [flake8]
 max-line-length = 80