Metadata-Version: 2.1 Name: jupyterlab_git Version: 0.50.0 Summary: A JupyterLab extension for version control using git Project-URL: Homepage, https://github.com/jupyterlab/jupyterlab-git Project-URL: Bug Tracker, https://github.com/jupyterlab/jupyterlab-git/issues Project-URL: Repository, https://github.com/jupyterlab/jupyterlab-git.git Author: Jupyter Development Team License: BSD 3-Clause License Copyright (c) 2020, Jupyter Development Team All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. License-File: LICENSE Classifier: Framework :: Jupyter Classifier: Framework :: Jupyter :: JupyterLab Classifier: Framework :: Jupyter :: JupyterLab :: 4 Classifier: Framework :: Jupyter :: JupyterLab :: Extensions Classifier: Framework :: Jupyter :: JupyterLab :: Extensions :: Prebuilt Classifier: License :: OSI Approved :: BSD License Classifier: Programming Language :: Python Classifier: Programming Language :: Python :: 3 Classifier: Programming Language :: Python :: 3.8 Classifier: Programming Language :: Python :: 3.9 Classifier: Programming Language :: Python :: 3.10 Classifier: Programming Language :: Python :: 3.11 Classifier: Programming Language :: Python :: 3.12 Requires-Python: >=3.8 Requires-Dist: jupyter-server<3,>=2.0.1 Requires-Dist: nbdime~=4.0.1 Requires-Dist: nbformat Requires-Dist: packaging Requires-Dist: pexpect Requires-Dist: traitlets~=5.0 Provides-Extra: dev Requires-Dist: black; extra == 'dev' Requires-Dist: jupyterlab~=4.0; extra == 'dev' Requires-Dist: pre-commit; extra == 'dev' Provides-Extra: test Requires-Dist: coverage; extra == 'test' Requires-Dist: hybridcontents; extra == 'test' Requires-Dist: jupytext; extra == 'test' Requires-Dist: pytest; extra == 'test' Requires-Dist: pytest-asyncio; extra == 'test' Requires-Dist: pytest-cov; extra == 'test' Requires-Dist: pytest-jupyter[server]>=0.6.0; extra == 'test' Provides-Extra: ui-tests Requires-Dist: jupyter-archive; extra == 'ui-tests' Description-Content-Type: text/markdown # jupyterlab-git [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/jupyterlab/jupyterlab-git/main?urlpath=lab/tree/examples/demo.ipynb) [![Github Actions Status](https://github.com/jupyterlab/jupyterlab-git/actions/workflows/build.yml/badge.svg)](https://github.com/jupyterlab/jupyterlab-git/actions/workflows/build.yml) [![Version](https://img.shields.io/npm/v/@jupyterlab/git.svg)](https://www.npmjs.com/package/@jupyterlab/git) [![Version](https://img.shields.io/pypi/v/jupyterlab-git.svg)](https://pypi.org/project/jupyterlab-git/) [![Downloads](https://img.shields.io/npm/dm/@jupyterlab/git.svg)](https://www.npmjs.com/package/@jupyterlab/git) [![Version](https://img.shields.io/conda/vn/conda-forge/jupyterlab-git.svg)](https://anaconda.org/conda-forge/jupyterlab-git) [![Downloads](https://img.shields.io/conda/dn/conda-forge/jupyterlab-git.svg)](https://anaconda.org/conda-forge/jupyterlab-git) [![All Contributors](https://img.shields.io/badge/all_contributors-30-orange.svg?style=flat-square)](#contributors-) A JupyterLab extension for version control using Git ![ui_glow_up](https://raw.githubusercontent.com/jupyterlab/jupyterlab-git/main/docs/figs/preview.gif) To see the extension in action, open the example notebook included in the Binder [demo](https://mybinder.org/v2/gh/jupyterlab/jupyterlab-git/main?urlpath=lab/tree/examples/demo.ipynb). ## Requirements - JupyterLab >= 4.0 ([older version] available for 2.x) - Git (version `>=2.x`) For older versions of JupyterLab, go to: - [3.x branch](https://github.com/jupyterlab/jupyterlab-git/tree/jlab-3) - [2.x branch](https://github.com/jupyterlab/jupyterlab-git/tree/jlab-2) ## Usage - Open the Git extension from the _Git_ tab on the left panel - [Set up authentication](#authentication-to-remote-repository-hosts) ## Install To install perform the following steps, with _pip_: ```bash pip install --upgrade "jupyterlab<4" jupyterlab-git ``` or with _conda_: ```bash conda install -c conda-forge "jupyterlab<4" jupyterlab-git ``` ## Uninstall To remove the extension, execute: ```bash pip uninstall jupyterlab_git ``` or with _conda_: ```bash conda remove jupyterlab-git ``` ## Settings ### Authentication to remote repository hosts If you are seeing errors similar to `[E yyyy-mm-dd hh:mm:ss ServerApp] 500 POST /git/` on the console which is running the JupyterLab server, you probably need to set up a credentials store for your local Git repository. This extension tries to handle credentials for HTTP(S) connections (if you don't have set up a credential manager). But not for other SSH connections. > For Windows users, it is recommended to install [git for windows](https://gitforwindows.org/). It will automatically set up a credential manager. > In order to connect to a remote host, it is recommended to use SSH. #### HTTP(S) protocol The extension can cache temporarily (by default for an hour) credentials. To use the caching, you will need to check the option _Save my login temporarily_ in the dialog asking your credentials. > You can set a longer cache timeout; see [Server Settings](#server-settings). > This is a new feature since v0.37.0 #### SSH protocol Here are the steps to follow to set up SSH authentication (skip any that is already accomplished for your project): 1. [Create a SSH key](https://docs.github.com/en/github/authenticating-to-github/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent) 2. Register the public part of it to your Git server: - [GitHub](https://docs.github.com/en/github/authenticating-to-github/connecting-to-github-with-ssh/adding-a-new-ssh-key-to-your-github-account) - [GitLab](https://docs.gitlab.com/ee/ssh/index.html#add-an-ssh-key-to-your-gitlab-account) 3. Optionally, if you have more than one key managed by your ssh agent: [Create a config file for the ssh-agent](https://stackoverflow.com/a/21938804) 4. Tell your local Git repository to [connect to remote via ssh](https://docs.github.com/en/get-started/getting-started-with-git/managing-remote-repositories#switching-remote-urls-from-https-to-ssh) You should now be able to pull and push committed changes to and from your remote repository using the respective buttons on the top of the extension's panel. ### UI Settings Once installed, extension behavior can be modified via the following settings which can be set in JupyterLab's advanced settings editor: - **blockWhileCommandExecutes**: suspend JupyterLab user interaction until Git commands (e.g., `commit`, `pull`, `reset`, `revert`) finish executing. Setting this to `true` helps mitigate potential race conditions leading to data loss, conflicts, and a broken Git history. Unless running a slow network, UI suspension should not interfere with standard workflows. Setting this to `false` allows for actions to trigger multiple concurrent Git actions. - **cancelPullMergeConflict**: cancel pulling changes from a remote repository if there exists a merge conflict. If set to `true`, when fetching and integrating changes from a remote repository, a conflicting merge is canceled and the working tree left untouched. - **commitAndPush**: Whether to trigger or not a push for each commit; default is `false`. - **disableBranchWithChanges**: disable all branch operations, such as creating a new branch or switching to a different branch, when there are changed/staged files. When set to `true`, this setting guards against overwriting and/or losing uncommitted changes. - **displayStatus**: display Git extension status updates in the JupyterLab status bar. If `true`, the extension displays status updates in the JupyterLab status bar, such as when pulling and pushing changes, switching branches, and polling for changes. Depending on the level of extension activity, some users may find the status updates distracting. In which case, setting this to `false` should reduce visual noise. - **doubleClickDiff**: double click a file in the Git extension panel to open a diff of the file instead of opening the file for editing. - **historyCount**: number of commits shown in the history log, beginning with the most recent. Displaying a larger number of commits can lead to performance degradation, so use caution when modifying this setting. - **promptUserIdentity**: Whether to prompt for user name and email on every commit. - **refreshIfHidden**: whether to refresh even if the Git tab is hidden; default to `false` (i.e. refresh is turned off if the Git tab is hidden). - **refreshInterval**: number of milliseconds between polling the file system for changes. In order to ensure that the UI correctly displays the current repository status, the extension must poll the file system for changes. Longer polling times increase the likelihood that the UI does not reflect the current status; however, longer polling times also incur less performance overhead. - **simpleStaging**: enable a simplified concept of staging. When this setting is `true`, all files with changes are automatically staged. When we develop in JupyterLab, we often only care about what files have changed (in the broadest sense) and don't need to distinguish between "tracked" and "untracked" files. Accordingly, this setting allows us to simplify the visual presentation of changes, which is especially useful for those less acquainted with Git. ### Server Settings - `JupyterLabGit.actions.post_init`: Set post _git init_ actions. It is possible to provide a list of commands to be executed in a folder after it is initialized as Git repository. - `JupyterLabGit.credential_helper`: Git credential helper to set to cache the credentials. The default value is `cache --timeout=3600` to cache the credentials for an hour. If you want to cache them for 10 hours, set `cache --timeout=36000`. - `JupyterLabGit.excluded_paths`: Set path patterns to exclude from this extension. You can use wildcard and interrogation mark for respectively everything or any single character in the pattern. - `JupyterLabGit.git_command_timeout_s`: Set the timeout for git operations. Defaults to 20 seconds.
How to set server settings? In `$HOME/.jupyter/jupyter_notebook_config.py` (on Windows `%USERPROFILE%/.jupyter/jupyter_notebook_config.py`): ```python c.JupyterLabGit.actions = {"post_init": ["touch dummy_init.dat"]} c.JupyterLabGit.credential_helper = 'cache --timeout=3600' ``` Or equivalently in `$HOME/.jupyter/jupyter_notebook_config.json` (on Windows `%USERPROFILE%/.jupyter/jupyter_notebook_config.json`): ```json { "JupyterLabGit": { "actions": { "post_init": ["touch dummy_init.dat"] }, "credential_helper": "cache --timeout=3600" } } ```
## Troubleshoot If you are seeing the frontend extension, but it is not working, check that the server extension is enabled: ```bash jupyter server extension list ``` If the server extension is installed and enabled, but you are not seeing the frontend extension, check the frontend extension is installed: ```bash jupyter labextension list ``` If they do not match or one is missing, please [reinstall the package](README.md#Install).
the Git panel does not recognize that you are in a Git repository. Possible fixes: - Be sure to be in a Git repository in the filebrowser tab - Check the server log. If you see a warning with a 404 code similar to: `[W 00:27:41.800 LabApp] 404 GET /git/settings?version=0.20.0` Explicitly enable the server extension by running: ```bash jupyter server extension enable --py jupyterlab_git ``` - If you are using JupyterHub or some other technologies requiring an initialization script which includes the jupyterlab-git extension, be sure to install both the frontend and the server extension **before** launching JupyterLab.
the Git panel is not visible. Possible fixes: - Check that the JupyterLab extension is installed: ```bash jupyter labextension list ``` If you don't see `@jupyterlab/git v... enabled OK` in the list, explicitly install the jupyter labextension by running: ```bash jupyter labextension install @jupyterlab/git ``` If you see `@jupyterlab/git` under `Uninstalled core extensions: `, your installation may have been corrupted. You can run `jupyter lab clean --all` and reinstall all your extensions.
## Contributing If you would like to contribute to the project, please read our [contributor documentation](https://github.com/jupyterlab/jupyterlab/blob/main/CONTRIBUTING.md). JupyterLab follows the official [Jupyter Code of Conduct](https://github.com/jupyter/governance/blob/main/conduct/code_of_conduct.md). ### Development install Note: You will need NodeJS to build the extension package. The `jlpm` command is JupyterLab's pinned version of [yarn](https://yarnpkg.com/) that is installed with JupyterLab. You may use `yarn` or `npm` in lieu of `jlpm` below. ```bash # Clone the repo to your local environment git clone https://github.com/jupyterlab/jupyterlab-git.git # Change directory to the jupyterlab-git directory cd jupyterlab-git # Install package in development mode pip install -e ".[dev,test]" pre-commit install # Link your development version of the extension with JupyterLab jupyter labextension develop . --overwrite # Server extension must be manually installed in develop mode jupyter server extension enable jupyterlab_git # Rebuild extension Typescript source after making changes jlpm run build ``` You can watch the source directory and run JupyterLab at the same time in different terminals to watch for changes in the extension's source and automatically rebuild the extension. ```bash # Watch the source directory in one terminal, automatically rebuilding when needed jlpm run watch # Run JupyterLab in another terminal jupyter lab ``` With the watch command running, every saved change will immediately be built locally and available in your running JupyterLab. Refresh JupyterLab to load the change in your browser (you may need to wait several seconds for the extension to be rebuilt). By default, the `jlpm run build` command generates the source maps for this extension to make it easier to debug using the browser dev tools. To also generate source maps for the JupyterLab core extensions, you can run the following command: ```bash jupyter lab build --minimize=False ``` ### Development uninstall ```bash # Server extension must be manually disabled in develop mode jupyter server extension disable jupyterlab_git pip uninstall jupyterlab_git ``` In development mode, you will also need to remove the symlink created by `jupyter labextension develop` command. To find its location, you can run `jupyter labextension list` to figure out where the `labextensions` folder is located. Then you can remove the symlink named `@jupyterlab/git` within that folder. ### Testing the extension #### Server tests This extension is using [Pytest](https://docs.pytest.org/) for Python code testing. Install test dependencies (needed only once): ```sh pip install -e ".[test]" # Each time you install the Python package, you need to restore the front-end extension link jupyter labextension develop . --overwrite ``` To execute them, run: ```sh pytest -vv -r ap --cov jupyterlab_git ``` #### Frontend tests This extension is using [Jest](https://jestjs.io/) for JavaScript code testing. To execute them, execute: ```sh jlpm jlpm test ``` #### Integration tests This extension uses [Playwright](https://playwright.dev/docs/intro) for the integration tests (aka user level tests). More precisely, the JupyterLab helper [Galata](https://github.com/jupyterlab/jupyterlab/tree/master/galata) is used to handle testing the extension in JupyterLab. More information are provided within the [ui-tests](./ui-tests/README.md) README. ### Packaging the extension See [RELEASE](RELEASE.md) ## Contributors ✨ The Jupyter Git extension is part of [Project Jupyter](http://jupyter.org/) and is developed by an open community of contributors. To see who has been active recently, please look at the ["Contributors"](https://github.com/jupyterlab/jupyterlab-git/graphs/contributors) tab. Below we list the people and entities who contributed in different ways to the project ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
Amazon Web Services
Amazon Web Services
🀝		 Ashutosh Bondre
Ashutosh Bondre
πŸ’» πŸ‘€		 Athan
Athan
πŸ’» πŸ‘€ πŸ“† 🎨		 Ben Asokanthan
Ben Asokanthan
πŸ’»		 Bosco Chan
Bosco Chan
πŸ’»		 Brian E. Granger
Brian E. Granger
πŸ“† 🎨 πŸ€” πŸ”		 Daman Arora
Daman Arora
πŸ’»
Dat Quach
Dat Quach
πŸ’»		 FrΓ©dΓ©ric Collonval
FrΓ©dΓ©ric Collonval
🚧		 Hana Zarea
Hana Zarea
πŸ’» πŸ‘€		 Ian Hunt-Isaak
Ian Hunt-Isaak
πŸ’» πŸ‘€		 Jaipreet Singh
Jaipreet Singh
πŸ“† πŸ‘€ πŸ’» 🎨		 Ji Zhang
Ji Zhang
πŸ’» πŸ‘€		 Kentaro Lim
Kentaro Lim
πŸ’»
Konstantin Taletskiy
Konstantin Taletskiy
πŸ’» πŸ‘€		 Kostya Farber
Kostya Farber
πŸ’»		 Linda Ngoc Nguyen
Linda Ngoc Nguyen
πŸ’»		 Major League Hacking
Major League Hacking
🀝		 Max Klein
Max Klein
πŸ’» πŸ‘€ πŸ“† 🎨 πŸš‡		 MichaΕ‚ Krassowski
MichaΕ‚ Krassowski
πŸ’» πŸ‘€ πŸ›		 Navinn Ravindaran
Navinn Ravindaran
πŸ’»
Neelam Gehlot
Neelam Gehlot
πŸ’» πŸ‘€		 Noah Stapp
Noah Stapp
πŸ’» πŸ‘€		 Saul Shanabrook
Saul Shanabrook
πŸ’» πŸ“† πŸ‘€ πŸš‡		 Shawn Esquivel
Shawn Esquivel
πŸ’»		 Sheeza Aziz
Sheeza Aziz
πŸ’»		 Sina Khalili
Sina Khalili
πŸ’»		 The D. E. Shaw Group
The D. E. Shaw Group
🀝
Zeshan Fayyaz
Zeshan Fayyaz
πŸ’»		 jupytercalpoly
jupytercalpoly
🀝
This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind are welcomed! To add yourself, or someone else, to this list you can either [use the bot](https://allcontributors.org/docs/en/bot/usage) (`@all-contributors please add for `) or [the CLI](https://allcontributors.org/docs/en/cli/usage) (`jlpm all-contributors add `). If you manually edit the `.all-contributorsrc` config file, run `yarn run contributors:generate`.