diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5c9c903..f301395 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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.2.1" 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" @@ -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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 167bb40..648bd84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/README.md b/README.md index 5a1c029..2ae4841 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Python 3.7+. | Common modules | Community modules | | -------------- | ------------------- | -| netCDF4 | pysat>=3.0.4,<3.2.0 | +| netCDF4 | pysat>=3.2.1 | | numpy | | | pandas | | | requests | | diff --git a/docs/installation.rst b/docs/installation.rst index 0aa7021..325197b 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -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.2.1 numpy pandas requests diff --git a/pyproject.toml b/pyproject.toml index 45e7f45..5e50444 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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 = "pysat.developers@gmail.com"}, @@ -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" @@ -39,7 +39,7 @@ dependencies = [ "netCDF4", "numpy", "pandas", - "pysat >= 3.0.4, <3.2.0", + "pysat >= 3.2.1", "requests", "xarray" ] diff --git a/pysatCDAAC/__init__.py b/pysatCDAAC/__init__.py index a0786ed..fed6596 100644 --- a/pysatCDAAC/__init__.py +++ b/pysatCDAAC/__init__.py @@ -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') diff --git a/requirements.txt b/requirements.txt index 841a8d1..f98a15e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ netCDF4 numpy pandas -pysat>=3.0.3, <3.2.0 +pysat>=3.2.1 requests diff --git a/setup.cfg b/setup.cfg index 636591b..ccced98 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,7 +1,3 @@ -[metadata] -name = pysatCDAAC -version = 0.0.4 - [flake8] max-line-length = 80 ignore =