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

RC 0.2.1 #46

Merged
merged 65 commits into from
Nov 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
8c44ebf
Merge pull request #34 from pysat/rcv0-2-0
rstoneback Oct 28, 2022
0e76ead
STY: pytest syntax
jklenzing Nov 8, 2022
185a56f
DOC: update changelog
jklenzing Nov 8, 2022
db7089f
MAINT: update github actions
jklenzing Nov 8, 2022
8d42f86
DOC: update changelog
jklenzing Nov 8, 2022
e25819d
TST: add workflow for pysat rc
jklenzing Nov 10, 2022
2f940cc
TST: set test to manual
jklenzing Nov 10, 2022
34ae736
DOC: update changelog
jklenzing Nov 10, 2022
12dae08
Merge pull request #35 from pysat/tst/syntax
jklenzing Nov 28, 2022
f4b5d2b
Merge branch 'develop' into tst/rc
jklenzing Nov 28, 2022
f256ea9
Merge pull request #36 from pysat/tst/rc
jklenzing Nov 29, 2022
3a4dc7c
TST: add RC install workflow
jklenzing May 1, 2023
b39df79
STY: update pip install for RC workflow
jklenzing May 1, 2023
982c916
STY: set workflows to push
jklenzing May 1, 2023
738d3e7
DOC: update changelog
jklenzing May 1, 2023
37f5426
MAINT: add hacking cap
jklenzing May 1, 2023
ba5eaad
TST: set workflows to dispatch
jklenzing May 1, 2023
ac9333d
Apply suggestions from code review
jklenzing May 18, 2023
59503ce
Merge pull request #38 from pysat/tst/ga_updates
jklenzing May 24, 2023
438be78
MAINT: remove tests no longer suported by pysat
jklenzing Oct 4, 2023
f9bc3f5
BUG: fix workflow dispatch
jklenzing Oct 4, 2023
dd67193
DOC: update changelog
jklenzing Oct 4, 2023
ea9e856
MAINT: replace testing_xarray
jklenzing Oct 4, 2023
bc54e41
MAINT: update workflows
jklenzing Nov 30, 2023
93f75dd
MAINT: use ndtesting
jklenzing Nov 30, 2023
1423263
BUG: use correct samples
jklenzing Nov 30, 2023
d978b39
MAINT: set to workflow dispatch
jklenzing Nov 30, 2023
d14d860
Update .github/workflows/docs.yml
jklenzing Dec 1, 2023
f7f4fdd
Update .github/workflows/main.yml
jklenzing Aug 9, 2024
3edb558
MAINT: NEP29
jklenzing Aug 9, 2024
e6c7df1
MAINT: add new marks
jklenzing Aug 9, 2024
2ecb9dc
MAINT: update limits for testing suite
jklenzing Aug 12, 2024
2841570
MAINT: implement pyproject.toml
jklenzing Aug 12, 2024
7bcfab6
MIANT: update workflows
jklenzing Aug 12, 2024
9c06bf8
DOC: update changelog
jklenzing Aug 12, 2024
907be2d
BUG: workflow config
jklenzing Aug 12, 2024
15fa2ae
BUG: setup
jklenzing Aug 12, 2024
03220b9
BUG: setup
jklenzing Aug 12, 2024
b7af61a
STY: whitespace
jklenzing Aug 12, 2024
70cd39f
BUG: workflow
jklenzing Aug 12, 2024
eec61b1
Merge pull request #42 from pysat/maint/pyproject
jklenzing Aug 12, 2024
c9e70ab
Apply suggestions from code review
jklenzing Aug 13, 2024
ec784dc
MAINT: use coveralls app
jklenzing Aug 13, 2024
53cfd3f
Merge pull request #40 from pysat/maint/pysat_dep
jklenzing Aug 13, 2024
d3a3495
MAINT: update coveralls
jklenzing Aug 13, 2024
d4989bb
BUG: clean up pyproject
jklenzing Aug 13, 2024
eefd02c
Update CHANGELOG.md
jklenzing Aug 13, 2024
79d87d0
Merge pull request #43 from pysat/maint/coveralls
jklenzing Aug 14, 2024
77b7446
MAINT: update issues
jklenzing Aug 15, 2024
c44b333
MAINT: update workflows
jklenzing Aug 15, 2024
4bd5eec
MAINT: update contributing
jklenzing Aug 15, 2024
413e1f9
MAINT: update license date
jklenzing Aug 15, 2024
1104cb1
DOC: update changelog
jklenzing Aug 15, 2024
2c10520
MAINT: add acknowledgements
jklenzing Aug 15, 2024
ad35da8
Update CHANGELOG.md
jklenzing Aug 15, 2024
1420916
Merge pull request #44 from pysat/maint/37_docs
jklenzing Aug 15, 2024
642b40b
DOC: updated acknowledgements
aburrell Sep 6, 2024
39eb30a
DOC: updated docs
aburrell Sep 6, 2024
df0670f
DOC: update code statement block
aburrell Sep 6, 2024
5f72686
Merge pull request #45 from pysat/nrl_pub_release
aburrell Sep 23, 2024
4d8d937
MAINT: update rc stuff
jklenzing Oct 4, 2024
827fa9a
MAIMT: add readthedocs yml
jklenzing Oct 9, 2024
a905807
Merge branch 'main' into rc0_2_1
jklenzing Oct 15, 2024
5145c24
Apply suggestions from code review
jklenzing Nov 7, 2024
173110c
MIANT: update minimum pysat
jklenzing Nov 18, 2024
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
31 changes: 14 additions & 17 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,32 +1,29 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''
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

**Expected behavior**
A clear and concise description of what you expected to happen.
Consider including images or test files to help others reproduce the bug and
solve the problem.

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

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Version [e.g. 22]
## 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.
27 changes: 17 additions & 10 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,27 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''
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
22 changes: 14 additions & 8 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# 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
# 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

Expand All @@ -8,30 +9,35 @@ on: [push, pull_request]
jobs:
build:

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

name: Documentation tests
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
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
pip install .[doc]

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

- name: Check documentation build
run: sphinx-build -E -b html docs dist/docs

- name: Check documentation links
run: sphinx-build -b linkcheck docs dist/docs

- name: Load .zenodo.json to check for errors
run: python -c "import json; json.loads(open('.zenodo.json').read())"
57 changes: 35 additions & 22 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,35 +10,35 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.9", "3.10"]
os: [ubuntu-latest, macos-latest, windows-latest]
numpy_ver: [latest]
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
python-version: ["3.11", "3.12"]
numpy_ver: ["latest"]
test_config: ["latest"]
include:
- python-version: "3.8"
numpy_ver: "1.21"
# NEP29 compliance settings
- python-version: "3.10"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should maintain the same operational testing Python version for the pysatPenumbra packages as pysat does.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hard disagree. Core pysat has different needs then the penumbra packages and should not dictate what each package in the ecosystem decides to do.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Historically, this package has never supported the operational env. I have limited time. If you would like to lead a pull for a future version, you are welcome to do so.

numpy_ver: "1.24"
os: "ubuntu-latest"
test_config: "NEP29"

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

- name: Install requirements for testing setup
run: |
pip install -r test_requirements.txt

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

- name: Install NEP29 dependencies
if: ${{ matrix.numpy_ver != 'latest'}}
if: ${{ matrix.test_config == 'NEP29'}}
run: |
pip install --no-binary :numpy: numpy==${{ matrix.numpy_ver }}
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 .[test]

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

- name: Test with pytest
run: pytest --cov=pysatSeasons/
run: pytest

- name: Coveralls Parallel
uses: coverallsapp/github-action@v2
with:
flag-name: run-${{ join(matrix.*, '-') }}
parallel: true

finish:
name: Finish Coverage Analysis
needs: build
if: ${{ always() }}
runs-on: ubuntu-latest
steps:
- name: Coveralls Finished
uses: coverallsapp/github-action@v2
with:
parallel-finished: true

- name: Publish results to coveralls
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: coveralls --rcfile=setup.cfg --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 pysatSeasons 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.12"] # 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@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

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

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

- 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 pysatSeasons; print(pysatSeasons.__version__)"
55 changes: 55 additions & 0 deletions .github/workflows/pysat_rc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# 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: Test with latest pysat RC

on: [workflow_dispatch]

jobs:
build:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: ["3.12"]

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

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

- name: Install with standard dependencies
run: pip install .[test]

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

- name: Test with pytest
run: pytest

- name: Coveralls Parallel
uses: coverallsapp/github-action@v2
with:
flag-name: run-${{ join(matrix.*, '-') }}
parallel: true

finish:
name: Finish Coverage Analysis
needs: build
if: ${{ always() }}
runs-on: ubuntu-latest
steps:
- name: Coveralls Finished
uses: coverallsapp/github-action@v2
with:
parallel-finished: true

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ __pycache__/

# Distribution / packaging
.Python
.python-version
env/
build/
develop-eggs/
Expand Down
25 changes: 25 additions & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# .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.11"

# 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:
- method: pip
path: .
extra_requirements:
- doc
Loading