Skip to content

Commit

Permalink
Merge pull request #135 from pysat/pysat_rc3.2.0_fixes
Browse files Browse the repository at this point in the history
pysat RC 3.2.0 fixes
  • Loading branch information
aburrell authored Dec 5, 2023
2 parents 4b82d0f + 71a7ef7 commit a9099f7
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 5 deletions.
16 changes: 14 additions & 2 deletions .github/workflows/pysat_rc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ jobs:
run: pip install --no-deps --pre -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ pysat

- name: Install standard dependencies and package
if: ${{ matrix.test_config == 'latest'}}
run: pip install .[test]

- name: Set up pysat
Expand All @@ -41,4 +40,17 @@ jobs:
- name: Publish results to coveralls
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: coveralls --rcfile=setup.cfg --service=github
COVERALLS_PARALLEL: true
run: coveralls --rcfile=pyproject.toml --service=github

finish:
name: Finish Coverage Analysis
needs: build
runs-on: ubuntu-latest
steps:
- name: Coveralls Finished
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
pip install --upgrade coveralls
coveralls --service=github --finish
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
* Changed F10.7 daily test day to ensure new pysat padding tests work
* Removed try/except loop that was a fix for pysat < 3.1.0
* Updated 'use_header' kwarg use for pysat 3.2.0 changes
* Removed unneeded keyword arguments from Kp method functions

[0.0.10] - 2023-06-01
---------------------
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ doc = [
"numpydoc",
"pyproject_parser",
"sphinx",
"sphinx_rtd_theme >= 1.2.2"
"sphinx_rtd_theme >= 1.2.2, < 2.0.0"
]

[project.urls]
Expand Down
3 changes: 1 addition & 2 deletions pysatSpaceWeather/instruments/methods/kp_ap.py
Original file line number Diff line number Diff line change
Expand Up @@ -584,12 +584,11 @@ def combine_kp(standard_inst=None, recent_inst=None, forecast_inst=None,
"provide starting and ending times")))

# Initialize the output instrument
kp_inst = pysat.Instrument(labels=all_inst[0].meta_labels)
kp_inst = pysat.Instrument()
kp_inst.inst_module = pysat_sw.instruments.sw_kp
kp_inst.tag = tag
kp_inst.date = start
kp_inst.doy = np.int64(start.strftime("%j"))
kp_inst.meta = pysat.Meta(labels=kp_inst.meta_labels)
initialize_kp_metadata(kp_inst.meta, 'Kp', fill_val=fill_val)

kp_times = list()
Expand Down

0 comments on commit a9099f7

Please sign in to comment.