| Name | nbdime JSON |
| Version |
4.0.2
JSON |
| download |
| home_page | None |
| Summary | Diff and merge of Jupyter Notebooks |
| upload_time | 2024-09-05 13:25:07 |
| maintainer | None |
| docs_url | None |
| author | None |
| requires_python | >=3.6 |
| license | # Licensing terms This project is licensed under the terms of the Modified BSD License (also known as New or Revised or 3-Clause BSD), as follows: - Copyright (c) 2001-2015, IPython Development Team - Copyright (c) 2015-, 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: Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 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. Neither the name of the Jupyter Development Team 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 OWNER 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. ## About the Jupyter Development Team The Jupyter Development Team is the set of all contributors to the Jupyter project. This includes all of the Jupyter subprojects. The core team that coordinates development on GitHub can be found here: https://github.com/jupyter/. ## Our Copyright Policy Jupyter uses a shared copyright model. Each contributor maintains copyright over their contributions to Jupyter. But, it is important to note that these contributions are typically only changes to the repositories. Thus, the Jupyter source code, in its entirety is not the copyright of any single person or institution. Instead, it is the collective copyright of the entire Jupyter Development Team. If individual contributors want to maintain a record of what changes/contributions they have specific copyright on, they should indicate their copyright in the commit message of the change, when they commit the change to one of the Jupyter repositories. With this in mind, the following banner should be used in any source code file to indicate the copyright and license terms: # Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. |
| keywords |
interactive
interpreter
shell
web
|
| VCS |
 |
| bugtrack_url |
|
| requirements |
No requirements were recorded.
|
| Travis-CI |
No Travis.
|
| coveralls test coverage |
|
**[Installation](#installation)** |
**[Documentation](#documentation)** |
**[Contributing](#contributing)** |
**[Development Install](#development-install)** |
**[Testing](#testing)** |
**[License](#license)** |
**[Getting help](#getting-help)**
# [nbdime](https://github.com/jupyter/nbdime) Jupyter Notebook Diff and Merge tools
[](https://github.com/jupyter/nbdime/actions/workflows/tests.yml)
[](https://codecov.io/github/jupyter/nbdime?branch=master)
[](http://nbdime.readthedocs.io/en/latest/?badge=latest)
[](https://groups.google.com/forum/#!forum/jupyter)
`nbdime` provides tools for diffing and merging of [Jupyter Notebooks](https://jupyter-notebook.readthedocs.io).
- `nbdiff` compare notebooks in a terminal-friendly way
- `nbmerge` three-way merge of notebooks with automatic conflict resolution
- `nbdiff-web` shows you a rich rendered diff of notebooks
- `nbmerge-web` gives you a web-based three-way merge tool for notebooks
- `nbshow` present a single notebook in a terminal-friendly way
Diffing notebooks in the terminal:
Merging notebooks in a browser:
## Installation
Install nbdime with pip:
pip install nbdime
See [the installation docs](https://nbdime.readthedocs.io/en/latest/installing.html) for more installation details and development installation instructions.
## Documentation
See the latest documentation at https://nbdime.readthedocs.io.
See also description and discussion in the [Jupyter Enhancement Proposal](https://github.com/jupyter/enhancement-proposals/pull/8).
## Contributing
If you would like to contribute to the project, please read our [contributor documentation](http://jupyter.readthedocs.io/en/latest/contributor/content-contributor.html) and the [`CONTRIBUTING.md`](CONTRIBUTING.md).
## Development Install
To install a development version of nbdime, you will need [npm installed](https://nodejs.org/en/download/) and available on your PATH while installing.
For a **development install**, enter on the command line:
```bash
pip install -e git+https://github.com/jupyter/nbdime#egg=nbdime
```
See [installation](https://nbdime.readthedocs.io/en/latest/installing.html#installing-latest-development-version) documentation for additional detail, particularly related to performing
a dev install for working on the browser script code.
## Testing
Install the test requirements:
pip install nbdime[test]
To run Python tests locally, enter on the command line: `pytest`
To run Javascript tests locally, enter: `npm test`
Install the [codecov browser extension](https://github.com/codecov/browser-extension#codecov-extension) to view test coverage in the source browser on github.
See [testing](https://nbdime.readthedocs.io/en/latest/testing.html) documentation for additional detail.
## License
We use a shared copyright model that enables all contributors to maintain the
copyright on their contributions.
All code is licensed under the terms of the revised BSD license.
## Getting help
We encourage you to ask questions on the [mailing list](https://groups.google.com/forum/#!forum/jupyter).
## Resources
- [Reporting Issues](https://github.com/jupyter/nbdime/issues)
- [Documentation for nbdime](https://nbdime.readthedocs.io/en/latest/) | [PDF (latest)](https://media.readthedocs.org/pdf/nbdime/latest/nbdime.pdf)
- [Documentation for Project Jupyter](https://jupyter.readthedocs.io/en/latest/index.html) | [PDF](https://media.readthedocs.org/pdf/jupyter/latest/jupyter.pdf)
- [Project Jupyter website](https://jupyter.org)
Raw data
{
"_id": null,
"home_page": null,
"name": "nbdime",
"maintainer": null,
"docs_url": null,
"requires_python": ">=3.6",
"maintainer_email": null,
"keywords": "Interactive, Interpreter, Shell, Web",
"author": null,
"author_email": "Jupyter Development Team <jupyter@googlegroups.com>",
"download_url": "https://files.pythonhosted.org/packages/a6/f1/4be57ecea4d55d322f05a0f89e0b73d7a8d90a16dbf01168eab3e7bf5939/nbdime-4.0.2.tar.gz",
"platform": null,
"description": "**[Installation](#installation)** |\n**[Documentation](#documentation)** |\n**[Contributing](#contributing)** |\n**[Development Install](#development-install)** |\n**[Testing](#testing)** |\n**[License](#license)** |\n**[Getting help](#getting-help)**\n\n# [nbdime](https://github.com/jupyter/nbdime) Jupyter Notebook Diff and Merge tools\n\n[](https://github.com/jupyter/nbdime/actions/workflows/tests.yml)\n[](https://codecov.io/github/jupyter/nbdime?branch=master)\n[](http://nbdime.readthedocs.io/en/latest/?badge=latest)\n[](https://groups.google.com/forum/#!forum/jupyter)\n\n`nbdime` provides tools for diffing and merging of [Jupyter Notebooks](https://jupyter-notebook.readthedocs.io).\n\n- `nbdiff` compare notebooks in a terminal-friendly way\n- `nbmerge` three-way merge of notebooks with automatic conflict resolution\n- `nbdiff-web` shows you a rich rendered diff of notebooks\n- `nbmerge-web` gives you a web-based three-way merge tool for notebooks\n- `nbshow` present a single notebook in a terminal-friendly way\n\nDiffing notebooks in the terminal:\n\n\n\nMerging notebooks in a browser:\n\n\n\n## Installation\n\nInstall nbdime with pip:\n\n pip install nbdime\n\nSee [the installation docs](https://nbdime.readthedocs.io/en/latest/installing.html) for more installation details and development installation instructions.\n\n## Documentation\n\nSee the latest documentation at https://nbdime.readthedocs.io.\n\nSee also description and discussion in the [Jupyter Enhancement Proposal](https://github.com/jupyter/enhancement-proposals/pull/8).\n\n## Contributing\n\nIf you would like to contribute to the project, please read our [contributor documentation](http://jupyter.readthedocs.io/en/latest/contributor/content-contributor.html) and the [`CONTRIBUTING.md`](CONTRIBUTING.md).\n\n## Development Install\n\nTo install a development version of nbdime, you will need [npm installed](https://nodejs.org/en/download/) and available on your PATH while installing.\n\nFor a **development install**, enter on the command line:\n\n```bash\npip install -e git+https://github.com/jupyter/nbdime#egg=nbdime\n```\n\nSee [installation](https://nbdime.readthedocs.io/en/latest/installing.html#installing-latest-development-version) documentation for additional detail, particularly related to performing\na dev install for working on the browser script code.\n\n## Testing\n\nInstall the test requirements:\n\n pip install nbdime[test]\n\nTo run Python tests locally, enter on the command line: `pytest`\n\nTo run Javascript tests locally, enter: `npm test`\n\nInstall the [codecov browser extension](https://github.com/codecov/browser-extension#codecov-extension) to view test coverage in the source browser on github.\n\nSee [testing](https://nbdime.readthedocs.io/en/latest/testing.html) documentation for additional detail.\n\n## License\n\nWe use a shared copyright model that enables all contributors to maintain the\ncopyright on their contributions.\n\nAll code is licensed under the terms of the revised BSD license.\n\n## Getting help\n\nWe encourage you to ask questions on the [mailing list](https://groups.google.com/forum/#!forum/jupyter).\n\n## Resources\n\n- [Reporting Issues](https://github.com/jupyter/nbdime/issues)\n- [Documentation for nbdime](https://nbdime.readthedocs.io/en/latest/) | [PDF (latest)](https://media.readthedocs.org/pdf/nbdime/latest/nbdime.pdf)\n\n- [Documentation for Project Jupyter](https://jupyter.readthedocs.io/en/latest/index.html) | [PDF](https://media.readthedocs.org/pdf/jupyter/latest/jupyter.pdf)\n- [Project Jupyter website](https://jupyter.org)\n",
"bugtrack_url": null,
"license": "# Licensing terms This project is licensed under the terms of the Modified BSD License (also known as New or Revised or 3-Clause BSD), as follows: - Copyright (c) 2001-2015, IPython Development Team - Copyright (c) 2015-, 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: Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 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. Neither the name of the Jupyter Development Team 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 OWNER 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. ## About the Jupyter Development Team The Jupyter Development Team is the set of all contributors to the Jupyter project. This includes all of the Jupyter subprojects. The core team that coordinates development on GitHub can be found here: https://github.com/jupyter/. ## Our Copyright Policy Jupyter uses a shared copyright model. Each contributor maintains copyright over their contributions to Jupyter. But, it is important to note that these contributions are typically only changes to the repositories. Thus, the Jupyter source code, in its entirety is not the copyright of any single person or institution. Instead, it is the collective copyright of the entire Jupyter Development Team. If individual contributors want to maintain a record of what changes/contributions they have specific copyright on, they should indicate their copyright in the commit message of the change, when they commit the change to one of the Jupyter repositories. With this in mind, the following banner should be used in any source code file to indicate the copyright and license terms: # Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License.",
"summary": "Diff and merge of Jupyter Notebooks",
"version": "4.0.2",
"project_urls": {
"Bug Tracker": "https://github.com/jupyter/nbdime/issues",
"Homepage": "https://nbdime.readthedocs.io",
"Source": "https://github.com/jupyter/nbdime"
},
"split_keywords": [
"interactive",
" interpreter",
" shell",
" web"
],
"urls": [
{
"comment_text": "",
"digests": {
"blake2b_256": "7323824b295f4cc53f4437f6917e8f46c519cd3a9be909dd36ca0682fdc7fff1",
"md5": "ad7ae57d17018545a2759c9846405377",
"sha256": "e5a43aca669c576c66e757071c0e882de05ac305311d79aded99bfb5a3e9419e"
},
"downloads": -1,
"filename": "nbdime-4.0.2-py3-none-any.whl",
"has_sig": false,
"md5_digest": "ad7ae57d17018545a2759c9846405377",
"packagetype": "bdist_wheel",
"python_version": "py3",
"requires_python": ">=3.6",
"size": 5917346,
"upload_time": "2024-09-05T13:25:03",
"upload_time_iso_8601": "2024-09-05T13:25:03.950157Z",
"url": "https://files.pythonhosted.org/packages/73/23/824b295f4cc53f4437f6917e8f46c519cd3a9be909dd36ca0682fdc7fff1/nbdime-4.0.2-py3-none-any.whl",
"yanked": false,
"yanked_reason": null
},
{
"comment_text": "",
"digests": {
"blake2b_256": "a6f14be57ecea4d55d322f05a0f89e0b73d7a8d90a16dbf01168eab3e7bf5939",
"md5": "d1418e1abdc21b8eec36196647b8bdd7",
"sha256": "d8279f8f4b236c0b253b20d60c4831bb67843ed8dbd6e09f234eb011d36f1bf2"
},
"downloads": -1,
"filename": "nbdime-4.0.2.tar.gz",
"has_sig": false,
"md5_digest": "d1418e1abdc21b8eec36196647b8bdd7",
"packagetype": "sdist",
"python_version": "source",
"requires_python": ">=3.6",
"size": 9452967,
"upload_time": "2024-09-05T13:25:07",
"upload_time_iso_8601": "2024-09-05T13:25:07.444484Z",
"url": "https://files.pythonhosted.org/packages/a6/f1/4be57ecea4d55d322f05a0f89e0b73d7a8d90a16dbf01168eab3e7bf5939/nbdime-4.0.2.tar.gz",
"yanked": false,
"yanked_reason": null
}
],
"upload_time": "2024-09-05 13:25:07",
"github": true,
"gitlab": false,
"bitbucket": false,
"codeberg": false,
"github_user": "jupyter",
"github_project": "nbdime",
"travis_ci": false,
"coveralls": true,
"github_actions": true,
"lcname": "nbdime"
}
