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

Use M1 resource class for macos builds on CircleCI #1374

Merged

Conversation

arcondello
Copy link
Member

@arcondello arcondello commented Jun 24, 2024

I'll uncap the NumPy version in another PR (i.e., #1373).

See also dwavesystems/dwave-ocean-sdk#294.

@arcondello arcondello requested a review from randomir June 24, 2024 21:19
@arcondello arcondello marked this pull request as ready for review June 24, 2024 21:19
Copy link

codecov bot commented Jun 24, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 94.82%. Comparing base (238914c) to head (9382aa5).

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #1374   +/-   ##
=======================================
  Coverage   94.82%   94.82%           
=======================================
  Files          97       97           
  Lines       10368    10368           
=======================================
  Hits         9831     9831           
  Misses        537      537           

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

Copy link
Member

@randomir randomir left a comment

Choose a reason for hiding this comment

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

lgtm

@@ -259,7 +267,7 @@ jobs:
python -m venv env
. env/bin/activate
pip install dimod --no-index -f dist/ --force-reinstall --no-deps
pip install << parameters.dependencies >> --upgrade --only-binary=numpy
pip install "<< parameters.dependencies >>" --upgrade --only-binary=numpy
Copy link
Member

Choose a reason for hiding this comment

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

I recommend quoting individual specifiers -- below in the list of parameter values -- not the parameter value here. That way you can use multiple specifiers per parameter (e.g. "'numpy<2' scipy~=1.0"). For example, see cloud-client's config, or dwave-inspector's one.

Alternatively, you can use tilde in version specifier, and avoid quoting altogether.

Copy link
Member Author

Choose a reason for hiding this comment

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

I will likely revert this commit as part of the NumPy 2.0 PR, so I will leave it be for now.

@@ -3,6 +3,7 @@ version: 2.1
orbs:
codecov: codecov/codecov@3
win: circleci/windows@5.0.0
macos: circleci/macos@2.4.1
Copy link
Member

Choose a reason for hiding this comment

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

It's probably fine to reduce precision to minor or major version here, that way the latest is used.

@arcondello arcondello merged commit ad9fe26 into dwavesystems:main Jun 25, 2024
37 checks passed
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