Skip to content

Commit fb9bae6

Browse files
authored
Fix the failing GitHub Actions (#67)
* Update setup-miniconda from v2 to v3 * Try install numpy and scipy with conda * Needs conda forge channel I think * Oops, pip needs double equals * Try scipy with conda too * nomkl * Try scipy 1.7.0 instead of 1.6.0 * Try updated codecov token * Document min scipy version to 1.7.0 from 1.6.0
1 parent ed14c54 commit fb9bae6

File tree

4 files changed

+12
-10
lines changed

4 files changed

+12
-10
lines changed

.github/workflows/openconcept.yaml

+9-7
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
PIP_VERSION_OLDEST: ['23.0.1'] # pip>=23.1 cannot build the oldest OpenMDAO
2929
SETUPTOOLS_VERSION_OLDEST: ['66.0.0'] # setuptools >= 67.0.0 can't build the oldest OpenMDAO
3030
NUMPY_VERSION_OLDEST: ['1.20'] # latest is most recent on PyPI
31-
SCIPY_VERSION_OLDEST: ['1.6.0'] # latest is most recent on PyPI
31+
SCIPY_VERSION_OLDEST: ['1.7.0'] # latest is most recent on PyPI
3232
OPENMDAO_VERSION_OLDEST: ['3.21'] # latest is most recent on PyPI
3333
fail-fast: false
3434
env:
@@ -40,13 +40,13 @@ jobs:
4040
- uses: actions/checkout@v3
4141
- name: Setup Python ${{ matrix.PYTHON_VERSION_OLDEST }}
4242
if: ${{ matrix.dep-versions == 'oldest' }}
43-
uses: conda-incubator/setup-miniconda@v2
43+
uses: conda-incubator/setup-miniconda@v3
4444
with:
4545
auto-update-conda: true
4646
python-version: ${{ matrix.PYTHON_VERSION_OLDEST }}
4747
- name: Setup Python ${{ matrix.PYTHON_VERSION_LATEST }}
4848
if: ${{ matrix.dep-versions == 'latest' }}
49-
uses: conda-incubator/setup-miniconda@v2
49+
uses: conda-incubator/setup-miniconda@v3
5050
with:
5151
auto-update-conda: true
5252
python-version: ${{ matrix.PYTHON_VERSION_LATEST }}
@@ -56,7 +56,8 @@ jobs:
5656
run: |
5757
conda config --set always_yes yes
5858
python -m pip install pip==${{ matrix.PIP_VERSION_OLDEST }} setuptools==${{ matrix.SETUPTOOLS_VERSION_OLDEST }} --upgrade wheel
59-
pip install numpy==${{ matrix.NUMPY_VERSION_OLDEST }} scipy==${{ matrix.SCIPY_VERSION_OLDEST }} om-pycycle
59+
conda install -c conda-forge numpy=${{ matrix.NUMPY_VERSION_OLDEST }} scipy=${{ matrix.SCIPY_VERSION_OLDEST }}
60+
pip install om-pycycle
6061
- name: Install dependencies (latest versions)
6162
if: ${{ matrix.dep-versions == 'latest' }}
6263
run: |
@@ -94,11 +95,12 @@ jobs:
9495
9596
- name: Upload coverage to Codecov
9697
if: ${{ matrix.os == 'ubuntu-latest' }}
97-
uses: codecov/codecov-action@v3
98+
uses: codecov/codecov-action@v4
9899
with:
99100
fail_ci_if_error: true
100-
token: ${{ secrets.CODECOV_TOKEN }}
101-
101+
env:
102+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
103+
102104
# --- publish to PyPI
103105
pypi:
104106
needs: [build]

doc/index.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ OpenConcept is tested regularly on builds with the oldest and latest supported p
7070
- 1.20
7171
- latest
7272
* - SciPy
73-
- 1.6.0
73+
- 1.7.0
7474
- latest
7575
* - OpenAeroStruct
7676
- latest

readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ OpenConcept is tested regularly on builds with the oldest and latest supported p
5656
| Python | 3.8 | 3.11 |
5757
| OpenMDAO | 3.21 | 3.30 |
5858
| NumPy | 1.20 | latest |
59-
| SciPy | 1.6.0 | latest |
59+
| SciPy | 1.7.0 | latest |
6060
| OpenAeroStruct | latest | latest |
6161

6262
## Citation

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
# Update the oldest package versions in the GitHub Actions build file, the readme,
4242
# and the index.rst file in the docs when you change these
4343
"numpy>=1.20",
44-
"scipy>=1.6.0",
44+
"scipy>=1.7.0",
4545
"openmdao >=3.21, <=3.30",
4646
],
4747
extras_require={

0 commit comments

Comments
 (0)