Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix pipx + nox + pip dependency resolution bug in macOS workflows #3501

Merged
merged 22 commits into from
Nov 17, 2023
Merged

Fix pipx + nox + pip dependency resolution bug in macOS workflows #3501

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
f25b957
Fix `gfortran` installation
agriyakhetarpal Nov 7, 2023
65a81e3
Re-install OpenBLAS `scipy` meson linkage errors
agriyakhetarpal Nov 7, 2023
3aa79ca
Temporarily remove lower bounds: `numpy`, `scipy`
agriyakhetarpal Nov 9, 2023
8782a7a
Exercise minimum version bounds: `numpy`, `scipy`, and `casadi`
agriyakhetarpal Nov 9, 2023
dc1f6ed
Remove redundant PyBaMM dependencies caching step
agriyakhetarpal Nov 9, 2023
5a6f03c
Add a lower bound for `sympy`
agriyakhetarpal Nov 9, 2023
844fcec
Clean up `brew` changes and re-trigger build
agriyakhetarpal Nov 9, 2023
c7aa117
Update `sympy>=1.12` for the `[all]` extra as well
agriyakhetarpal Nov 9, 2023
9e69391
Remove reinstall of OpenBLAS for scheduled tests
agriyakhetarpal Nov 15, 2023
f87b6bf
Temporarily remove `pip` wheel caches and test
agriyakhetarpal Nov 15, 2023
778d2a4
Don't run "brew update" in CI
agriyakhetarpal Nov 15, 2023
9098bf0
Even lower bounds for NumPy and SciPy
agriyakhetarpal Nov 15, 2023
87b0424
Merge branch 'develop' into fix-macos-gfortran-issue
agriyakhetarpal Nov 15, 2023
b0dc5f9
Exercise tighter lower bounds for dependencies
agriyakhetarpal Nov 15, 2023
2b8e225
Add recursive optional dependencies
agriyakhetarpal Nov 15, 2023
66037ab
Remove bounds for `xarray` and `pandas`
agriyakhetarpal Nov 15, 2023
f726636
Use `python -m nox` instead of `pipx run nox`
agriyakhetarpal Nov 16, 2023
363c6f1
Temporarily remove cache, let Linux tests run
agriyakhetarpal Nov 16, 2023
b25e3ee
Undo cache changes
agriyakhetarpal Nov 16, 2023
72773c4
Undo `pip` cache changes
agriyakhetarpal Nov 16, 2023
e633469
Re-introduce `xarray` and `pandas` lower bounds
agriyakhetarpal Nov 16, 2023
0755c35
Bump versions according to SPEC 0000
agriyakhetarpal Nov 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions .github/workflows/run_periodic_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,19 +66,14 @@ jobs:
sudo apt install gfortran gcc libopenblas-dev graphviz pandoc
sudo apt install texlive-full

# Added fixes to homebrew installs:
# rm -f /usr/local/bin/2to3
# (see https://github.com/actions/virtual-environments/issues/2322)
# sometimes gfortran cannot be found, so reinstall gcc just to be sure
- name: Install MacOS system dependencies
if: matrix.os == 'macos-latest'
run: |
rm -f /usr/local/bin/2to3*
rm -f /usr/local/bin/idle3*
rm -f /usr/local/bin/pydoc3*
rm -f /usr/local/bin/python3*
run:
brew update
brew install graphviz
brew install openblas
brew reinstall openblas
brew reinstall gcc
agriyakhetarpal marked this conversation as resolved.
Show resolved Hide resolved

- name: Install Windows system dependencies
if: matrix.os == 'windows-latest'
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/test_on_push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ jobs:
sudo dot -c
sudo apt-get install libopenblas-dev texlive-latex-extra dvipng

# sometimes gfortran cannot be found, so reinstall gcc just to be sure
- name: Install macOS system dependencies
if: matrix.os == 'macos-latest'
env:
Expand All @@ -77,6 +78,7 @@ jobs:
brew analytics off
brew update
brew install graphviz openblas
brew reinstall gcc

- name: Install Windows system dependencies
if: matrix.os == 'windows-latest'
Expand Down Expand Up @@ -207,6 +209,7 @@ jobs:
sudo dot -c
sudo apt-get install libopenblas-dev texlive-latex-extra dvipng

# sometimes gfortran cannot be found, so reinstall gcc just to be sure
- name: Install macOS system dependencies
if: matrix.os == 'macos-latest'
env:
Expand All @@ -219,7 +222,9 @@ jobs:
run: |
brew analytics off
brew update
brew install graphviz openblas
brew install graphviz
brew reinstall gcc
brew reinstall openblas
agriyakhetarpal marked this conversation as resolved.
Show resolved Hide resolved

- name: Install Windows system dependencies
if: matrix.os == 'windows-latest'
Expand Down
6 changes: 3 additions & 3 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,9 @@ def compile_KLU():
],
# List of dependencies
install_requires=[
"numpy>=1.16",
"scipy>=1.3",
"casadi>=3.6.0",
"numpy",
"scipy",
"casadi",
"xarray",
],
extras_require={
Expand Down
Loading