Skip to content

Commit

Permalink
⬆️ Bump scipy from 1.13.1 to 1.14.0 (#618)
Browse files Browse the repository at this point in the history
* ⬆️ Bump scipy from 1.13.1 to 1.14.0

Bumps [scipy](https://github.com/scipy/scipy) from 1.13.1 to 1.14.0.
- [Release notes](https://github.com/scipy/scipy/releases)
- [Commits](scipy/scipy@v1.13.1...v1.14.0)

---
updated-dependencies:
- dependency-name: scipy
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* require python 3.9

* try to fix conda

* try to fix conda

* require new pip

* wip

* wip

* wip

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Dion Häfner <dion.haefner@simulation.science>
  • Loading branch information
dependabot[bot] and dionhaefner authored Jul 3, 2024
1 parent 57539d3 commit bd4467f
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 17 deletions.
11 changes: 3 additions & 8 deletions .github/workflows/test-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

matrix:
os: [ubuntu-20.04]
python-version: ["3.8", "3.12"]
python-version: ["3.9", "3.12"]
backend: [numpy, jax]

env:
Expand Down Expand Up @@ -103,13 +103,8 @@ jobs:
mkdir -p $PYOM2_DIR
cp -r vendor/pyom2/* $PYOM2_DIR
pushd $PYOM2_DIR
if [ ${{ matrix.python-version }} == "3.8" ]
then
mv pyOM2_site_specific_distutils site_specific.mk_
else
pip install meson ninja
mv pyOM2_site_specific_meson site_specific.mk_
fi
pip install meson ninja
mv pyOM2_site_specific_meson site_specific.mk_
tar xzf pyOM2.1.0.tar.gz
git init
for patchfile in ./patches/*.patch; do
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
with:
activate-environment: veros
environment-file: conda-environment.yml
use-only-tar-bz2: true
auto-update-conda: true

- name: Install test dependencies
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ jobs:

matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: ["3.8", "3.12"]
python-version: ["3.9", "3.12"]
nocc: [false]

include:
# also test whether installation without C compiler works
- os: ubuntu-latest
python-version: "3.8"
python-version: "3.9"
nocc: true

runs-on: ${{ matrix.os }}
Expand Down
5 changes: 3 additions & 2 deletions conda-environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ name: veros

channels:
- conda-forge
- nodefaults

dependencies:
- python=3.8
- pip
- python=3.12
- pip>=24.0
- click
- entrypoints
- requests
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ click==8.1.7
entrypoints==0.4
requests==2.32.3
numpy==1.26.4
scipy==1.13.1
scipy==1.14.0
h5netcdf==1.3.0
h5py==3.11.0
pillow==10.3.0
Expand Down
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
Intended Audience :: Science/Research
License :: OSI Approved :: MIT License
Programming Language :: Python :: 3
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
Expand Down Expand Up @@ -159,7 +158,7 @@ def _env_to_bool(envvar):
long_description=long_description,
long_description_content_type="text/markdown",
url="https://veros.readthedocs.io",
python_requires=">=3.8",
python_requires=">=3.9",
version=versioneer.get_version(),
cmdclass=cmdclass,
packages=find_packages(),
Expand Down
2 changes: 1 addition & 1 deletion veros/core/external/solvers/scipy.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def _scipy_solver(self, state, rhs, x0, boundary_val):
rhs,
x0=x0,
atol=1e-8,
tol=0,
rtol=0,
maxiter=1000,
**self._extra_args,
)
Expand Down

0 comments on commit bd4467f

Please sign in to comment.