Skip to content

Run Python tests on MacOS with Python 12, replace canvas with jest-canvas-mock - #16314

Merged
krassowski merged 6 commits into
jupyterlab:mainfrom
krassowski:macos-python-12
May 15, 2024
Merged

Run Python tests on MacOS with Python 12, replace canvas with jest-canvas-mock#16314
krassowski merged 6 commits into
jupyterlab:mainfrom
krassowski:macos-python-12

Conversation

@krassowski

@krassowski krassowski commented May 10, 2024 •
edited
Loading

Copy link
Copy Markdown
Member

References

Code changes

None

User-facing changes

None

Backwards-incompatible changes

None

@jupyterlab-probot

jupyterlab-probot Bot commented May 10, 2024

Copy link
Copy Markdown

Thanks for making a pull request to jupyterlab!
To try out this branch on binder, follow this link: Binder

@krassowski krassowski mentioned this pull request May 10, 2024
Closed
@krassowski krassowski changed the title Run some tests on MacOS with Python 12 Run Python tests on MacOS with Python 12, replace canvas with jest-canvas-mock May 10, 2024
@krassowski

krassowski commented May 10, 2024

Copy link
Copy Markdown
Member Author

It looks like vega5 needs it to. Should we just add it to @jupyterlab/testing package or is there value in only having this in individual packages?

@krassowski
krassowski marked this pull request as ready for review May 10, 2024 20:05
@krassowski

krassowski commented May 10, 2024

Copy link
Copy Markdown
Member Author

@ericsnekbytes you may want to try out this branch - it is passing on CI already

@ericsnekbytes

ericsnekbytes commented May 14, 2024

Copy link
Copy Markdown
Contributor

@krassowski Just built this locally and it worked :) Thanks for your work on this!

@krassowski

krassowski commented May 14, 2024

Copy link
Copy Markdown
Member Author

Great! Can you tick the "Approve" on GitHub review just so that it does not show up as unreviewed later?

@ericsnekbytes
ericsnekbytes self-requested a review May 14, 2024 15:11
ericsnekbytes
ericsnekbytes approved these changes May 14, 2024
View reviewed changes

@ericsnekbytes ericsnekbytes left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Successfully tested this locally.

@krassowski
krassowski merged commit 2d7b0ca into jupyterlab:main May 15, 2024
@krassowski krassowski mentioned this pull request Jun 3, 2024
Closed
@krassowski

krassowski commented Jun 3, 2024

Copy link
Copy Markdown
Member Author

@meeseeksdev please backport to 4.2.x to address #16415

@lumberbot-app

lumberbot-app Bot commented Jun 3, 2024

Copy link
Copy Markdown

Something went wrong ... Please have a look at my logs.

It seems that the branch you are trying to backport to does not exist.

@krassowski

krassowski commented Jun 3, 2024

Copy link
Copy Markdown
Member Author

@meeseeksdev please backport to 4.2.x

meeseeksmachine pushed a commit to meeseeksmachine/jupyterlab that referenced this pull request Jun 3, 2024
@krassowski @meeseeksmachine
Backport PR jupyterlab#16314: Run Python tests on MacOS with Python 1…
8ff259e 
…2, replace `canvas` with `jest-canvas-mock`
@meeseeksmachine meeseeksmachine mentioned this pull request Jun 3, 2024
Merged
@krassowski krassowski mentioned this pull request Jun 4, 2024
Merged
krassowski added a commit that referenced this pull request Jun 5, 2024
@meeseeksmachine @krassowski
Backport PR #16314: Run Python tests on MacOS with Python 12, replace…
7d7053d 
… `canvas` with `jest-canvas-mock` (#16418)

Co-authored-by: Michał Krassowski <5832902+krassowski@users.noreply.github.com>
@krassowski

krassowski commented Jun 19, 2024

Copy link
Copy Markdown
Member Author

Backporting to 3.6.x too because currently the CI is failing completely as seen in #16463

@meeseeksdev please backport to 3.6.x

@lumberbot-app

lumberbot-app Bot commented Jun 19, 2024

Copy link
Copy Markdown

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout 3.6.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 2d7b0ca20a20c22dcdbea2128ac8dfcd39770c6a
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #16314: Run Python tests on MacOS with Python 12, replace `canvas` with `jest-canvas-mock`'
  1. Push to a named branch:
git push YOURFORK 3.6.x:auto-backport-of-pr-16314-on-3.6.x
  1. Create a PR against branch 3.6.x, I would have named this PR:

"Backport PR #16314 on branch 3.6.x (Run Python tests on MacOS with Python 12, replace canvas with jest-canvas-mock)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

krassowski added a commit to krassowski/jupyterlab that referenced this pull request Jun 19, 2024
@krassowski
Backport PR jupyterlab#16314: Run Python tests on MacOS with Python 1…
df727ae 
…2, replace `canvas` with `jest-canvas-mock`
@krassowski krassowski mentioned this pull request Jun 19, 2024
Merged
krassowski added a commit to krassowski/jupyterlab that referenced this pull request Jun 19, 2024
@krassowski
Backport PR jupyterlab#16314: Run Python tests on MacOS with Python 1…
0a08eee 
…2, replace `canvas` with `jest-canvas-mock`
krassowski added a commit to krassowski/jupyterlab that referenced this pull request Jun 19, 2024
@krassowski
Backport PR jupyterlab#16314: Run Python tests on MacOS with Python 1…
676d153 
…2, replace `canvas` with `jest-canvas-mock`
krassowski added a commit that referenced this pull request Jun 19, 2024
@krassowski
Backport PR #16314: Run Python tests on MacOS with Python 12, replace…
7b80cf9 
… `canvas` with `jest-canvas-mock` (#16501)
ImpSy pushed a commit to spotinst/jupyterlab that referenced this pull request Jan 7, 2025
@krassowski @ImpSy
Run Python tests on MacOS with Python 12, replace canvas with `jest…
c66a0f2 
…-canvas-mock` (jupyterlab#16314)

* Run some tests on MacOS with Python 12

* Replace dev dependency on `canvas` with `jest-canvas-mock`

* Remove mentions of node-gyp and canvas from docs

* Add jest-canvas-mock to vega5-extension

* Skip fragments of vega tests which require canvas

* Update benchmark snapshots
@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Jun 20, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer
@ericsnekbytes ericsnekbytes ericsnekbytes approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@krassowski krassowski

Labels

documentation maintenance pkg:csvviewer pkg:debugger pkg:terminal pkg:vega tag:Testing

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Error during build steps on macos

2 participants

@krassowski @ericsnekbytes