commit 3e410f8985e2c4192cdd4fb8ef2f7d2e34fb3bbc2f84481db7ed81c6ebbb38e9 Author: Todd R Date: Fri Apr 26 20:02:20 2019 +0000 Accepting request 698419 from home:TheBlackCat:branches:devel:languages:python:jupyter - Update to 1.0.5 * Fixed filename encoding issue with git diff on Python 2. * Fixes for deploying nbdime on a non-localhost server. * Web: Fixed issue where unchanged cells would not show correctly if unhidden. * Various other fixes and adjustments. - Rename to to match jupyter package naming guidelines. - Update to version 1.0.4 * Fix git diffing failure with older versions of git. Now, an older version of git will simply prevent integration with git filters. * Allow for two-way merge by making the base notebook argument to `nbmerge` optional. It will now default to an empty notebook. - Update to version 1.0.3 * Web: Fix issues with hiding unchanged cells. Make hiding unchanged cells configurable and on by default. * Options of the console printing can now be configured. Mainly the `--no-color` flag disables ANSI color escapes. * Web: Fixed MathJax math rendering. * Various other fixes and adjustments. - Update to version 1.0.2 * Diff: Optimized diffing of large texts (e.g. big cells). * Config: Fixed several issues with the config system. * Lab extension: Updated to latest jupyterlab. All npm packages are now using ES6 features. * Web: Fixed keyboard tabbing / focusing issues. - Update to version 1.0.1 * Web: Fix output rendering of outputs with a period in MIME type name. * Config: Add configuration option for front-end extensions. * Merging: Fix handling of corner case for inline merge strategy. * Various other fixes and adjustments. - Use find "+" strategy. - Use noun phrase in summary. - Update to version 1.0.0 * Added ability for git diff driver to integrate with git filters. * Improved/fixed merge resolution for similar cell insertions. * Added config system to allow for configuring the various entrypoints. Especially useful for customizing which keys to ignore when diffing. * Added control to web view of outputs to select which MIME type to render, and to enable trusting of outputs for full rendering. * Added jupyterlab extension. Frontend/server extensions are now enabled by default on installation. * Various fixes and adjustments. - Switch to wheel-based install - Remove python3-jupyter_vega3 requires as we never had this pkg present in the d:l:py, it is not mentioned in the setup.py - Run the tests - Initial version OBS-URL: https://build.opensuse.org/request/show/698419 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-nbdime?expand=0&rev=1 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/nbdime-1.0.5-py2.py3-none-any.whl b/nbdime-1.0.5-py2.py3-none-any.whl new file mode 100644 index 0000000..695522a --- /dev/null +++ b/nbdime-1.0.5-py2.py3-none-any.whl @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f0e42d75e0c39f898e0a628241f2cd670546cf45f45a79d038f3a0e165301fa +size 3384101 diff --git a/python-nbdime.changes b/python-nbdime.changes new file mode 100644 index 0000000..f0a2312 --- /dev/null +++ b/python-nbdime.changes @@ -0,0 +1,65 @@ +------------------------------------------------------------------- +Thu Apr 25 01:59:57 UTC 2019 - Todd R + +- Update to 1.0.5 + * Fixed filename encoding issue with git diff on Python 2. + * Fixes for deploying nbdime on a non-localhost server. + * Web: Fixed issue where unchanged cells would not show correctly if unhidden. + * Various other fixes and adjustments. +- Rename to to match jupyter package naming guidelines. + +------------------------------------------------------------------- +Sat Dec 22 07:11:41 UTC 2018 - Todd R + +- Update to version 1.0.4 + * Fix git diffing failure with older versions of git. Now, an older version of git will simply prevent integration with git filters. + * Allow for two-way merge by making the base notebook argument to `nbmerge` optional. It will now default to an empty notebook. +- Update to version 1.0.3 + * Web: Fix issues with hiding unchanged cells. Make hiding unchanged cells configurable and on by default. + * Options of the console printing can now be configured. Mainly the `--no-color` flag disables ANSI color escapes. + * Web: Fixed MathJax math rendering. + * Various other fixes and adjustments. + +------------------------------------------------------------------- +Thu Aug 2 18:14:08 UTC 2018 - toddrme2178@gmail.com + +- Update to version 1.0.2 + * Diff: Optimized diffing of large texts (e.g. big cells). + * Config: Fixed several issues with the config system. + * Lab extension: Updated to latest jupyterlab. All npm packages are now using ES6 features. + * Web: Fixed keyboard tabbing / focusing issues. +- Update to version 1.0.1 + * Web: Fix output rendering of outputs with a period in MIME type name. + * Config: Add configuration option for front-end extensions. + * Merging: Fix handling of corner case for inline merge strategy. + * Various other fixes and adjustments. + +------------------------------------------------------------------- +Sun Jun 10 11:02:54 UTC 2018 - jengelh@inai.de + +- Use find "+" strategy. +- Use noun phrase in summary. + +------------------------------------------------------------------- +Fri May 18 14:53:54 UTC 2018 - toddrme2178@gmail.com + +- Update to version 1.0.0 + * Added ability for git diff driver to integrate with git filters. + * Improved/fixed merge resolution for similar cell insertions. + * Added config system to allow for configuring the various entrypoints. Especially useful for customizing which keys to ignore when diffing. + * Added control to web view of outputs to select which MIME type to render, and to enable trusting of outputs for full rendering. + * Added jupyterlab extension. Frontend/server extensions are now enabled by default on installation. + * Various fixes and adjustments. +- Switch to wheel-based install + +------------------------------------------------------------------- +Fri May 18 08:34:04 UTC 2018 - tchvatal@suse.com + +- Remove python3-jupyter_vega3 requires as we never had this pkg + present in the d:l:py, it is not mentioned in the setup.py +- Run the tests + +------------------------------------------------------------------- +Fri Apr 20 22:08:22 UTC 2018 - toddrme2178@gmail.com + +- Initial version diff --git a/python-nbdime.spec b/python-nbdime.spec new file mode 100644 index 0000000..e5c87ed --- /dev/null +++ b/python-nbdime.spec @@ -0,0 +1,174 @@ +# +# spec file for package python-nbdime +# +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%{?!python_module:%define python_module() python-%{**} python3-%{**}} +%define mainver 1.0.5 +%define labver 0.6.1 +Name: python-nbdime +Version: %{mainver} +Release: 0 +Summary: Tools for diffing and merging Jupyter Notebooks +License: BSD-3-Clause +Group: Development/Languages/Python +URL: https://github.com/jupyter/nbdime +Source: https://files.pythonhosted.org/packages/source/n/nbdime-%{mainver}-py2.py3-none/nbdime-%{mainver}-py2.py3-none-any.whl +BuildRequires: %{python_module GitPython >= 2.1.6} +BuildRequires: %{python_module Jinja2 >= 2.9} +BuildRequires: %{python_module colorama} +BuildRequires: %{python_module nbformat} +BuildRequires: %{python_module notebook} +BuildRequires: %{python_module pip} +BuildRequires: %{python_module requests} +BuildRequires: %{python_module six} +BuildRequires: %{python_module tornado} +BuildRequires: fdupes +BuildRequires: jupyter-jupyterlab +BuildRequires: python-rpm-macros +BuildRequires: unzip +BuildRequires: zip +BuildRequires: python-backports.functools_lru_cache +BuildRequires: python-backports.shutil_which +Requires: jupyter-nbdime = %{version} +Requires: python-GitPython >= 2.1.6 +Requires: python-Jinja2 >= 2.9 +Requires: python-colorama +Requires: python-nbformat +Requires: python-notebook +Requires: python-requests +Requires: python-six +Requires: python-tornado +%ifpython2 +Requires: python-backports.functools_lru_cache +Requires: python-backports.shutil_which +%endif +Recommends: python-tabulate +Provides: python-jupyter_nbdime = %{version} +Obsoletes: python-jupyter_nbdime < %{version} +BuildArch: noarch +%python_subpackages + +%description +The nbdime package provides tools for diffing and merging of +Jupyter Notebooks. + +This package provides the python interface. + +%package -n jupyter-nbdime +Summary: A JupyterLab extension for showing Notebook diffs +Requires: jupyter-nbformat +Requires: jupyter-notebook +Requires: python3-nbdime = %{mainver} + +%description -n jupyter-nbdime +The nbdime package provides tools for diffing and merging of +Jupyter Notebooks. + +This package provides the tools and jupyter notebook extension. + +%package -n jupyter-nbdime-jupyterlab +Version: %{labver} +Summary: A JupyterLab extension for showing Notebook diffs +Requires: jupyter-jupyterlab +Requires: jupyter-nbdime = %{mainver} + +%description -n jupyter-nbdime-jupyterlab +The nbdime package provides tools for diffing and merging of +Jupyter Notebooks. + +This package provides the JupyterLab extension. + +%package -n jupyter-nbdime-git +Summary: Git integration for jupyter-nbdime +Group: Development/Languages/Python +Requires: git +Requires: jupyter-nbdime = %{mainver} + +%description -n jupyter-nbdime-git +The nbdime package provides tools for diffing and merging of +Jupyter Notebooks. + +This package provides git integration. + +%package -n jupyter-nbdime-hg +Summary: Mercurial integration for jupyter-nbdime +Group: Development/Languages/Python +Requires: jupyter-nbdime = %{mainver} +Requires: mercurial + +%description -n jupyter-nbdime-hg +The nbdime package provides tools for diffing and merging of +Jupyter Notebooks. + +This package provides git integration. + +%prep +%setup -q -c -T +unzip %{SOURCE0} 'nbdime/*' +find nbdime/ -type f -name "*.py" -exec sed -i 's/\r$//' {} + +find nbdime/ -type f -name "*.py" -exec sed -i -e '/^#!\//, 1d' {} + +zip -r %{SOURCE0} nbdime +rm -rf nbdime + +%build +# Not needed + +%install +%python_expand pip%{$python_bin_suffix} install --root=%{buildroot} %{SOURCE0} + +%{jupyter_move_config} + +cp %{buildroot}%{python3_sitelib}/nbdime-%{mainver}.dist-info/LICENSE.md . +%python_expand %fdupes %{buildroot}%{$python_sitelib} +%{fdupes %{buildroot}%{_jupyter_prefix} %{buildroot}%{python3_sitelib}} + +%files %{python_files} +%license %{python_sitelib}/nbdime-%{mainver}.dist-info/LICENSE.md +%{python_sitelib}/nbdime/ +%{python_sitelib}/nbdime-%{mainver}.dist-info/ + +%files -n jupyter-nbdime +%license LICENSE.md +%{_bindir}/nbdime +%{_bindir}/nbshow +%{_bindir}/nbdiff +%{_bindir}/nbdiff-web +%{_bindir}/nbmerge +%{_bindir}/nbmerge-web +%{_jupyter_nbextension_dir}/nbdime/ +%config %{_jupyter_servextension_confdir}/nbdime.json +%config %{_jupyter_nb_notebook_confdir}/nbdime.json + +%files -n jupyter-nbdime-jupyterlab +%license LICENSE.md +%{_jupyter_labextensions_dir}/nbdime-jupyterlab-%{labver}.tgz + +%files -n jupyter-nbdime-git +%license LICENSE.md +%{_bindir}/git-nbdiffdriver +%{_bindir}/git-nbdifftool +%{_bindir}/git-nbmergedriver +%{_bindir}/git-nbmergetool + +%files -n jupyter-nbdime-hg +%license LICENSE.md +%{_bindir}/hg-nbdiff +%{_bindir}/hg-nbdiffweb +%{_bindir}/hg-nbmerge +%{_bindir}/hg-nbmergeweb + +%changelog