From 1f2f297aed65db7c8099b88dc34d138f128bc0f419cfd0258f715c0cf4c1f535 Mon Sep 17 00:00:00 2001 From: Todd R Date: Mon, 8 Oct 2018 03:52:31 +0000 Subject: [PATCH] Accepting request 640488 from home:TheBlackCat:branches:devel:languages:python:jupyter - Use upstream builds of doc files. - Merge doc subpackage and tests into main spec file. - Use %license tag OBS-URL: https://build.opensuse.org/request/show/640488 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-jupyter_console?expand=0&rev=4 --- jupyter-console.pdf | 3 + python-jupyter_console-doc.changes | 96 -------------------------- python-jupyter_console-doc.spec | 105 ----------------------------- python-jupyter_console.changes | 7 ++ python-jupyter_console.spec | 36 ++++++++-- 5 files changed, 39 insertions(+), 208 deletions(-) create mode 100644 jupyter-console.pdf delete mode 100644 python-jupyter_console-doc.changes delete mode 100644 python-jupyter_console-doc.spec diff --git a/jupyter-console.pdf b/jupyter-console.pdf new file mode 100644 index 0000000..9f6232e --- /dev/null +++ b/jupyter-console.pdf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:73d6625c6d5bb4facf9af302d49ea588ecf1e8b510eb7ee20e5d77ea34a48f5f +size 112176 diff --git a/python-jupyter_console-doc.changes b/python-jupyter_console-doc.changes deleted file mode 100644 index b94479e..0000000 --- a/python-jupyter_console-doc.changes +++ /dev/null @@ -1,96 +0,0 @@ -------------------------------------------------------------------- -Tue Feb 13 19:47:23 UTC 2018 - toddrme2178@gmail.com - -- Update url - -------------------------------------------------------------------- -Tue Sep 19 19:51:19 UTC 2017 - toddrme2178@gmail.com - -- Update to 5.2.0 - * When using a kernel that the console did not start, exiting with Ctrl-D now - leaves it running. - * Added Ctrl-\\ shortcut to quit the console. - * Input prompt numbers are now updated when another frontend has executed - code in the same kernel. - * Fix setting next input with newer versions of prompt_toolkit. - * Ensure history entries are unicode, not bytes, on Python 2. - -------------------------------------------------------------------- -Wed Apr 26 19:08:32 UTC 2017 - toddrme2178@gmail.com - -- Implement single-spec version. - -------------------------------------------------------------------- -Fri Mar 31 19:17:01 UTC 2017 - toddrme2178@gmail.com - -- Updaste to 5.1 - * New ``ZMQTerminalInteractiveShell.true_color`` config option to use 24-bit - colour. - * New ``ZMQTerminalInteractiveShell.confirm_exit`` config option to turn off - asking 'are you sure' on exit. - * New ``--simple-prompt`` flag to explicitly use the fallback mode without - prompt_toolkit. - * Fixed executing an empty input. - * Fixed formatting for code and outputs from other frontends executing code. - * Avoid using functions which will be removed in IPython 6. -- Updaste to 5.0.0 - + Interactive Shell architecture - * disinherit shell class from IPython Interactive Shell `#68 `_ - This separates jupyter_console's ZMQTerminalInteractiveShell from IPython's TerminalInteractiveShell and InteractiveShell classes. - * update SIGINT handler to not use the old interactive API shell `#80 `_ - + Image Handling improvement - * use PIL as default image handler `#79 `_ - * better indication of whether image data was handled `#77 `_ - + Prompts improvement - * use prompt_toolkit 1.0 `#74 `_ - * don't use prompt_manager `#75 `_ - * remove ``colors_force`` flag that have no effects: `#88 `_ -- Updaste to 4.1.1 - * fix for readline history - * don't confuse sys.path with virtualenvs - -------------------------------------------------------------------- -Thu Feb 18 21:14:18 UTC 2016 - toddrme2178@gmail.com - -- specfile: - * update copyright year - * Split documentation into subpackage -- update to version 4.1.0: - * readline/completion fixes - * use is_complete messages to determine if input is complete - (important for non-Python kernels) - * fix: 4.0 was looking for jupyter_console_config in IPython config - directories, not Jupyter - -------------------------------------------------------------------- -Mon Oct 12 13:46:17 UTC 2015 - toddrme2178@gmail.com - -- Update to 4.0.3 - * fix jupyter console --generate-config - -------------------------------------------------------------------- -Mon Oct 5 10:01:17 UTC 2015 - toddrme2178@gmail.com - -- Build documentation - -------------------------------------------------------------------- -Wed Sep 16 15:26:27 UTC 2015 - toddrme2178@gmail.com - -- Update to 4.0.2 - * fix `jupyter console --generate-config` - * add long_description - * fix setuptools entrypoint -- Update to 4.0.1 - * entrypoints only when setuptools invoked - * bug fix - * suggestion for windows users - * Fix printing errors when execute_reply and error messages come - * Try installing IPython from Github on RTD - * Try installing on RTD with --pre to get IPython 4 - * Add requirements file for RTD - -------------------------------------------------------------------- -Tue Jul 21 15:06:50 UTC 2015 - toddrme2178@gmail.com - -- Initial version - diff --git a/python-jupyter_console-doc.spec b/python-jupyter_console-doc.spec deleted file mode 100644 index 7510a29..0000000 --- a/python-jupyter_console-doc.spec +++ /dev/null @@ -1,105 +0,0 @@ -# -# spec file for package python-jupyter_console-doc -# -# Copyright (c) 2018 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 http://bugs.opensuse.org/ -# - - -%if 0%{?suse_version} && 0%{?suse_version} != 1315 -%bcond_without pdf -%else -%bcond_with pdf -%endif - -%bcond_without html - -# Tests require an active console -%bcond_with tests - -%{?!python_module:%define python_module() python-%{**} python3-%{**}} -Name: python-jupyter_console-doc -Version: 5.2.0 -Release: 0 -Summary: Documentation for python-jupyter_console -License: BSD-3-Clause -Group: Development/Languages/Python -Url: https://github.com/jupyter/jupyter_console -Source: https://files.pythonhosted.org/packages/source/j/jupyter_console/jupyter_console-%{version}.tar.gz -BuildRequires: fdupes -BuildRequires: python-rpm-macros -BuildRequires: %{python_module jupyter_console} -%if %{with tests} -# Test requirements -BuildRequires: %{python_module nose} -# Python 2.x test requirements -BuildRequires: python-mock -%endif -# Documentation requirements -%if %{with pdf} || %{with html} -BuildRequires: python3-Sphinx -BuildRequires: python3-sphinxcontrib-github-alt -%endif -%if %{with pdf} -BuildRequires: python3-Sphinx-latex -%endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch -Provides: %{name}-html = %{version} -Provides: %{name}-pdf = %{version} -Obsoletes: %{name}-html < %{version} -Obsoletes: %{name}-pdf < %{version} -Provides: %{python_module jupyter_console-doc = %{version}} - -%description -Documentation and help files for python-jupyter_console. - -%prep -%setup -q -n jupyter_console-%{version} - -%build -# Build the documentation -pushd docs -%if %{with html} -make html -rm -rf _build/html/.buildinfo -%endif -%if %{with pdf} -make latexpdf -%endif -popd - -%install -mkdir -p %{buildroot}%{_docdir}/python-jupyter_console - -%if %{with pdf} -cp docs/_build/latex/*.pdf %{buildroot}%{_docdir}/python-jupyter_console/ -%endif - -%if %{with html} -cp -r docs/_build/html %{buildroot}%{_docdir}/python-jupyter_console/ -%endif - -%fdupes %{buildroot}%{_docdir}/python-jupyter_console/ - -%if %{with tests} -%check -%python_expand nosetests-%{$python_bin_suffix} jupyter_console -%endif - -%files -%defattr(-,root,root,-) -%doc COPYING.md -%{_docdir}/python-jupyter_console/ - -%changelog diff --git a/python-jupyter_console.changes b/python-jupyter_console.changes index 79f17b8..a5b2844 100644 --- a/python-jupyter_console.changes +++ b/python-jupyter_console.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Oct 7 23:55:12 UTC 2018 - Todd R + +- Use upstream builds of doc files. +- Merge doc subpackage and tests into main spec file. +- Use %license tag + ------------------------------------------------------------------- Sun Jul 22 08:44:57 UTC 2018 - toddrme2178@gmail.com diff --git a/python-jupyter_console.spec b/python-jupyter_console.spec index 7ae4a0a..6e2677f 100644 --- a/python-jupyter_console.spec +++ b/python-jupyter_console.spec @@ -24,25 +24,39 @@ Summary: Jupyter terminal console License: BSD-3-Clause Group: Development/Languages/Python Url: https://github.com/jupyter/jupyter_console -Source: https://files.pythonhosted.org/packages/source/j/jupyter_console/jupyter_console-%{version}.tar.gz -BuildRequires: fdupes -BuildRequires: python-rpm-macros +Source0: https://files.pythonhosted.org/packages/source/j/jupyter_console/jupyter_console-%{version}.tar.gz +Source1: https://media.readthedocs.org/pdf/jupyter-console/v%{version}/jupyter-console.pdf BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} +BuildRequires: fdupes +BuildRequires: python-rpm-macros Requires: python-jupyter_client Requires: python-jupyter_ipykernel Requires: python-jupyter_ipython -Recommends: python-prompt_toolkit >= 1.0.0 -Conflicts: python-prompt_toolkit >= 2 +Requires: python-prompt_toolkit1 BuildArch: noarch + %python_subpackages + %description A terminal-based console frontend for Jupter kernels. This code is based on the single-process IPython terminal. +%package -n %{name}-doc +Summary: Documentation for %{name} +Group: Documentation/PDF +Provides: %{python_module jupyter_console-doc = %{version}} + +%description -n %{name}-doc +A terminal-based console frontend for Jupter kernels. +This code is based on the single-process IPython terminal. + +This package provides the help files for %{name}. + %prep %setup -q -n jupyter_console-%{version} +cp %{SOURCE1} . %build %python_build @@ -51,10 +65,18 @@ This code is based on the single-process IPython terminal. %python_install %python_expand %fdupes %{buildroot}%{$python_sitelib} +# Tests require an active console +# %%check +# %%python_expand nosetests-%%{$python_bin_suffix} jupyter_console + %files %{python_files} -%defattr(-,root,root,-) -%doc CONTRIBUTING.md COPYING.md README.md +%doc CONTRIBUTING.md README.md +%license COPYING.md %python3_only %{_bindir}/jupyter-console %{python_sitelib}/* +%files -n %{name}-doc +%license COPYING.md +%doc jupyter-console.pdf + %changelog