diff --git a/.github/workflows/openconcept.yaml b/.github/workflows/openconcept.yaml index a97c7fc5..ff1480e7 100644 --- a/.github/workflows/openconcept.yaml +++ b/.github/workflows/openconcept.yaml @@ -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: @@ -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 }} @@ -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: | @@ -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] diff --git a/doc/index.rst b/doc/index.rst index 9783892d..f99a14ad 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -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 diff --git a/readme.md b/readme.md index 8e639af2..e542ccde 100644 --- a/readme.md +++ b/readme.md @@ -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 diff --git a/setup.py b/setup.py index 3f5865b3..5957e56a 100644 --- a/setup.py +++ b/setup.py @@ -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={