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.

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

Re-enable testing on both macOS amd64 and macOS arm64 #308

Merged

Conversation

agriyakhetarpal
Copy link
Member

@agriyakhetarpal agriyakhetarpal commented Apr 25, 2024

Description

macos-latest is now macos-14 (change of architecture from amd64 to arm64). macos-13 is the last version to support Intel runners.

Issue reference

N/A

Review

Before you mark your PR as ready for review, please ensure that you've considered the following:

  • Updated the CHANGELOG.md in reverse chronological order (newest at the top) with a concise description of the changes, including the PR number.
  • Noted any breaking changes, including details on how it might impact existing functionality.

Type of change

  • New Feature: A non-breaking change that adds new functionality.
  • Optimization: A code change that improves performance.
  • Examples: A change to existing or additional examples.
  • Bug Fix: A non-breaking change that addresses an issue.
  • Documentation: Updates to documentation or new documentation for new features.
  • Refactoring: Non-functional changes that improve the codebase.
  • Style: Non-functional changes related to code style (formatting, naming, etc).
  • Testing: Additional tests to improve coverage or confirm functionality.
  • Other: infrastructure and other changes related to CI

Key checklist:

  • No style issues: $ pre-commit run (or $ nox -s pre-commit) (see CONTRIBUTING.md for how to set this up to run automatically when committing locally, in just two lines of code)
  • All unit tests pass: $ nox -s tests
  • The documentation builds: $ nox -s doctest

You can run integration tests, unit tests, and doctests together at once, using $ nox -s quick.

Further checks:

  • Code is well-commented, especially in complex or unclear areas.
  • Added tests that prove my fix is effective or that my feature works.
  • Checked that coverage remains or improves, and added tests if necessary to maintain or increase coverage.

Thank you for contributing to our project! Your efforts help us to deliver great software.

Copy link

codecov bot commented Apr 25, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 95.80%. Comparing base (3ddcb95) to head (f6b18c0).
Report is 1 commits behind head on develop.

Additional details and impacted files
@@           Coverage Diff            @@
##           develop     #308   +/-   ##
========================================
  Coverage    95.80%   95.80%           
========================================
  Files           38       38           
  Lines         2048     2048           
========================================
  Hits          1962     1962           
  Misses          86       86           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@agriyakhetarpal
Copy link
Member Author

Note to self: fix or revise the filter_pybamm_matrix job (not sure what it's doing at the moment)

@agriyakhetarpal agriyakhetarpal marked this pull request as ready for review May 1, 2024 14:29
@agriyakhetarpal
Copy link
Member Author

agriyakhetarpal commented May 1, 2024

Ready for review, now, @BradyPlanden! I fixed the current failures in the scheduled tests – they were coming because we weren't installing nox[uv], so I added a failsafe as well so that virtualenv can be used if someone forgets to install nox locally with the extra.

I filtered the JSON again because it turned out that the self-hosted runner does not need the OS entry from the matrix either, it just requires the Python and PyBaMM versions. I triggered a run from this branch on my fork just to make sure everything is working: https://github.com/agriyakhetarpal/PyBOP/actions/runs/8910634962 (note that the self-hosted runner relies on filter_pybamm_matrix now, which relies on create_pybamm_matrix, but the regular tests on GitHub-hosted runners do not need the JSON configuration from that job). It might make sense to move the contents of build_matrix.sh directly into the workflow, it's one less file we need to place in the repository. Also, should I add a CHANGELOG entry?

Copy link
Member

@BradyPlanden BradyPlanden left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the additions @agriyakhetarpal. One comment on the use of quotes, otherwise lgtm. If you could add a changelog to restore the scheduled tests and update the MacOS entries, including the addition of testing on 3.9 & 3.10 for MacOS arm64, that would be great!

.github/workflows/scheduled_tests.yaml Outdated Show resolved Hide resolved
@BradyPlanden BradyPlanden merged commit 490273b into pybop-team:develop May 7, 2024
29 checks passed
@agriyakhetarpal agriyakhetarpal deleted the fix-macos-workflow-entries branch May 7, 2024 21:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants