Skip to content

Commit

Permalink
Merge branch 'tst/rc_fix' into sty/pyproject
Browse files Browse the repository at this point in the history
  • Loading branch information
jklenzing committed May 5, 2023
2 parents a856767 + 0f81025 commit de9efbb
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 7 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,8 @@ jobs:
- name: Install NEP29 dependencies
if: ${{ matrix.numpy_ver != 'latest'}}
run: |
pip install --no-binary :numpy: numpy==${{ matrix.numpy_ver }}
pip install --no-cache-dir numpy==${{ matrix.numpy_ver }}
pip install --upgrade-strategy only-if-needed .[test]
pip install pysatCDF --no-binary=pysatCDF
- name: Install standard dependencies
if: ${{ matrix.numpy_ver == 'latest'}}
Expand Down
12 changes: 11 additions & 1 deletion .github/workflows/pip_rc_install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,14 @@ jobs:
run: pip install -r requirements.txt

- name: Install pysatNASA RC
run: pip install --no-deps -i https://test.pypi.org/simple/ pysatNASA
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__)"
3 changes: 1 addition & 2 deletions .github/workflows/pysat_rc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,11 @@ jobs:
run: brew reinstall gcc

- name: Install pysat RC
run: 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
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,14 @@ This project adheres to [Semantic Versioning](https://semver.org/).
* Deprecated jpl_gps instrtument module, moved roti instrument to igs_gps
* Maintenance
* Removed duplicate tests if pysatCDF not isntalled
* Only test pysatCDF on GitHub Actions for older numpy versions
* Removed pysatCDF tests on Github Actions workflows (see #167)
* Updated actions and templates based on pysatEcosystem docs
* Remove pandas cap on NEP29 tests
* Updated dosctring style for consistency
* Removed version cap for xarray
* Added manual workflow to check that latest RC is installable through test pip
* Update meta label type for instruments
* Updated Github Actions workflows for improved compliance with pip>=23.0
* Use pyproject.toml to manage installation and metadata

## [0.0.4] - 2022-11-07
Expand Down
2 changes: 1 addition & 1 deletion pysatNASA/tests/test_instruments.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def test_load_cdflib(self, inst_dict):
assert UserWarning in categories
else:
# If error message does not match, raise error anyway
raise(verr)
raise (verr)

# Make sure fake data is cleared
assert target not in test_inst.data
Expand Down

0 comments on commit de9efbb

Please sign in to comment.