Skip to content

Commit a37baf0

Browse files
authored
Merge branch 'develop' into controlled_information
2 parents c8239f2 + 664aac1 commit a37baf0

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

.github/workflows/external_rc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
os: [ubuntu-latest, windows-latest]
13+
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
1414
python-version: ["3.12"]
1515
rc-package: ["aacgmv2", "apexpy", "OMMBV"]
1616

@@ -27,7 +27,7 @@ jobs:
2727
run: pip install .[test]
2828

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

3232
- name: Set up pysat
3333
run: |

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
numpy_ver: ["latest"]
1717
include:
1818
- python-version: "3.10"
19-
numpy_ver: "1.24"
19+
numpy_ver: "1.25"
2020
os: "ubuntu-latest"
2121

2222
name: Python ${{ matrix.python-version }} on ${{ matrix.os }} with numpy ${{ matrix.numpy_ver }}

.github/workflows/pysat_rc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
numpy_ver: ["latest"]
1616
include:
1717
- python-version: "3.10"
18-
numpy_ver: "1.23"
18+
numpy_ver: "1.25"
1919
os: "ubuntu-latest"
2020

2121
name: Python ${{ matrix.python-version }} on ${{ matrix.os }}

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ This project adheres to [Semantic Versioning](https://semver.org/).
66
* Maintenance
77
* Update meta headers to include orbital info used in propagation
88
* Update controlled information statement for accuracy and clarity
9+
* Update external RC tests to include Mac environment testing
10+
* Update NEP29 minimum to numpy 1.25
911

1012
## [0.3.5] - 2024-07-16
1113
* Maintenance

0 commit comments

Comments
 (0)