Skip to content

Commit

Permalink
Fix the failing GitHub Actions (#67)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
eytanadler authored May 16, 2024
1 parent ed14c54 commit fb9bae6
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 10 deletions.
16 changes: 9 additions & 7 deletions .github/workflows/openconcept.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
PIP_VERSION_OLDEST: ['23.0.1'] # pip>=23.1 cannot build the oldest OpenMDAO
SETUPTOOLS_VERSION_OLDEST: ['66.0.0'] # setuptools >= 67.0.0 can't build the oldest OpenMDAO
NUMPY_VERSION_OLDEST: ['1.20'] # latest is most recent on PyPI
SCIPY_VERSION_OLDEST: ['1.6.0'] # latest is most recent on PyPI
SCIPY_VERSION_OLDEST: ['1.7.0'] # latest is most recent on PyPI
OPENMDAO_VERSION_OLDEST: ['3.21'] # latest is most recent on PyPI
fail-fast: false
env:
Expand All @@ -40,13 +40,13 @@ jobs:
- uses: actions/checkout@v3
- name: Setup Python ${{ matrix.PYTHON_VERSION_OLDEST }}
if: ${{ matrix.dep-versions == 'oldest' }}
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
python-version: ${{ matrix.PYTHON_VERSION_OLDEST }}
- name: Setup Python ${{ matrix.PYTHON_VERSION_LATEST }}
if: ${{ matrix.dep-versions == 'latest' }}
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
python-version: ${{ matrix.PYTHON_VERSION_LATEST }}
Expand All @@ -56,7 +56,8 @@ jobs:
run: |
conda config --set always_yes yes
python -m pip install pip==${{ matrix.PIP_VERSION_OLDEST }} setuptools==${{ matrix.SETUPTOOLS_VERSION_OLDEST }} --upgrade wheel
pip install numpy==${{ matrix.NUMPY_VERSION_OLDEST }} scipy==${{ matrix.SCIPY_VERSION_OLDEST }} om-pycycle
conda install -c conda-forge numpy=${{ matrix.NUMPY_VERSION_OLDEST }} scipy=${{ matrix.SCIPY_VERSION_OLDEST }}
pip install om-pycycle
- name: Install dependencies (latest versions)
if: ${{ matrix.dep-versions == 'latest' }}
run: |
Expand Down Expand Up @@ -94,11 +95,12 @@ jobs:
- name: Upload coverage to Codecov
if: ${{ matrix.os == 'ubuntu-latest' }}
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
fail_ci_if_error: true
token: ${{ secrets.CODECOV_TOKEN }}

env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

# --- publish to PyPI
pypi:
needs: [build]
Expand Down
2 changes: 1 addition & 1 deletion doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ OpenConcept is tested regularly on builds with the oldest and latest supported p
- 1.20
- latest
* - SciPy
- 1.6.0
- 1.7.0
- latest
* - OpenAeroStruct
- latest
Expand Down
2 changes: 1 addition & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ OpenConcept is tested regularly on builds with the oldest and latest supported p
| Python | 3.8 | 3.11 |
| OpenMDAO | 3.21 | 3.30 |
| NumPy | 1.20 | latest |
| SciPy | 1.6.0 | latest |
| SciPy | 1.7.0 | latest |
| OpenAeroStruct | latest | latest |

## Citation
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
# Update the oldest package versions in the GitHub Actions build file, the readme,
# and the index.rst file in the docs when you change these
"numpy>=1.20",
"scipy>=1.6.0",
"scipy>=1.7.0",
"openmdao >=3.21, <=3.30",
],
extras_require={
Expand Down

0 comments on commit fb9bae6

Please sign in to comment.