forked from pybamm-team/PyBaMM
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into issue-3101-experiment-starting-solution
- Loading branch information
Showing
202 changed files
with
2,090 additions
and
1,492 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,7 +11,7 @@ jobs: | |
| if: | | ||
| github.event.comment.author_association != 'OWNER' && | ||
| github.event.comment.author_association != 'COLLABORATOR' && | ||
| github.repository-owner == 'pybamm-team' | ||
| github.repository_owner == 'pybamm-team' | ||
| steps: | ||
| - name: Remove needs-reply label | ||
| uses: octokit/[email protected] | ||
|
|
@@ -22,4 +22,4 @@ jobs: | |
| issue: ${{ github.event.issue.number }} | ||
| label: needs-reply | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -45,12 +45,8 @@ jobs: | |
| python-version: ["3.8", "3.9", "3.10", "3.11"] | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - id: setup-python | ||
| name: Set up Python ${{ matrix.python-version }} | ||
| uses: actions/setup-python@v4 | ||
| with: | ||
| python-version: ${{ matrix.python-version }} | ||
| - name: Check out PyBaMM repository | ||
| uses: actions/checkout@v3 | ||
|
|
||
| # Install and cache apt packages | ||
| - name: Install Linux system dependencies | ||
|
|
@@ -68,73 +64,59 @@ jobs: | |
| sudo dot -c | ||
| sudo apt-get install libopenblas-dev texlive-latex-extra dvipng | ||
| # Added fixes to homebrew installs: | ||
| # rm -f /usr/local/bin/2to3 | ||
| # (see https://github.com/actions/virtual-environments/issues/2322) | ||
| - name: Install macOS system dependencies | ||
| if: matrix.os == 'macos-latest' | ||
| env: | ||
| # Homebrew environment variables | ||
| HOMEBREW_NO_INSTALL_CLEANUP: 1 | ||
| HOMEBREW_NO_ANALYTICS: 1 | ||
| HOMEBREW_NO_GOOGLE_ANALYTICS: 1 | ||
| HOMEBREW_NO_AUTO_UPDATE: 1 | ||
| HOMEBREW_NO_COLOR: 1 | ||
| # Speed up CI | ||
| NONINTERACTIVE: 1 | ||
| 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* | ||
| brew analytics off | ||
| brew update | ||
| brew install graphviz openblas | ||
| - name: Install Windows system dependencies | ||
| if: matrix.os == 'windows-latest' | ||
| run: choco install graphviz --version=8.0.5 | ||
|
|
||
| - name: Install standard Python dependencies | ||
| - name: Set up Python ${{ matrix.python-version }} | ||
| id: setup-python | ||
| uses: actions/setup-python@v4 | ||
| with: | ||
| python-version: ${{ matrix.python-version }} | ||
| cache: 'pip' | ||
| cache-dependency-path: setup.py | ||
|
|
||
| - name: Install PyBaMM dependencies | ||
| run: | | ||
| python -m pip install --upgrade pip wheel setuptools | ||
| python -m pip install nox | ||
| pip install --upgrade pip wheel setuptools nox | ||
| pip install -e .[all,docs] | ||
| - name: Cache pybamm-requires nox environment for GNU/Linux | ||
| uses: actions/cache@v3 | ||
| if: matrix.os == 'ubuntu-latest' | ||
| with: | ||
| path: | | ||
| # Repository files | ||
| ${{ github.workspace }}/.nox/pybamm-requires/ | ||
| ${{ github.workspace }}/pybind11/ | ||
| ${{ github.workspace }}/install_KLU_Sundials/ | ||
| # Headers and dynamic library files for SuiteSparse and SUNDIALS | ||
| ${{ env.HOME }}/.local/lib/ | ||
| ${{ env.HOME }}/.local/include/ | ||
| ${{ env.HOME }}/.local/examples/ | ||
| key: nox-pybamm-requires-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/noxfile.py', '**/install_KLU_Sundials.py') }} | ||
| key: nox-pybamm-requires-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/install_KLU_Sundials.py') }} | ||
|
|
||
| - name: Install SuiteSparse and SUNDIALS on GNU/Linux | ||
| if: matrix.os == 'ubuntu-latest' | ||
| run: nox -s pybamm-requires | ||
|
|
||
| - name: Cache unit tests nox environment for GNU/Linux with Python 3.8, 3.9, and 3.10, and for macOS and Windows with all Python versions | ||
| uses: actions/cache@v3 | ||
| if: (matrix.os == 'ubuntu-latest' && matrix.python-version != 3.11) || (matrix.os != 'ubuntu-latest') | ||
| with: | ||
| path: ${{ github.workspace }}/.nox/unit/ | ||
| key: ${{ runner.os }}-nox-unit-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/noxfile.py', '**/setup.py') }} | ||
|
|
||
| - name: Run unit tests for GNU/Linux with Python 3.8, 3.9, and 3.10 and for macOS and Windows with all Python versions | ||
| if: (matrix.os == 'ubuntu-latest' && matrix.python-version != 3.11) || (matrix.os != 'ubuntu-latest') | ||
| run: nox -s unit | ||
|
|
||
| - name: Cache coverage nox environment for GNU/Linux with Python 3.11 | ||
| uses: actions/cache@v3 | ||
| if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.11 | ||
| with: | ||
| path: ${{ github.workspace }}/.nox/coverage/ | ||
| key: ${{ runner.os }}-nox-coverage-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/noxfile.py', '**/setup.py', '**/.coveragerc') }} | ||
|
|
||
| - name: Run unit tests for GNU/Linux with Python 3.11 and generate coverage report | ||
| if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.11 | ||
| run: nox -s coverage | ||
|
|
@@ -143,35 +125,14 @@ jobs: | |
| if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.11 | ||
| uses: codecov/[email protected] | ||
|
|
||
| - name: Cache integration tests nox environment for GNU/Linux with Python 3.11 | ||
| uses: actions/cache@v3 | ||
| if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.11 | ||
| with: | ||
| path: ${{ github.workspace }}/.nox/integration/ | ||
| key: ${{ runner.os }}-nox-integration-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/noxfile.py', '**/setup.py') }} | ||
|
|
||
| - name: Run integration tests for GNU/Linux with Python 3.11 | ||
| if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.11 | ||
| run: nox -s integration | ||
|
|
||
| - name: Cache doctests nox environment for GNU/Linux with Python 3.11 | ||
| uses: actions/cache@v3 | ||
| if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.11 | ||
| with: | ||
| path: ${{ github.workspace }}/.nox/doctests/ | ||
| key: ${{ runner.os }}-nox-doctests-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/noxfile.py', '**/setup.py', '**/docs/requirements.txt') }} | ||
|
|
||
| - name: Install docs dependencies and run doctests for GNU/Linux with Python 3.11 | ||
| if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.11 | ||
| run: nox -s doctests | ||
|
|
||
| - name: Cache examples nox environment for GNU/Linux with Python 3.11 | ||
| uses: actions/cache@v3 | ||
| if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.11 | ||
| with: | ||
| path: ${{ github.workspace }}/.nox/examples/ | ||
| key: ${{ runner.os }}-nox-examples-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/noxfile.py', '**/setup.py') }} | ||
|
|
||
| - name: Install dev dependencies and run example tests for GNU/Linux with Python 3.11 | ||
| if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.11 | ||
| run: nox -s examples | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.