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 to Jupyterlab 3.0 #818

Merged
merged 19 commits into from
Jan 20, 2021
Merged

Update to Jupyterlab 3.0 #818

merged 19 commits into from
Jan 20, 2021

Conversation

ajbozarth
Copy link
Member

@ajbozarth ajbozarth commented Nov 3, 2020

Update to support Jupyterlab 3.0 and addresses any issues accosted with that update.

Currently in draft until final release when this will be updated.

This PR is paired with jupyter/nbdime#551 which is require to test this, including a temporary 1 line hard-coded local import of nbdime

Fixes #779

Updates to rc6 and also increments version number for testing
so tests will run properly in CI
@ajbozarth
Copy link
Member Author

note: CI will fail until nbdime PR is merged and released

Copy link
Member

@fcollonval fcollonval 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 starting this @ajbozarth

I push some suggestions to correct the version number to match the current policy.

jupyterlab_git/_version.py Outdated Show resolved Hide resolved
package.json Outdated Show resolved Hide resolved
package.json Outdated Show resolved Hide resolved
@ianhi
Copy link
Collaborator

ianhi commented Nov 4, 2020

I think we should also turn this into a federated extension to eliminate the build step on installation. I may be wrong but this doesn't currently take that approach? Thoughts on this?

(Also hooray! and thanks for tackling this 😄 )

@ajbozarth
Copy link
Member Author

I think we should also turn this into a federated extension

I agree, but I believe that initially just updating to 3.0 as a normal extension to be release same day as jupyterlab 3.0 then following up with an update to a federated extension later is the safer option and will cause less delays to users who want to switch to 3.0

ajbozarth and others added 2 commits November 9, 2020 10:00
Co-authored-by: Frédéric Collonval <[email protected]>
Co-authored-by: Frédéric Collonval <[email protected]>
setup.py Outdated Show resolved Hide resolved
@ajbozarth
Copy link
Member Author

recently update the nbdime PR and requested a rc, once an nbdime rc is released I'll update this PR

@ajbozarth ajbozarth marked this pull request as ready for review January 12, 2021 01:58
@ajbozarth
Copy link
Member Author

I've pushed some updates so we can get some review started on this before the nbdime pr is published. Currently the tests are broken and I'm open to others pushing to this PR to address them if you have ideas.

As for checking out and running this PR, you will need to also checkout and build the linked nbdime PR and update the package.json here to the relative location of that project on your machine for this to work.

@ajbozarth
Copy link
Member Author

just pushed an update to use the nbdime beta, this PR should now be usable without needing to install a local dev instance of nbdime

@fcollonval fcollonval self-requested a review January 15, 2021 13:15
@fcollonval
Copy link
Member

Thanks @ajbozarth

We are almost there. There is only one fix to figure out why looking into the React tree is not working anymore. Happy to get some help on that one.

setup.py Outdated
@@ -66,7 +66,7 @@
long_description_content_type="text/markdown",
cmdclass=cmdclass,
packages=setuptools.find_packages(),
install_requires=["jupyter_server", "nbdime ~=3.0.0b1", "packaging", "pexpect"],
install_requires=["jupyter_server", "nbdime~=3.0.0b1", "jupyter_packaging~=0.7.9", "packaging", "pexpect"],
Copy link
Member

@fcollonval fcollonval Jan 16, 2021

Choose a reason for hiding this comment

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

Suggested change
install_requires=["jupyter_server", "nbdime~=3.0.0b1", "jupyter_packaging~=0.7.9", "packaging", "pexpect"],
install_requires=["jupyter_server", "nbdime~=3.0.0b1", "packaging", "pexpect"],

jupyter_packaging is not a install dependency but a setup one (only needed by dev'). We should add it to the extra requires - and probably rename it as dev rather than test as there are already other packages like pre-commit or black in there.

@meeseeksmachine
Copy link

This pull request has been mentioned on Jupyter Community Forum. There might be relevant details there:

https://discourse.jupyter.org/t/git-extension-for-jupyterlab-3/7569/2

@ajbozarth
Copy link
Member Author

@fcollonval @lresende thank you both for helping on this, is this good to merge now? If not what's left blocking it and releasing an rc or beta?

@fcollonval
Copy link
Member

@fcollonval @lresende thank you both for helping on this, is this good to merge now? If not what's left blocking it and releasing an rc or beta?

I'm ok to release a beta. For my information, on the nbdime front, what is missing to get a release?

@fcollonval fcollonval self-requested a review January 20, 2021 08:44
@fcollonval fcollonval merged commit a72d4b7 into jupyterlab:master Jan 20, 2021
@ajbozarth ajbozarth deleted the lab3 branch January 20, 2021 09:17
ianhi added a commit that referenced this pull request Mar 11, 2021
It seems to have been accidentally removed in #818
@ianhi ianhi mentioned this pull request Mar 11, 2021
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.

Update for jupyterlab 3
5 participants