Skip to content

Commit df393f4

Browse files
authored
Merge branch 'tst/rc_fix' into sty/pyproject
2 parents 5e0cd34 + 432a449 commit df393f4

File tree

4 files changed

+4
-11
lines changed

4 files changed

+4
-11
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
- name: Install NEP29 dependencies
4949
if: ${{ matrix.test_config == 'NEP29'}}
5050
run: |
51-
pip install --no-cache-dir numpy==${{ matrix.numpy_ver }}
51+
pip install numpy==${{ matrix.numpy_ver }}
5252
pip install --upgrade-strategy only-if-needed .[test]
5353
5454
- name: Install standard dependencies

.readthedocs.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,11 @@ build:
1010
os: ubuntu-22.04
1111
tools:
1212
python: "3.10"
13-
# You can also specify other tool versions:
14-
# nodejs: "19"
15-
# rust: "1.64"
16-
# golang: "1.19"
1713

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

22-
# If using Sphinx, optionally build your docs in additional formats such as PDF
23-
# formats:
24-
# - pdf
2518

2619
# Optionally declare the Python requirements required to build your docs
2720
python:

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ This project adheres to [Semantic Versioning](https://semver.org/).
4040
* Deprecated jpl_gps instrtument module, moved roti instrument to igs_gps
4141
* Maintenance
4242
* Removed duplicate tests if pysatCDF not isntalled
43-
* Removed pysatCDF tests on Github Actions workflows (see #167)
43+
* Removed pysatCDF tests on GitHub Actions workflows (see #167)
4444
* Updated actions and templates based on pysatEcosystem docs
4545
* Remove pandas cap on NEP29 tests
4646
* Updated dosctring style for consistency
4747
* Removed version cap for xarray
4848
* Added manual workflow to check that latest RC is installable through test pip
4949
* Update meta label type for instruments
50-
* Updated Github Actions workflows for improved compliance with pip>=23.0
50+
* Updated GitHub Actions workflows for improved compliance with pip>=23.0
5151
* Added .readthedocs.yml to configure settings there.
5252
* Use pyproject.toml to manage installation and metadata
5353

pysatNASA/tests/test_instruments.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ def test_load_cdflib(self, inst_dict):
8787
assert UserWarning in categories
8888
else:
8989
# If error message does not match, raise error anyway
90-
raise (verr)
90+
raise ValueError(verr)
9191

9292
# Make sure fake data is cleared
9393
assert target not in test_inst.data

0 commit comments

Comments
 (0)