Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release Candidate v0.0.5 #192

Merged
merged 493 commits into from
Jun 27, 2023
Merged
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
493 commits
Select commit Hold shift + click to select a range
ff90097
TST: skip pysatCDF install on latest numpy
jklenzing Apr 3, 2023
3d1962f
DOC: update changelog
jklenzing Apr 3, 2023
1ca1c31
DOC: update info on pysatCDF
jklenzing Apr 3, 2023
0006f3e
BUG: pytest skip
jklenzing Apr 3, 2023
766241c
BUG: reason for skipif
jklenzing Apr 3, 2023
b698e28
STY: only run extra tests for pandas
jklenzing Apr 3, 2023
bb68cc9
Merge pull request #156 from pysat/bug/numpy_pysatcdf
jklenzing Apr 3, 2023
b7a8b33
Merge branch 'develop' into enh/de2
jklenzing Apr 3, 2023
4b3f7ef
DOC: update supported instruments
jklenzing Apr 3, 2023
f75a6ec
DOC: update docstring
jklenzing Apr 3, 2023
cb7e42c
DOC: update changelog
jklenzing Apr 3, 2023
aadd5f7
ENH: update DE2 constellation
jklenzing Apr 3, 2023
85362a5
DOC: update docs
jklenzing Apr 3, 2023
84c608a
Update de2_vefi.py
jklenzing Apr 3, 2023
2e9d634
DOC: add comment
jklenzing Apr 4, 2023
dc80273
STY: alphabetical order
jklenzing Apr 4, 2023
ef71528
DOC: update constellation info
jklenzing Apr 4, 2023
8147f59
Merge pull request #157 from pysat/doc/152_icon_const
jklenzing Apr 4, 2023
00a52b3
DOC: remove duct refs
jklenzing Apr 4, 2023
2bdcd8b
Merge pull request #155 from pysat/enh/de2
jklenzing Apr 4, 2023
1580737
BUG: fix uniqueness
jklenzing Apr 4, 2023
2e3ba21
DOC: update docstrings
jklenzing Apr 4, 2023
9f75981
DOC: udpate changelog
jklenzing Apr 4, 2023
b0003c1
Merge pull request #158 from pysat/bug/139_unique_data
jklenzing Apr 5, 2023
b2fcea3
ENH: add IGS
jklenzing Apr 6, 2023
0248719
ENH: allow tag-level refs
jklenzing Apr 6, 2023
8e8b251
DEP: deprectae jpl gps roti
jklenzing Apr 6, 2023
bd818a4
DOC: update docstrings
jklenzing Apr 6, 2023
7cac0fa
DOC: update changelog
jklenzing Apr 6, 2023
3c82579
TST: test deprecation
jklenzing Apr 6, 2023
c4eddf4
BUG: fix concat for xarray
jklenzing Apr 6, 2023
9e431fe
ENH: add drop_dims kwarg
jklenzing Apr 6, 2023
3515c84
ENH: saber xarray
jklenzing Apr 6, 2023
d2d5249
DOC: update changelog
jklenzing Apr 6, 2023
6a64f9c
DOC: update supported instruments
jklenzing Apr 6, 2023
1c25767
DOC: update changelog
jklenzing Apr 6, 2023
9faf534
Merge branch 'develop' into sty/pyproject
jklenzing Apr 6, 2023
e38bcd5
STY: clean up reqs
jklenzing Apr 6, 2023
fc14e62
STY: restore backup requirement lists
jklenzing Apr 6, 2023
fb2af9b
BUG: use cdas download
jklenzing Apr 6, 2023
2a321e8
Merge branch 'develop' into sty/pyproject
jklenzing Apr 6, 2023
1e7e65a
MAINT: delete version
jklenzing Apr 6, 2023
09371ef
Using combine_by_coords from pysat develop branch
landsito Apr 7, 2023
0fd46ee
Updating CHANGELOG
landsito Apr 7, 2023
4180100
MAINT: update meta defaults for icon
jklenzing Apr 8, 2023
cc13bdc
DOC: update changelog
jklenzing Apr 8, 2023
847377e
MAINT: update defaults for default load
jklenzing Apr 8, 2023
cfc24a5
DOC: update changelog
jklenzing Apr 8, 2023
d0a8a84
Merge pull request #162 from pysat/bug/labels
jklenzing Apr 10, 2023
b08f0bb
Merge branch 'develop' into inst/gold_pr
jklenzing Apr 10, 2023
e76235f
MAINT: pysat compatibility
jklenzing Apr 10, 2023
84147ae
STY: cdasws implementation
jklenzing Apr 10, 2023
56e34fd
STY: style
jklenzing Apr 10, 2023
4b3db66
DOC: add note about pysat 3.1.0
jklenzing Apr 10, 2023
dd3cbd5
STY: use pysat logger to warn
jklenzing Apr 10, 2023
dd9efa2
DOC: update changelog
jklenzing Apr 10, 2023
13416e3
BUG: spelling
jklenzing Apr 10, 2023
6372526
BUG: deprecations
jklenzing Apr 10, 2023
bb66ff3
Merge pull request #159 from pysat/enh/93_gps
jklenzing Apr 11, 2023
f5efc69
Merge branch 'develop' into gold
jklenzing Apr 11, 2023
f47edb1
Merge branch 'develop' into enh/cdf_xarray
jklenzing Apr 11, 2023
be84d1a
Merge branch 'gold' into inst/gold_pr
jklenzing Apr 11, 2023
7ccc4bf
Merge pull request #160 from pysat/enh/cdf_xarray
jklenzing Apr 12, 2023
617e18c
Merge branch 'develop' into sty/pyproject
jklenzing Apr 12, 2023
b593330
Update pysatNASA/instruments/ses14_gold.py
landsito Apr 13, 2023
0712ffe
Update pysatNASA/instruments/ses14_gold.py
landsito Apr 13, 2023
6f7cad7
Update pysatNASA/instruments/ses14_gold.py
landsito Apr 13, 2023
7cb4241
Update pysatNASA/instruments/ses14_gold.py
landsito Apr 13, 2023
cc1a996
Apply suggestions from code review
jklenzing Apr 14, 2023
7d91e23
Update pysatNASA/instruments/ses14_gold.py
jklenzing Apr 14, 2023
f3aa4ab
Merge pull request #161 from landsito/gold
jklenzing Apr 14, 2023
4ef6c25
Update pysatNASA/instruments/ses14_gold.py
jklenzing Apr 14, 2023
cb45cf4
Merge branch 'develop' into inst/gold_pr
jklenzing Apr 14, 2023
1e36f30
Update pysatNASA/instruments/ses14_gold.py
jklenzing Apr 14, 2023
73d2d56
Update pysatNASA/instruments/ses14_gold.py
jklenzing Apr 14, 2023
7040e79
Merge pull request #163 from pysat/inst/gold_pr
jklenzing Apr 18, 2023
80e3d95
BUG: install pysat rc
jklenzing Apr 26, 2023
e4c38ed
BUG: pysatNASA RC
jklenzing Apr 26, 2023
acb4382
STY: E275 fix
jklenzing Apr 26, 2023
78b4517
BUG: install setuptools
jklenzing Apr 26, 2023
83a2851
BUG: upgrade pip
jklenzing Apr 26, 2023
ce3040c
BUG: add extra url
jklenzing Apr 26, 2023
fc4b78c
BUG: no pysatCDF
jklenzing Apr 26, 2023
9d121b2
STY: consistency
jklenzing Apr 26, 2023
ae88459
STY: consistency
jklenzing Apr 26, 2023
952ac1a
MAINT: pip options
jklenzing Apr 26, 2023
3f3d00b
MAINT: pip options
jklenzing Apr 26, 2023
43e90cc
MAINT: remove pysatCDF
jklenzing Apr 26, 2023
28f9a1d
STY: default pip
jklenzing Apr 26, 2023
9fb8465
DOC: update changelog
jklenzing Apr 26, 2023
77fe333
Merge branch 'develop' into tst/rc_fix
jklenzing Apr 26, 2023
edd96f5
TST: test import after rc install
jklenzing May 1, 2023
2f39b99
Merge branch 'tst/rc_fix' of https://github.com/pysat/pysatNASA into …
jklenzing May 1, 2023
83553b3
Update .github/workflows/pip_rc_install.yml
jklenzing May 4, 2023
0f81025
Update .github/workflows/pip_rc_install.yml
jklenzing May 4, 2023
b0d6f08
Merge branch 'develop' into sty/pyproject
jklenzing May 5, 2023
92846cb
Apply suggestions from code review
jklenzing May 5, 2023
08000ab
DOC: update docs
jklenzing May 5, 2023
23da8f8
TST: update tested versions
jklenzing May 5, 2023
a856767
DOC: update meta
jklenzing May 5, 2023
de9efbb
Merge branch 'tst/rc_fix' into sty/pyproject
jklenzing May 5, 2023
b8ec833
TST: add readthedocs
jklenzing May 5, 2023
0af986b
Update CHANGELOG.md
jklenzing May 5, 2023
04e0909
Merge branch 'tst/rc_fix' into sty/pyproject
jklenzing May 5, 2023
77d693c
Apply suggestions from code review
jklenzing May 16, 2023
ac2caad
Update main.yml
jklenzing May 16, 2023
1d48f49
BUG: operational tests
jklenzing May 16, 2023
859635b
Update main.yml
jklenzing May 16, 2023
0149729
BUG: quotes
jklenzing May 16, 2023
e0ffbad
Update main.yml
jklenzing May 16, 2023
f554299
Update __init__.py
jklenzing May 17, 2023
edd0c41
Update __init__.py
jklenzing May 18, 2023
2b006a1
Update .github/workflows/main.yml
jklenzing May 18, 2023
ba59f29
Update pyproject.toml
jklenzing May 18, 2023
a4c6591
Update main.yml
jklenzing May 18, 2023
432a449
Update main.yml
jklenzing May 18, 2023
771939d
Update pyproject.toml
jklenzing May 18, 2023
879f3a5
Update setup.cfg
jklenzing May 18, 2023
5e0cd34
Update setup.cfg
jklenzing May 18, 2023
df393f4
Merge branch 'tst/rc_fix' into sty/pyproject
jklenzing May 18, 2023
f5baa13
Update .readthedocs.yml
jklenzing May 18, 2023
3726577
BUG: SSUSI dimensions may change
aburrell May 19, 2023
2c81284
DEP: added deprecation warning and filters
aburrell May 19, 2023
2993ec4
TST: added test for the new deprecation warning
aburrell May 19, 2023
9490799
DOC: updated Changelog
aburrell May 19, 2023
ee68ecd
STY: fixed flake8 issues
aburrell May 19, 2023
1cbcc2d
BUG: added catch for missing metadata
aburrell May 19, 2023
57b8dbe
BUG: added missing variable
aburrell May 19, 2023
13b12c4
Merge pull request #168 from pysat/tst/rc_fix
jklenzing May 24, 2023
f86fd9d
STY: update meta
jklenzing May 30, 2023
2b41e01
BUG: fix metadata
jklenzing May 30, 2023
c08e787
Merge pull request #171 from pysat/develop
aburrell May 30, 2023
8d3202d
DEP: removed expand_coords
aburrell May 30, 2023
175e571
TST: removed deprecation tests
aburrell May 30, 2023
2193d48
DOC: updated changelog
aburrell May 30, 2023
6c70767
Merge branch 'ssusi_bug_w_dep' of https://github.com/pysat/pysatNASA …
aburrell May 30, 2023
71b8074
Merge pull request #129 from pysat/sty/pyproject
jklenzing May 30, 2023
da2229b
BUG: add sleep to download
jklenzing May 31, 2023
f95ddad
DOC: update changelog
jklenzing May 31, 2023
74050ce
BUG: time v time
jklenzing May 31, 2023
2dd9535
DOC: add comments
jklenzing May 31, 2023
ba1291c
BUG: fix saber concatenation
jklenzing Jun 1, 2023
ef206f1
ENH: add drop_vars to load from xarray
jklenzing Jun 1, 2023
2d73949
STY: ues_cdflib True for xarray
jklenzing Jun 1, 2023
babc30c
DOC: update changelog
jklenzing Jun 1, 2023
4a80aa0
ENH: rename variables
jklenzing Jun 1, 2023
5a13ace
BUG: xarray meta
jklenzing Jun 1, 2023
b4526b1
ENH: use kwarg for combine_nested
jklenzing Jun 1, 2023
d01ae4f
DOC: update changelog
jklenzing Jun 1, 2023
f516015
DOC: update changelog
jklenzing Jun 1, 2023
20a07c2
MAINT: remove try except
jklenzing Jun 1, 2023
451ba0b
MAINT: pysat 3.1.0 minimum
jklenzing Jun 1, 2023
1755f72
DOC: update docs
jklenzing Jun 1, 2023
1f2199d
DOC: update changelog
jklenzing Jun 1, 2023
c18a4fd
MAINT: removed unused import
jklenzing Jun 1, 2023
4ec3258
STY: include strict_dim_check in jhuapl load
jklenzing Jun 1, 2023
89d1298
Update pysatNASA/instruments/timed_saber.py
jklenzing Jun 1, 2023
2a0ea9f
BUG: strict_dim_check in sdr_aurora
jklenzing Jun 1, 2023
1353cf9
Merge pull request #175 from pysat/bug/xarray
jklenzing Jun 1, 2023
e4070c5
Update requirements.txt
jklenzing Jun 1, 2023
6298607
Merge branch 'develop' into bug/172_download
Jun 1, 2023
009bf65
Update pyproject.toml
jklenzing Jun 2, 2023
c26f1e8
Update requirements.txt
jklenzing Jun 2, 2023
68c4f33
Merge pull request #178 from pysat/maint/165_pysat31
jklenzing Jun 2, 2023
ae8b4dc
Merge branch 'develop' into sty/strict_dim_check
jklenzing Jun 2, 2023
f8e39cc
Merge branch 'develop' into bug/172_download
jklenzing Jun 2, 2023
5d0fc54
STY: set sleep to 0.2
jklenzing Jun 2, 2023
f939231
Update pysatNASA/instruments/methods/jhuapl.py
jklenzing Jun 2, 2023
7144c1d
Update pysatNASA/instruments/methods/jhuapl.py
jklenzing Jun 2, 2023
acd9cfe
Merge branch 'develop' into sty/warnings
jklenzing Jun 2, 2023
c66ee09
STY: update cdflib versions
jklenzing Jun 2, 2023
75e362b
TST: cap on operational env tests
jklenzing Jun 2, 2023
027df45
STY: xarray support across cdflib versions
jklenzing Jun 2, 2023
fe13b25
MAINT: cdflib 1.0+ compat
jklenzing Jun 2, 2023
f831d77
Merge branch 'bug/172_download' into sty/cdflib
jklenzing Jun 2, 2023
7723d45
STY: whitespace
jklenzing Jun 2, 2023
88c16e2
Update CHANGELOG.md
jklenzing Jun 2, 2023
ccc3ad4
Merge pull request #181 from pysat/develop
aburrell Jun 4, 2023
020baf3
Merge pull request #180 from pysat/sty/warnings
jklenzing Jun 5, 2023
74fd874
Merge branch 'develop' into bug/172_download
jklenzing Jun 5, 2023
37294e5
Merge pull request #173 from pysat/bug/172_download
jklenzing Jun 5, 2023
027b6b8
Update pysatNASA/instruments/methods/jhuapl.py
jklenzing Jun 5, 2023
621f802
Merge pull request #170 from pysat/ssusi_bug_w_dep
aburrell Jun 5, 2023
8afa88c
Apply suggestions from code review
jklenzing Jun 5, 2023
5a75090
MAINT: use meta_kwargs in load_netdf
jklenzing Jun 5, 2023
9dc102e
Merge branch 'sty/strict_dim_check' into maint/pysat_depr
jklenzing Jun 5, 2023
8e9a4fb
Update jhuapl.py
jklenzing Jun 5, 2023
5720e60
Merge branch 'develop' into sty/strict_dim_check
jklenzing Jun 5, 2023
cf1040a
Merge pull request #177 from pysat/sty/strict_dim_check
jklenzing Jun 6, 2023
2374a4b
STY: float as primary
jklenzing Jun 6, 2023
9253a1d
STY: warning, not warn
jklenzing Jun 6, 2023
4412b37
Merge branch 'develop' into sty/cdflib
jklenzing Jun 6, 2023
7f140b1
Update CHANGELOG.md
jklenzing Jun 6, 2023
1aea5e9
Merge branch 'develop' into maint/pysat_depr
jklenzing Jun 6, 2023
78ad434
BUG: fix bad merge
jklenzing Jun 6, 2023
90c653a
DOC: update changelog
jklenzing Jun 6, 2023
6572322
DOC: update docs
jklenzing Jun 6, 2023
5cbd14f
Update pysatNASA/instruments/methods/_cdf.py
jklenzing Jun 6, 2023
647cdb4
STY: there is no try, only if
jklenzing Jun 6, 2023
70b5b96
Merge pull request #183 from pysat/sty/cdflib
jklenzing Jun 7, 2023
7356482
updated download functions to take data_path as an arg
JonathonMSmith Jun 7, 2023
5de67df
updated tests for data_path arg
JonathonMSmith Jun 7, 2023
16b8289
updated changelog
JonathonMSmith Jun 7, 2023
d53368f
updated to_pysat method to attach header level meta
JonathonMSmith Jun 7, 2023
74c4136
added test to ensure attachment of header level meta
JonathonMSmith Jun 7, 2023
d2219aa
updated changelog
JonathonMSmith Jun 7, 2023
c6a2daf
style fixes
JonathonMSmith Jun 7, 2023
42b02ca
Merge branch 'develop' into maint/pysat_depr
jklenzing Jun 7, 2023
1850c78
Merge pull request #182 from pysat/maint/pysat_depr
jklenzing Jun 8, 2023
9e0930c
Merge pull request #184 from pysat/data_path_arg
JonathonMSmith Jun 8, 2023
bfb6492
BUG: use custom load for ACE
jklenzing Jun 12, 2023
d221e96
DOC: update default styles
jklenzing Jun 12, 2023
3e8cef8
ENH: add str as meta type
jklenzing Jun 12, 2023
4eef680
BUG: don't clean the coords
jklenzing Jun 12, 2023
4f23ea0
ENH: move ace clean to general
jklenzing Jun 12, 2023
f6d2b06
STY: use clean for historical data
jklenzing Jun 12, 2023
7cee83a
DOC: update changelog
jklenzing Jun 12, 2023
e388da7
BUG: xarray syntax
jklenzing Jun 12, 2023
231bf71
MAINT: decode times
jklenzing Jun 13, 2023
a9a7303
DOC: update changelog
jklenzing Jun 13, 2023
4581f7c
Merge branch 'bug/186_ace' into enh/187_clean
jklenzing Jun 13, 2023
20e3adb
ENH: map multidim meta
jklenzing Jun 13, 2023
39373f6
Update pysatNASA/tests/test_instruments.py
JonathonMSmith Jun 13, 2023
9fbecf7
Apply suggestions from code review
jklenzing Jun 13, 2023
77fa1c1
Merge pull request #188 from pysat/bug/186_ace
jklenzing Jun 13, 2023
8bc4ee4
Merge branch 'develop' into enh/187_clean
jklenzing Jun 13, 2023
bc5c0b3
Update pysatNASA/instruments/methods/general.py
jklenzing Jun 13, 2023
303ea96
Merge pull request #190 from pysat/enh/187_clean
jklenzing Jun 14, 2023
ab93499
Update CHANGELOG.md
jklenzing Jun 14, 2023
9189e5f
Update pysatNASA/tests/test_instruments.py
JonathonMSmith Jun 14, 2023
9cda864
Update test_instruments.py whitespace
JonathonMSmith Jun 14, 2023
5b0654e
Merge pull request #191 from pysat/sty/decode_times
jklenzing Jun 14, 2023
c77e018
Merge remote-tracking branch 'upstream/develop' into header_meta
JonathonMSmith Jun 14, 2023
4830072
added TODO linked to pysat version 3.3.0
JonathonMSmith Jun 14, 2023
9ce996c
added **kwargs to ace load with TODO linked to pysat 3.3.0. And PEP8 …
JonathonMSmith Jun 14, 2023
f0ed7c5
removed TODO related to kwargs
JonathonMSmith Jun 14, 2023
eb8327d
Update pysatNASA/tests/test_instruments.py
JonathonMSmith Jun 14, 2023
5d0804e
Merge pull request #185 from pysat/header_meta
jklenzing Jun 15, 2023
45185f2
DOC: update changelog
jklenzing Jun 15, 2023
abd6af6
STY: update test versions
jklenzing Jun 15, 2023
cdf7a4f
MAINT: minimum setuptools
jklenzing Jun 15, 2023
74d506e
DOC: update authors
jklenzing Jun 15, 2023
db74b96
DOC: clean up changelog
jklenzing Jun 15, 2023
583e2dc
Merge branch 'main' into rc_0_0_5
jklenzing Jun 15, 2023
408881a
Apply suggestions from code review
jklenzing Jun 15, 2023
e436a65
DOC: consistent properties in docstrings
jklenzing Jun 15, 2023
1dbdb55
STY: import order
jklenzing Jun 15, 2023
91db423
Apply suggestions from code review
jklenzing Jun 20, 2023
1519159
STY: inst_ids / tags
jklenzing Jun 20, 2023
14957b6
Update CHANGELOG.md
jklenzing Jun 27, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 14 additions & 20 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,35 +1,29 @@
---
name: Bug report
about: Create a report to help us improve
about: Create a report to report a problem that needs to be fixed
labels: bug
title: "BUG: "

---

**Describe the bug**
A clear and concise description of what the bug is.
# Description
A clear and concise description of what the bug is, including a description
of what you expected the outcome to be.

**To Reproduce**
# To Reproduce this bug:
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

or
Consider including images or test files to help others reproduce the bug and
solve the problem.

```
# test code here
```

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Version [e.g. Python 3.7]
## Test configuration
- OS: [e.g. Hal]
- Version [e.g. Python 3.47]
- Other details about your setup that could be relevant

**Additional context**
Add any other context about the problem here.
# Additional context
Add any other context about the problem here, including expected behaviour.
24 changes: 17 additions & 7 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,27 @@
---
name: Feature request
about: Suggest an idea for this project
title: "ENH: "
labels: enhancement

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
# Description
A clear and concise description of the new feature or behaviour you would like.

**Describe the solution you'd like**
## Potential impact

- Is the feature related to an existing problem?
- How critical is this feature to your workflow?
- How wide of an impact to you anticipate this enhancement having?
- Would this break any existing functionality?

## Potential solution(s)
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
# Alternatives
A clear description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
# Additional context
Add any other context or screenshots about the feature request here, potentially
including your operational configuration.
19 changes: 19 additions & 0 deletions .github/ISSUE_TEMPLATE/question.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
name: Question
about: A question about this project
title: "QUEST: "
labels: question

---

# Description
A clear and concise summary of your query

## Example code (optional)
If relevant, include sample code, images, or files so that others can understand
the full context of your question.

## Configuration
- OS: [e.g. Hal]
- Version: [e.g. Python 3.47]
- Other details about your setup that could be relevant
13 changes: 8 additions & 5 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Description

Addresses # (issue)
Addresses #(issue)

Please include a summary of the change and which issue is fixed. Please also
include relevant motivation and context. List any dependencies that are required
for this change. Please see ``CONTRIBUTING.md`` for more guidelines.

## Type of change
# Type of change

Please delete options that are not relevant.

Expand All @@ -25,9 +25,9 @@ your test configuration
- Test A
- Test B

## Test Configuration
* Operating system: [Os Type]
* Version number: [Python 2.9]
**Test Configuration**:
* Operating system: Hal
* Version number: Python 3.X
* Any details about your local setup that are relevant

# Checklist:
Expand All @@ -43,3 +43,6 @@ your test configuration
- [ ] Any dependent changes have been merged and published in downstream modules
- [ ] Add a note to ``CHANGELOG.md``, summarizing the changes
- [ ] Update zenodo.json file for new code contributors

If this is a release PR, replace the first item of the above checklist with the release
checklist on the wiki: https://github.com/pysat/pysat/wiki/Checklist-for-Release
9 changes: 4 additions & 5 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
# This workflow will install Python dependencies and check the sphinx build, links in the docs, and the readability of the zenodo file
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions

name: Documentation Check
Expand All @@ -8,11 +8,11 @@ on: [push, pull_request]
jobs:
build:

runs-on: ubuntu-latest
runs-on: ["ubuntu-latest"]
strategy:
fail-fast: false
matrix:
python-version: [3.9]
python-version: ["3.11"] # Keep this version at the highest supported Python version

name: Documentation tests
steps:
Expand All @@ -25,8 +25,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r test_requirements.txt
pip install -r requirements.txt
pip install .[doc]

- name: Set up pysat
run: |
Expand Down
42 changes: 27 additions & 15 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,19 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: ["3.9", "3.10"]
numpy_ver: [latest]
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
python-version: ["3.10", "3.11"]
numpy_ver: ["latest"]
test_config: ["latest"]
include:
- python-version: "3.8"
numpy_ver: "1.20"
- python-version: "3.9"
numpy_ver: "1.21"
os: ubuntu-latest
test_config: "NEP29"
- python-version: "3.6.8"
numpy_ver: "1.19.5"
os: "ubuntu-20.04"
test_config: "Ops"

name: Python ${{ matrix.python-version }} on ${{ matrix.os }} with numpy ${{ matrix.numpy_ver }}
runs-on: ${{ matrix.os }}
Expand All @@ -31,18 +37,25 @@ jobs:
if: ${{ matrix.os == 'macos-latest' }}
run: brew reinstall gcc

- name: Install Operational dependencies
if: ${{ matrix.test_config == 'Ops'}}
run: |
pip install --no-cache-dir numpy==${{ matrix.numpy_ver }}
pip install "cdflib<1.0"
pip install -r requirements.txt
pip install -r test_requirements.txt
pip install .

- name: Install NEP29 dependencies
if: ${{ matrix.numpy_ver != 'latest'}}
if: ${{ matrix.test_config == 'NEP29'}}
run: |
pip install --no-binary :numpy: numpy==${{ matrix.numpy_ver }}
# Need to force a version of pandas compliant with NEP29
pip install "pandas<1.5"
pip install numpy==${{ matrix.numpy_ver }}
pip install --upgrade-strategy only-if-needed .[test]

- name: Install standard dependencies
if: ${{ matrix.test_config == 'latest'}}
run: |
pip install -r requirements.txt
pip install pysatCDF --no-binary=pysatCDF
pip install -r test_requirements.txt
pip install .[test]

- name: Set up pysat
run: |
Expand All @@ -56,10 +69,9 @@ jobs:
run: flake8 . --count --exit-zero --max-complexity=10 --statistics

- name: Test with pytest
run: |
pytest -vs --cov=pysatNASA/
run: pytest

- name: Publish results to coveralls
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: coveralls --rcfile=setup.cfg --service=github
run: coveralls --rcfile=pyproject.toml --service=github
40 changes: 40 additions & 0 deletions .github/workflows/pip_rc_install.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# This workflow will install Python dependencies and the latest RC of pysatNASA from test pypi.
# This test should be manually run before a pysatNASA RC is officially approved and versioned.
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions

name: Test install of latest RC from pip

on: [workflow_dispatch]

jobs:
build:
strategy:
fail-fast: false
matrix:
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
python-version: ["3.11"] # Keep this version at the highest supported Python version

name: Python ${{ matrix.python-version }} on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}

- name: Install standard dependencies
run: pip install -r requirements.txt

- name: Install pysatNASA RC
run: pip install --no-deps --pre -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ pysatNASA

- name: Set up pysat
run: |
mkdir pysatData
python -c "import pysat; pysat.params['data_dirs'] = 'pysatData'"

- name: Check that install imports correctly
run: |
cd ..
python -c "import pysatNASA; print(pysatNASA.__version__)"
14 changes: 7 additions & 7 deletions .github/workflows/pysat_rc.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
# This workflow will install Python dependencies and the latest RC of pysat from test pypi.
# All unit tests for pysatNASA will be run using the pysat RC.
# This test should be manually run before a pysat RC is officially approved and versioned.
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions

name: Test with latest pysat RC
Expand All @@ -10,8 +12,8 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: ["3.10"]
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
python-version: ["3.11"] # Keep this version at the highest supported Python version

name: Python ${{ matrix.python-version }} on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
Expand All @@ -27,14 +29,12 @@ jobs:
run: brew reinstall gcc

- name: Install pysat RC
run: |
pip install -r test_requirements.txt
pip install --no-deps -i https://test.pypi.org/simple/ pysat
run: pip install --no-deps --pre -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ pysat

- name: Install standard dependencies
run: |
pip install -r requirements.txt
pip install pysatCDF --no-binary=pysatCDF
pip install -r test_requirements.txt

- name: Set up pysat
run: |
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,6 @@ custom_lint.sh

# IDEs
.idea/

# vscode
.vscode
22 changes: 22 additions & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# .readthedocs.yml
# Read the Docs configuration file
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

# Required
version: 2

# Set the version of Python and other tools you might need
build:
os: ubuntu-22.04
tools:
python: "3.10"

# Build documentation in the docs/ directory with Sphinx
sphinx:
configuration: docs/conf.py


# Optionally declare the Python requirements required to build your docs
python:
install:
- requirements: docs/requirements.txt
5 changes: 5 additions & 0 deletions .zenodo.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@
"name": "Smith, Jonathon",
"orcid": "0000-0002-8191-4765"
},
{
"affilitation":"University of Colorado at Boulder",
"name": "Navarro, Luis",
"orcid": "0000-0002-6362-6575"
},
{
"affiliation": "Predictive Science",
"name": "Pembroke, Asher"
Expand Down
Loading