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

MAINT: update pysat standards, testing for SPEC-0, operational env #59

Merged
merged 11 commits into from
Nov 13, 2024
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
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
26 changes: 17 additions & 9 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,18 @@ jobs:
numpy_ver: ["latest"]
test_config: ["latest"]
include:
# SPEC-0 compliance settings w/ minimum supported pysat
- python-version: "3.10"
numpy_ver: "1.24"
pandas_ver: "1.5.0"
scipy_ver: "1.10.0"
xarray_ver: "2022.9.0"
pysat_ver: "3.1.0"
os: ubuntu-latest
test_config: "NEP29"
- python-version: "3.6.8"
numpy_ver: "1.19.5"
test_config: "SPEC0"
# Operational compliance settings
- python-version: "3.9"
numpy_ver: "1.23.5"
os: "ubuntu-20.04"
test_config: "Ops"

Expand All @@ -37,15 +43,17 @@ jobs:
- name: Install Operational dependencies
if: ${{ matrix.test_config == 'Ops'}}
run: |
pip install --no-cache-dir numpy==${{ matrix.numpy_ver }}
pip install -r requirements.txt
pip install -r test_requirements.txt
pip install .
pip install numpy==${{ matrix.numpy_ver }}
pip install --upgrade-strategy only-if-needed .[test]

- name: Install NEP29 dependencies
if: ${{ matrix.test_config == 'NEP29'}}
- name: Install SPEC-0 dependencies
if: ${{ matrix.test_config == 'SPEC0'}}
run: |
pip install numpy==${{ matrix.numpy_ver }}
pip install pandas==${{ matrix.pandas_ver }}
pip install scipy==${{ matrix.scipy_ver }}
pip install xarray==${{ matrix.xarray_ver }}
pip install pysat==${{ matrix.pysat_ver }}
pip install --upgrade-strategy only-if-needed .[test]

- name: Install standard dependencies
Expand Down
8 changes: 6 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [0.0.5] - 202X-XX-XX
## [0.0.5] - 2024-XX-XX
* Maintenance
* Update GitHub Actions standards
* Update GitHub Actions standards, including SPEC-0 tests
* Add compatibility for numpy version>=3.2.0
* Update usage of 'Dataset.dims' to 'Dataset.sizes'
* Update compatibility with pysat 3.2.0
* Set minimum pysat version to 3.1.0
* Set minimum python version to 3.9
* Update operational environment

## [0.0.4] - 2023-08-11
* Bug fixes
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Python 3.7+.

| Common modules | Community modules |
| -------------- | ------------------- |
| netCDF4 | pysat>=3.0.4,<3.2.0 |
| netCDF4 | pysat>=3.1.0 |
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
| netCDF4 | pysat>=3.1.0 |
| netCDF4 | pysat>=3.2.1 |

?

| numpy | |
| pandas | |
| requests | |
Expand Down
4 changes: 2 additions & 2 deletions docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ Prerequisites

pysatCDAAC uses common Python modules, as well as modules developed by
and for the Space Physics community. This module officially supports
Python 3.6+ and pysat 3.0.4+.
Python 3.9+ and pysat 3.1.0+.

================== ====================
Common modules Community modules
================== ====================
netCDF4 pysat>=3.0.4,<3.2.0
netCDF4 pysat>=3.1.0
Copy link
Member

Choose a reason for hiding this comment

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

Potential update here, too.

numpy
pandas
requests
Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ name = "pysatCDAAC"
version = "0.0.4"
description = "pysat support for CDAAC Instruments"
readme = "README.md"
requires-python = ">=3.6"
requires-python = ">=3.9"
license = {file = "LICENSE"}
authors = [
{name = "Jeff Klenzing, et al.", email = "[email protected]"},
Expand All @@ -21,10 +21,10 @@ classifiers = [
"License :: OSI Approved :: BSD License",
"Natural Language :: English",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Operating System :: POSIX :: Linux",
"Operating System :: MacOS :: MacOS X",
"Operating System :: Microsoft :: Windows"
Expand All @@ -39,7 +39,7 @@ dependencies = [
"netCDF4",
"numpy",
"pandas",
"pysat >= 3.0.4, <3.2.0",
"pysat >= 3.1.0",
Copy link
Member

Choose a reason for hiding this comment

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

Also here, if desired.

"requests",
"xarray"
]
Expand Down
7 changes: 1 addition & 6 deletions pysatCDAAC/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,4 @@
from pysatCDAAC import instruments # noqa F401

# Set version
try:
__version__ = importlib.metadata.version('pysatCDAAC')
except AttributeError:
# Python 3.6 requires a different version
import importlib_metadata
__version__ = importlib_metadata.version('pysatCDAAC')
__version__ = importlib.metadata.version('pysatCDAAC')
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
netCDF4
numpy
pandas
pysat>=3.0.3, <3.2.0
pysat>=3.1.0
Copy link
Member

Choose a reason for hiding this comment

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

And here, if needed.

requests
4 changes: 0 additions & 4 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
[metadata]
name = pysatCDAAC
version = 0.0.4

[flake8]
max-line-length = 80
ignore =
Expand Down