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

update leaflet-splitmap to v1.0.3 #1135

Merged
merged 7 commits into from
Sep 8, 2023

Conversation

oxidase
Copy link
Contributor

@oxidase oxidase commented Sep 7, 2023

Fixes: #1066

Screen.Recording.2023-09-07.at.15.29.04.mov

@martinRenou fyi

@martinRenou
Copy link
Member

Neat!! I guess the CI failure is very much unrelated. I'm surprised there is no change in the package-lock/yarn.lock (whichever lives on this repository)

@oxidase
Copy link
Contributor Author

oxidase commented Sep 7, 2023

added yarn.lock changes

@giswqs
Copy link
Contributor

giswqs commented Sep 7, 2023

Thank you for fixing this. Can't wait for the split-map to work again!

@oxidase oxidase force-pushed the update/leaflet-splitmap branch 4 times, most recently from 5506a80 to c0bc542 Compare September 7, 2023 21:34
@oxidase
Copy link
Contributor Author

oxidase commented Sep 8, 2023

@martinRenou 2 of 4 tasks fail. I have no spare time to check issues. anyways, macos issue is related to mamba setup and was able to reproduce locally as

[UI Tests/Visual Regression]   🚧  ::warning::    from mamba.mamba import main%0A  File "/root/miniconda3/lib/python3.11/site-packages/mamba/mamba.py", line 49, in <module>%0A    import libmambapy as api%0A  File "/root/miniconda3/lib/python3.11/site-packages/libmambapy/__init__.py", line 7, in <module>%0A    raise e%0A  File "/root/miniconda3/lib/python3.11/site-packages/libmambapy/__init__.py", line 4, in <module>%0A    from libmambapy.bindings import *  # noqa: F401,F403%0A    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^%0AImportError: libarchive.so.13: cannot open shared object file: No such file or directory%0A
|     from mamba.mamba import main
|   File "/root/miniconda3/lib/python3.11/site-packages/mamba/mamba.py", line 49, in <module>
|     import libmambapy as api
|   File "/root/miniconda3/lib/python3.11/site-packages/libmambapy/__init__.py", line 7, in <module>
|     raise e
|   File "/root/miniconda3/lib/python3.11/site-packages/libmambapy/__init__.py", line 4, in <module>
|     from libmambapy.bindings import *  # noqa: F401,F403
|     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
| ImportError: libarchive.so.13: cannot open shared object file: No such file or directory

ui-tests is something that I was not able to reproduce locally. It looks like yarn.lock is changed and ipyleaflet-ui-tests@workspace:. is missing 🤔

@martinRenou
Copy link
Member

martinRenou commented Sep 8, 2023

For the UI-tests, what you can do is try to revert @jupyterlab/builder dependency change and make sure to use JupyterLab 3 in the CI. The issue is that UI-tests (and other things) will need to be updated to work against JupyterLab 4 for the dev setup. Pinning JupyterLab 3 in the CI does not mean ipyleaflet will not work in JupyterLab 4 in userland, so we're good to pin it for now.

Concerning the libmamba thingy, I feel like we should use micromamba in the CI instead of conda/mamba using this action: https://github.com/mamba-org/setup-micromamba

@oxidase oxidase force-pushed the update/leaflet-splitmap branch 2 times, most recently from 56503f1 to 54a10f0 Compare September 8, 2023 08:57
@oxidase
Copy link
Contributor Author

oxidase commented Sep 8, 2023

@martinRenou gotcha, I set requirements to jupyterlab~=3.0 everywhere.

But with v3.6.5 the docs build fails as

      ModuleNotFoundError: Module not found: Error: Can't resolve 'svg-url-loader' in '/home/docs/checkouts/readthedocs.org/user_builds/ipyleaflet/checkouts/1135/js'

and this does not happen for jupyterlab v4.0.5. Do you have any hints how to fix it?

Dependencies are

"@jupyterlab/builder@^4.0.0":
  version "4.0.5"
  resolved "https://registry.yarnpkg.com/@jupyterlab/builder/-/builder-4.0.5.tgz#5cd9e32b916cd7064108c65f5ec52d6f49a8a6b6"
  integrity sha512-rypdRtkDvoq1nt7WqbYwTBCCumFPceUxvUW9J9Xe3KaScnk/BoveV9D+oRSHNl8okDdJZLkgS99UT4mC0ysduw==
  dependencies:
    "@lumino/algorithm" "^2.0.1"
    "@lumino/application" "^2.2.1"
    "@lumino/commands" "^2.1.3"
    "@lumino/coreutils" "^2.1.2"
    "@lumino/disposable" "^2.1.2"
    "@lumino/domutils" "^2.0.1"
    "@lumino/dragdrop" "^2.1.3"
    "@lumino/messaging" "^2.0.1"
    "@lumino/properties" "^2.0.1"
    "@lumino/signaling" "^2.1.2"
    "@lumino/virtualdom" "^2.0.1"
    "@lumino/widgets" "^2.3.0"
    ajv "^8.12.0"
    commander "^9.4.1"
    css-loader "^6.7.1"
    duplicate-package-checker-webpack-plugin "^3.0.0"
    fs-extra "^10.1.0"
    glob "~7.1.6"
    license-webpack-plugin "^2.3.14"
    mini-css-extract-plugin "^2.7.0"
    mini-svg-data-uri "^1.4.4"
    path-browserify "^1.0.0"
    process "^0.11.10"
    source-map-loader "~1.0.2"
    style-loader "~3.3.1"
    supports-color "^7.2.0"
    terser-webpack-plugin "^5.3.7"
    webpack "^5.76.1"
    webpack-cli "^5.0.1"
    webpack-merge "^5.8.0"
    worker-loader "^3.0.2"

vs

"@jupyterlab/builder@^3.0.0":
  version "3.4.5"
  resolved "https://registry.yarnpkg.com/@jupyterlab/builder/-/builder-3.4.5.tgz#4324eb4152d3d815bdd96a3bd42661e799df1195"
  integrity sha512-VT84I7BB55P5CSDNAH+87iDRIOfU017J3L9779cnsHyJhx5RSroGTMgBnBv27vUMRVhz572ogzifki6CSs1Q6Q==
  dependencies:
    "@jupyterlab/buildutils" "^3.4.5"
    "@lumino/algorithm" "^1.9.0"
    "@lumino/application" "^1.27.0"
    "@lumino/commands" "^1.19.0"
    "@lumino/coreutils" "^1.11.0"
    "@lumino/disposable" "^1.10.0"
    "@lumino/domutils" "^1.8.0"
    "@lumino/dragdrop" "^1.13.0"
    "@lumino/messaging" "^1.10.0"
    "@lumino/properties" "^1.8.0"
    "@lumino/signaling" "^1.10.0"
    "@lumino/virtualdom" "^1.14.0"
    "@lumino/widgets" "^1.33.0"
    ajv "^6.12.3"
    commander "~6.0.0"
    css-loader "^5.0.1"
    duplicate-package-checker-webpack-plugin "^3.0.0"
    file-loader "~6.0.0"
    fs-extra "^9.0.1"
    glob "~7.1.6"
    license-webpack-plugin "^2.3.14"
    mini-css-extract-plugin "~1.3.2"
    path-browserify "^1.0.0"
    process "^0.11.10"
    raw-loader "~4.0.0"
    style-loader "~2.0.0"
    supports-color "^7.2.0"
    svg-url-loader "~6.0.0"
    terser-webpack-plugin "^4.1.0"
    to-string-loader "^1.1.6"
    url-loader "~4.1.0"
    webpack "^5.41.1"
    webpack-cli "^4.1.0"
    webpack-merge "^5.1.2"
    worker-loader "^3.0.2"

@oxidase
Copy link
Contributor Author

oxidase commented Sep 8, 2023

@martinRenou 3 check out of 4 pass 🎉

Additionally I had to:

  • pin jupyterlab in dev and docs environments to 3.6.x
  • pin yarn in docs environment to 1.x to solve Can't resolve 'svg-url-loader' issue
  • disabled notifications addon as it produces for the first DivIcon test
    light--DivIcon-ipynb-cell-0-actual

@martinRenou
Copy link
Member

Great! Thanks! Would it help if I push a commit to try and fix the latest build?

@oxidase oxidase mentioned this pull request Sep 8, 2023
@oxidase
Copy link
Contributor Author

oxidase commented Sep 8, 2023

@martinRenou sure, that would be great!

I opened #1136 on top of this PR but don't hesitate to push into this PR to make CI green

@martinRenou
Copy link
Member

Ok, let's merge this one as is, and see if your other PR gets everything green!

Thanks a lot for your work!

Copy link
Member

@martinRenou martinRenou left a comment

Choose a reason for hiding this comment

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

Thanks!

@martinRenou martinRenou merged commit 8cdf572 into jupyter-widgets:master Sep 8, 2023
2 of 3 checks passed
@oxidase oxidase deleted the update/leaflet-splitmap branch September 8, 2023 15:22
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.

SplitMapControl not working locally
3 participants