-
-
Notifications
You must be signed in to change notification settings - Fork 578
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
38 changed files
with
634 additions
and
297 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 |
|---|---|---|
|
|
@@ -24,18 +24,15 @@ concurrency: | |
| cancel-in-progress: true | ||
|
|
||
| jobs: | ||
| run_unit_tests: | ||
| name: Unit tests (${{ matrix.os }} / Python ${{ matrix.python-version }}) | ||
| run_tests: | ||
| runs-on: ${{ matrix.os }} | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| os: [ubuntu-latest, macos-12, macos-14, windows-latest] | ||
| python-version: ["3.9", "3.10", "3.11", "3.12"] | ||
| # Exclude Python 3.12 from unit tests since we run it in the coverage jobs | ||
| exclude: | ||
| - os: ubuntu-latest | ||
| python-version: "3.12" | ||
| os: [ ubuntu-latest, macos-12, macos-14, windows-latest ] | ||
| python-version: [ "3.9", "3.10", "3.11", "3.12" ] | ||
| name: Tests (${{ matrix.os }} / Python ${{ matrix.python-version }}) | ||
|
|
||
| steps: | ||
| - name: Check out PyBaMM repository | ||
| uses: actions/checkout@v4 | ||
|
|
@@ -78,98 +75,27 @@ jobs: | |
| run: python -m nox -s pybamm-requires | ||
|
|
||
| - name: Run unit tests for ${{ matrix.os }} with Python ${{ matrix.python-version }} | ||
| if: matrix.os != 'ubuntu-latest' || matrix.python-version != '3.12' | ||
| run: python -m nox -s unit | ||
|
|
||
| check_coverage: | ||
| runs-on: ubuntu-latest | ||
| name: Coverage tests (ubuntu-latest / Python 3.12) | ||
|
|
||
| steps: | ||
| - name: Check out PyBaMM repository | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Install Linux system dependencies | ||
| run: | | ||
| sudo apt-get update | ||
| sudo apt-get install gfortran gcc graphviz pandoc libopenblas-dev texlive-latex-extra dvipng | ||
| - name: Set up Python 3.12 | ||
| uses: actions/setup-python@v5 | ||
| with: | ||
| python-version: 3.12 | ||
|
|
||
| - name: Install nox | ||
| run: python -m pip install nox | ||
|
|
||
| - name: Install SuiteSparse and SUNDIALS on GNU/Linux | ||
| timeout-minutes: 10 | ||
| run: python -m nox -s pybamm-requires | ||
|
|
||
| - name: Run unit tests for Ubuntu with Python 3.12 and generate coverage report | ||
| - name: Run coverage tests for ${{ matrix.os }} with Python ${{ matrix.python-version }} | ||
| if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.12' | ||
| run: python -m nox -s coverage | ||
|
|
||
| - name: Upload coverage report | ||
| if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.12' | ||
| uses: codecov/[email protected] | ||
| if: github.repository == 'pybamm-team/PyBaMM' | ||
| with: | ||
| token: ${{ secrets.CODECOV_TOKEN }} | ||
|
|
||
| run_integration_tests: | ||
| name: Integration tests (${{ matrix.os }} / Python ${{ matrix.python-version }}) | ||
| runs-on: ${{ matrix.os }} | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| os: [ubuntu-latest, macos-12, macos-14, windows-latest] | ||
| python-version: ["3.9", "3.10", "3.11", "3.12"] | ||
| steps: | ||
| - name: Check out PyBaMM repository | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Install Linux system dependencies | ||
| if: matrix.os == 'ubuntu-latest' | ||
| run: | | ||
| sudo apt-get update | ||
| sudo apt-get install gfortran gcc graphviz pandoc libopenblas-dev texlive-latex-extra dvipng | ||
| - name: Install macOS system dependencies | ||
| if: matrix.os == 'macos-12' || matrix.os == 'macos-14' | ||
| env: | ||
| HOMEBREW_NO_INSTALL_CLEANUP: 1 | ||
| HOMEBREW_NO_AUTO_UPDATE: 1 | ||
| HOMEBREW_NO_COLOR: 1 | ||
| # Speed up CI | ||
| NONINTERACTIVE: 1 | ||
| # sometimes gfortran cannot be found, so reinstall gcc just to be sure | ||
| run: | | ||
| brew analytics off | ||
| brew install graphviz | ||
| brew reinstall gcc | ||
| - name: Install Windows system dependencies | ||
| if: matrix.os == 'windows-latest' | ||
| run: choco install graphviz --version=8.0.5 | ||
|
|
||
| - name: Set up Python ${{ matrix.python-version }} | ||
| uses: actions/setup-python@v5 | ||
| with: | ||
| python-version: ${{ matrix.python-version }} | ||
|
|
||
| - name: Install nox | ||
| run: python -m pip install nox | ||
|
|
||
| - name: Install SuiteSparse and SUNDIALS on GNU/Linux and macOS | ||
| timeout-minutes: 10 | ||
| if: matrix.os != 'windows-latest' | ||
| run: python -m nox -s pybamm-requires | ||
|
|
||
| - name: Run integration tests for ${{ matrix.os }} with Python ${{ matrix.python-version }} | ||
| run: python -m nox -s integration | ||
|
|
||
| # Skips IDAKLU module compilation for speedups, which is already tested in other jobs. | ||
| run_doctests: | ||
| runs-on: ubuntu-latest | ||
| name: Doctests (ubuntu-latest / Python 3.11) | ||
|
|
||
| steps: | ||
| - name: Check out PyBaMM repository | ||
| uses: actions/checkout@v4 | ||
|
|
@@ -179,9 +105,9 @@ jobs: | |
| - name: Install Linux system dependencies | ||
| run: | | ||
| sudo apt-get update | ||
| sudo apt-get install graphviz pandoc libopenblas-dev texlive-latex-extra dvipng | ||
| sudo apt-get install graphviz pandoc texlive-latex-extra dvipng | ||
| - name: Set up Python 3.11 | ||
| - name: Set up Python | ||
| uses: actions/setup-python@v5 | ||
| with: | ||
| python-version: 3.11 | ||
|
|
@@ -250,52 +176,3 @@ jobs: | |
|
|
||
| - name: Run example scripts tests for GNU/Linux with Python 3.12 | ||
| run: python -m nox -s scripts | ||
|
|
||
| # M-series Mac Mini | ||
| build-apple-mseries: | ||
| if: github.repository_owner == 'pybamm-team' | ||
| runs-on: [self-hosted, macOS, ARM64] | ||
| env: | ||
| GITHUB_PATH: ${PYENV_ROOT/bin:$PATH} | ||
| LD_LIBRARY_PATH: $HOME/.local/lib | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| python-version: ["3.9", "3.10", "3.11", "3.12"] | ||
|
|
||
| steps: | ||
| - name: Check out PyBaMM repository | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Install Python & create virtualenv | ||
| shell: bash | ||
| run: | | ||
| eval "$(pyenv init -)" | ||
| pyenv install ${{ matrix.python-version }} -s | ||
| pyenv virtualenv ${{ matrix.python-version }} pybamm-${{ matrix.python-version }} | ||
| - name: Install build-time dependencies & run unit tests for M-series macOS runner | ||
| shell: bash | ||
| env: | ||
| HOMEBREW_NO_INSTALL_CLEANUP: 1 | ||
| NONINTERACTIVE: 1 | ||
| run: | | ||
| eval "$(pyenv init -)" | ||
| pyenv activate pybamm-${{ matrix.python-version }} | ||
| python -m pip install --upgrade pip nox | ||
| python -m nox -s pybamm-requires -- --force | ||
| python -m nox -s unit | ||
| - name: Run integration tests for M-series macOS runner | ||
| run: | | ||
| eval "$(pyenv init -)" | ||
| pyenv activate pybamm-${{ matrix.python-version }} | ||
| python -m nox -s integration | ||
| - name: Uninstall pyenv-virtualenv & Python | ||
| if: always() | ||
| shell: bash | ||
| run: | | ||
| eval "$(pyenv init -)" | ||
| pyenv activate pybamm-${{ matrix.python-version }} | ||
| pyenv uninstall -f $( python --version ) | ||
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 |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| # This workflow uses actions that are not certified by GitHub. They are provided | ||
| # by a third-party and are governed by separate terms of service, privacy | ||
| # policy, and support documentation. | ||
|
|
||
| name: Scorecard supply-chain security | ||
| on: | ||
| # For Branch-Protection check. Only the default branch is supported. See | ||
| # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection | ||
| branch_protection_rule: | ||
| # To guarantee Maintained check is occasionally updated. See | ||
| # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained | ||
| schedule: | ||
| - cron: '25 3 * * 5' | ||
| push: | ||
| branches: [ "develop", "main" ] | ||
|
|
||
| # Declare default permissions as read only. | ||
| permissions: read-all | ||
|
|
||
| jobs: | ||
| analysis: | ||
| name: Scorecard analysis | ||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| # Needed to upload the results to code-scanning dashboard. | ||
| security-events: write | ||
| # Needed to publish results and get a badge (see publish_results below). | ||
| id-token: write | ||
| # Uncomment the permissions below if installing in a private repository. | ||
| # contents: read | ||
| # actions: read | ||
|
|
||
| steps: | ||
| - name: "Checkout code" | ||
| uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 | ||
| with: | ||
| persist-credentials: false | ||
|
|
||
| - name: "Run analysis" | ||
| uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3 | ||
| with: | ||
| results_file: results.sarif | ||
| results_format: sarif | ||
| # (Optional) "write" PAT token. Uncomment the `repo_token` line below if: | ||
| # - you want to enable the Branch-Protection check on a *public* repository, or | ||
| # - you are installing Scorecard on a *private* repository | ||
| # To create the PAT, follow the steps in https://github.com/ossf/scorecard-action?tab=readme-ov-file#authentication-with-fine-grained-pat-optional. | ||
| # repo_token: ${{ secrets.SCORECARD_TOKEN }} | ||
|
|
||
| # Public repositories: | ||
| # - Publish results to OpenSSF REST API for easy access by consumers | ||
| # - Allows the repository to include the Scorecard badge. | ||
| # - See https://github.com/ossf/scorecard-action#publishing-results. | ||
| # For private repositories: | ||
| # - `publish_results` will always be set to `false`, regardless | ||
| # of the value entered here. | ||
| publish_results: true | ||
|
|
||
| # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF | ||
| # format to the repository Actions tab. | ||
| - name: "Upload artifact" | ||
| uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4 | ||
| with: | ||
| name: SARIF file | ||
| path: results.sarif | ||
| retention-days: 5 | ||
|
|
||
| # Upload the results to GitHub's code scanning dashboard (optional). | ||
| # Commenting out will disable upload of results to your repo's Code Scanning dashboard | ||
| - name: "Upload to code-scanning" | ||
| uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 | ||
| with: | ||
| sarif_file: results.sarif |
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.