Skip to content

Commit

Permalink
Merge pull request #25 from pysat/main
Browse files Browse the repository at this point in the history
Update develop with all RC0.1.3 changes
  • Loading branch information
jklenzing committed Jun 15, 2021
2 parents 6d06c67 + b6f8b51 commit fa836a9
Show file tree
Hide file tree
Showing 10 changed files with 96 additions and 27 deletions.
37 changes: 37 additions & 0 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions

name: Documentation Check

on: [push, pull_request]

jobs:
build:

runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
python-version: [3.7]

name: Documentation tests
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r test_requirements.txt
pip install -r requirements.txt
- name: Set up pysat
run: |
mkdir pysatData
python -c "import pysat; pysat.params['data_dirs'] = './pysatData'"
- name: Load .zenodo.json to check for errors
run: python -c "import json; json.loads(open('.zenodo.json').read())"
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ on: [push, pull_request]

jobs:
build:

runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
python-version: [3.7]
os: [ubuntu-latest, macos-latest]

name: Python ${{ matrix.python-version }}
name: Python ${{ matrix.python-version }} on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
Expand All @@ -31,7 +31,7 @@ jobs:
- name: Set up pysat
run: |
mkdir pysatData
python -c "import pysat; pysat.params['data_dirs'] = './pysatData'"
python -c "import pysat; pysat.params['data_dirs'] = 'pysatData'"
- name: Test PEP8 compliance
run: flake8 . --count --select=E,F,W --show-source --statistics
Expand Down
23 changes: 23 additions & 0 deletions .zenodo.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"creators": [
{
"affiliation": "Goddard Space Flight Center",
"name": "Klenzing, Jeffrey",
"orcid": "0000-0001-8321-6074"
},
{
"affiliation": "The University of Texas at Dallas",
"name": "Stoneback, Russell",
"orcid": "0000-0001-7216-4336"
},
{
"name": "Spence, Carey",
"orcid": "0000-0001-8340-5625"
},
{
"affiliation": "U.S. Naval Research Laboratory",
"name": "Burrell, Angeline G.",
"orcid": "0000-0001-8875-9326"
}
]
}
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +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.3] - 2021-05-07
## [0.1.3] - 2021-06-18
- Updates style to match pysat 3.0.0 release candidate
- Improves discussion of rationale for version caps on readme page
- Migrates CI tests to github actions

## [0.1.2] - 2020-07-29
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div align="left">
<img height="0" width="0px">
<img width="20%" src="/poweredbypysat.png" alt="pysat" title="pysat"</img>
<img width="20%" src="https://raw.githubusercontent.com/pysat/pysatSeasons/main/poweredbypysat.png" alt="pysat" title="pysat"</img>
</div>

# pysatSeasons
Expand Down Expand Up @@ -32,7 +32,7 @@ and for the Space Physics community. This module officially supports
Python 3.7. Note that the current release is based on archived routines from
pysat 2.0. This currently requires the deprecated `Panel` from pandas.
The caps on numpy and python stem from compatibility with the maximum
supported pandas version. Future versions will update the code to remove
supported pandas version. Version 0.2.0 will rewrite the routines to remove
`Panel`.

| Common modules | Community modules |
Expand Down
3 changes: 2 additions & 1 deletion description.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
pysatSeasons allows users to run basic seasonal analysis over N-dimensional datasets managed through the pysat code.
pysatSeasons allows users to run basic seasonal analysis over N-dimensional
datasets managed through the pysat code.

Main Features
-------------
Expand Down
2 changes: 1 addition & 1 deletion pysatSeasons/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.2
0.1.3
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pysat
matplotlib
numpy<1.20
pandas<0.25
matplotlib
pysat>=3.0
31 changes: 19 additions & 12 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
[metadata]
name = pysatMissions
name = pysatSeasons
version = file: pysatSeasons/version.txt
url = https://github.com/pysat/pysatMissions
url = https://github.com/pysat/pysatSeasons
author = Russell Stoneback, Jeff Klenzing
author_email = pysat.developers@gmail.com
description = 'Seasonal analysis routines for pysat'
keywords =
pysat
ionosphere
analysis
season
climatology
classifiers =
Development Status :: 3 - Alpha
Topic :: Scientific/Engineering :: Astronomy
Expand All @@ -16,23 +19,27 @@ classifiers =
Intended Audience :: Science/Research
License :: OSI Approved :: BSD License
Natural Language :: English
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
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 =
matplotlib
numpy<1.20
pandas<0.25
pysat >=3.0


[coverage:report]

Expand Down
8 changes: 4 additions & 4 deletions test_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
coveralls
ipython
m2r2
nose
numpydoc
pytest-cov
pytest-flake8
pytest-ordering
sphinx
sphinx_rtd_theme
numpydoc
ipython
m2r2
nose

0 comments on commit fa836a9

Please sign in to comment.