From 4fb3f7b5ea7ded988b6285429230148bb2dafbbe1f2d24335db1251ec3cb0344 Mon Sep 17 00:00:00 2001 From: Todd R Date: Fri, 16 Aug 2019 15:25:31 +0000 Subject: [PATCH 1/2] Accepting request 724130 from home:TheBlackCat:branches:devel:languages:python:jupyter Update to 1.1.0 OBS-URL: https://build.opensuse.org/request/show/724130 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-nbdime?expand=0&rev=10 --- nbdime-1.0.5-py2.py3-none-any.whl | 3 --- nbdime-1.1.0-py2.py3-none-any.whl | 3 +++ python-nbdime.changes | 17 +++++++++++++++++ python-nbdime.spec | 19 +++++++++++++++---- 4 files changed, 35 insertions(+), 7 deletions(-) delete mode 100644 nbdime-1.0.5-py2.py3-none-any.whl create mode 100644 nbdime-1.1.0-py2.py3-none-any.whl diff --git a/nbdime-1.0.5-py2.py3-none-any.whl b/nbdime-1.0.5-py2.py3-none-any.whl deleted file mode 100644 index 695522a..0000000 --- a/nbdime-1.0.5-py2.py3-none-any.whl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0f0e42d75e0c39f898e0a628241f2cd670546cf45f45a79d038f3a0e165301fa -size 3384101 diff --git a/nbdime-1.1.0-py2.py3-none-any.whl b/nbdime-1.1.0-py2.py3-none-any.whl new file mode 100644 index 0000000..030177c --- /dev/null +++ b/nbdime-1.1.0-py2.py3-none-any.whl @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5be5159e4f58d1324279fa330baca72d22d618fc0383fdb7dd549857e0858341 +size 4316133 diff --git a/python-nbdime.changes b/python-nbdime.changes index c842b02..754cbff 100644 --- a/python-nbdime.changes +++ b/python-nbdime.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Sun Aug 11 03:39:51 UTC 2019 - Todd R + +- Update to 1.1.0 + * Add rest API for server extension for handling pure git diffs + of notebooks. This allows for a cleaner call without prefixing + the filename etc. This is currently only available on the + server extension, but can be moved to the main server if there + is demand. +- Update to 1.0.7 + * Fixes an issue using config files (PR #476). + * Upgrades to using lab 1.0 components, which also allows lab + extension to support lab 1.0. +- Update to 1.0.6 + * Fixed a styling regression from 1.0.5, where the web text panes + had incorrect styling (most notably incorrect widths). + ------------------------------------------------------------------- Thu May 16 19:08:20 UTC 2019 - Todd R diff --git a/python-nbdime.spec b/python-nbdime.spec index de10a2c..d05d8c9 100644 --- a/python-nbdime.spec +++ b/python-nbdime.spec @@ -17,8 +17,8 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define mainver 1.0.5 -%define labver 0.6.1 +%define mainver 1.1.0 +%define labver 1.0.0 Name: python-nbdime Version: %{mainver} Release: 0 @@ -37,12 +37,16 @@ BuildRequires: %{python_module requests} BuildRequires: %{python_module six} BuildRequires: %{python_module tornado} BuildRequires: fdupes -BuildRequires: jupyter-jupyterlab +BuildRequires: jupyter-jupyterlab-filesystem BuildRequires: python-rpm-macros BuildRequires: unzip BuildRequires: zip BuildRequires: python-backports.functools_lru_cache BuildRequires: python-backports.shutil_which +# SECTION test requirements +BuildRequires: %{python_module mock} +BuildRequires: %{python_module pytest} +# /SECTION Requires: jupyter-nbdime = %{mainver} Requires: python-GitPython >= 2.1.6 Requires: python-Jinja2 >= 2.9 @@ -133,7 +137,8 @@ This package provides mercurial integration. %prep %setup -q -c -T unzip %{SOURCE0} 'nbdime/*' -find nbdime/ -type f -name "*.py" -exec sed -i 's/\r$//' {} + +find . -type f -name "*.py" -exec sed -i 's/\r$//' {} + +find . -type f -name "*.ipynb" -exec sed -i 's/\r$//' {} + find nbdime/ -type f -name "*.py" -exec sed -i -e '/^#!\//, 1d' {} + zip -r %{SOURCE0} nbdime rm -rf nbdime @@ -150,6 +155,12 @@ cp %{buildroot}%{python3_sitelib}/nbdime-%{mainver}.dist-info/LICENSE.md . %python_expand %fdupes %{buildroot}%{$python_sitelib} %{fdupes %{buildroot}%{_jupyter_prefix} %{buildroot}%{python3_sitelib}} +%check +export PATH=$PATH:%{buildroot}%{_bindir} +git config --global user.email "test@test.com" +git config --global user.name "tester" +%pytest %{buildroot}%{python3_sitelib}/nbdime/ + %files %{python_files} %license %{python_sitelib}/nbdime-%{mainver}.dist-info/LICENSE.md %{python_sitelib}/nbdime/ From e7b1ba8cf649b1099a1274d4c559c3bc21a7c67bbbd4d7fb2b731787ecc94133 Mon Sep 17 00:00:00 2001 From: Todd R Date: Tue, 20 Aug 2019 14:45:28 +0000 Subject: [PATCH 2/2] Accepting request 724843 from home:TheBlackCat:branches:devel:languages:python:jupyter Tests require jsonschema 3. OBS-URL: https://build.opensuse.org/request/show/724843 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-nbdime?expand=0&rev=11 --- python-nbdime.changes | 5 +++++ python-nbdime.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/python-nbdime.changes b/python-nbdime.changes index 754cbff..791fb67 100644 --- a/python-nbdime.changes +++ b/python-nbdime.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 20 14:38:49 UTC 2019 - Todd R + +- Tests require jsonschema 3. + ------------------------------------------------------------------- Sun Aug 11 03:39:51 UTC 2019 - Todd R diff --git a/python-nbdime.spec b/python-nbdime.spec index d05d8c9..2ba09b4 100644 --- a/python-nbdime.spec +++ b/python-nbdime.spec @@ -44,6 +44,7 @@ BuildRequires: zip BuildRequires: python-backports.functools_lru_cache BuildRequires: python-backports.shutil_which # SECTION test requirements +BuildRequires: %{python_module jsonschema > 3} BuildRequires: %{python_module mock} BuildRequires: %{python_module pytest} # /SECTION