Skip to content

Commit

Permalink
Merge branch 'develop' into controlled_information
Browse files Browse the repository at this point in the history
  • Loading branch information
rstoneback authored Jan 2, 2025
2 parents c8239f2 + 664aac1 commit a37baf0
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/external_rc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest]
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
python-version: ["3.12"]
rc-package: ["aacgmv2", "apexpy", "OMMBV"]

Expand All @@ -27,7 +27,7 @@ jobs:
run: pip install .[test]

- name: Install RC dependency
run: pip install -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ ${{ matrix.rc-package }}
run: pip install --pre -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ ${{ matrix.rc-package }}

- name: Set up pysat
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
numpy_ver: ["latest"]
include:
- python-version: "3.10"
numpy_ver: "1.24"
numpy_ver: "1.25"
os: "ubuntu-latest"

name: Python ${{ matrix.python-version }} on ${{ matrix.os }} with numpy ${{ matrix.numpy_ver }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pysat_rc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
numpy_ver: ["latest"]
include:
- python-version: "3.10"
numpy_ver: "1.23"
numpy_ver: "1.25"
os: "ubuntu-latest"

name: Python ${{ matrix.python-version }} on ${{ matrix.os }}
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ This project adheres to [Semantic Versioning](https://semver.org/).
* Maintenance
* Update meta headers to include orbital info used in propagation
* Update controlled information statement for accuracy and clarity
* Update external RC tests to include Mac environment testing
* Update NEP29 minimum to numpy 1.25

## [0.3.5] - 2024-07-16
* Maintenance
Expand Down

0 comments on commit a37baf0

Please sign in to comment.