#15 Update to 6.0.2 (#1724407)
Merged 14 days ago by churchyard. Opened 4 months ago by churchyard.
rpms/ churchyard/python-notebook 6  into  master

file modified
+4 -15

@@ -1,15 +1,4 @@ 

- /notebook-4.4.1.tar.gz

- /notebook-5.0.0.tar.gz

- /notebook-5.1.0rc2.tar.gz

- /notebook-5.1.0rc3.tar.gz

- /notebook-5.1.0.tar.gz

- /notebook-5.2.1.tar.gz

- /notebook-5.3.0rc1.tar.gz

- /notebook-5.3.0.tar.gz

- /notebook-5.3.1.tar.gz

- /notebook-5.4.0.tar.gz

- /notebook-5.5.0.tar.gz

- /notebook-5.6.0.tar.gz

- /notebook-5.7.2.tar.gz

- /notebook-5.7.7.tar.gz

- /notebook-5.7.8.tar.gz

+ /notebook-*.tar.gz

+ /notebook-*/

+ /results_python-notebook/

+ *.rpm

file removed
-67

@@ -1,67 +0,0 @@ 

- From 0460caab9a15b2691adf1fa121820c7ef2c4560f Mon Sep 17 00:00:00 2001

- From: Elliott Sales de Andrade <quantum.analyst@gmail.com>

- Date: Sun, 31 Mar 2019 11:32:49 +0200

- Subject: [PATCH] Switch to Sphinx logging API

- MIME-Version: 1.0

- Content-Type: text/plain; charset=UTF-8

- Content-Transfer-Encoding: 8bit

- 

- Fixes https://github.com/jupyter/notebook/issues/4533

- 

- Co-authored-by: Miro Hrončok <miro@hroncok.cz>

- ---

-  docs/sphinxext/github.py | 13 ++++++++-----

-  1 file changed, 8 insertions(+), 5 deletions(-)

- 

- diff --git a/docs/sphinxext/github.py b/docs/sphinxext/github.py

- index 8f0ffc0d97..374104653d 100644

- --- a/docs/sphinxext/github.py

- +++ b/docs/sphinxext/github.py

- @@ -20,6 +20,10 @@

-  from docutils import nodes, utils

-  from docutils.parsers.rst.roles import set_classes

-  

- +from sphinx.util import logging

- +logger = logging.getLogger(__name__)

- +

- +

-  def make_link_node(rawtext, app, type, slug, options):

-      """Create a link to a github resource.

-  

- @@ -75,7 +79,7 @@ def ghissue_role(name, rawtext, text, lineno, inliner, options={}, content=[]):

-          prb = inliner.problematic(rawtext, rawtext, msg)

-          return [prb], [msg]

-      app = inliner.document.settings.env.app

- -    #app.info('issue %r' % text)

- +    #logger.info('issue %r' % text)

-      if 'pull' in name.lower():

-          category = 'pull'

-      elif 'issue' in name.lower():

- @@ -104,8 +108,7 @@ def ghuser_role(name, rawtext, text, lineno, inliner, options={}, content=[]):

-      :param options: Directive options for customization.

-      :param content: The directive content for customization.

-      """

- -    app = inliner.document.settings.env.app

- -    #app.info('user link %r' % text)

- +    #logger.info('user link %r' % text)

-      ref = 'https://www.github.com/' + text

-      node = nodes.reference(rawtext, text, refuri=ref, **options)

-      return [node], []

- @@ -126,7 +129,7 @@ def ghcommit_role(name, rawtext, text, lineno, inliner, options={}, content=[]):

-      :param content: The directive content for customization.

-      """

-      app = inliner.document.settings.env.app

- -    #app.info('user link %r' % text)

- +    #logger.info('user link %r' % text)

-      try:

-          base = app.config.github_project_url

-          if not base:

- @@ -146,7 +149,7 @@ def setup(app):

-  

-      :param app: Sphinx application context.

-      """

- -    app.info('Initializing GitHub plugin')

- +    logger.info('Initializing GitHub plugin')

-      app.add_role('ghissue', ghissue_role)

-      app.add_role('ghpull', ghissue_role)

-      app.add_role('ghuser', ghuser_role)

file modified
+12 -12

@@ -4,7 +4,7 @@ 

  %global _docdir_fmt %{name}

  

  # Updating this package? Update the list of bundled things bellow

- Version:        5.7.8

+ Version:        6.0.2

  

  # a tag like rc1, set to %%{nil} if stable

  %global tag %{nil}

@@ -12,7 +12,7 @@ 

  # upstream version, like 1.2.3rc1

  %global uversion %{version}%{tag}

  

- Release:        4%{tag}%{?dist}

+ Release:        1%{tag}%{?dist}

  Summary:        A web-based notebook environment for interactive computing

  License:        BSD

  URL:            http://jupyter.org

@@ -22,9 +22,6 @@ 

  # See BZ: 1581899, 1580129

  Patch0:         0001-Use-MathJax-TeX-fonts-rather-than-STIXWeb.patch

  

- # Sphinx 2 compatibility

- Patch1:         https://github.com/jupyter/notebook/pull/4534.patch

- 

  BuildArch:      noarch

  

  BuildRequires:  python3-setuptools

@@ -60,6 +57,7 @@ 

  BuildRequires:  python3-nbsphinx

  BuildRequires:  python3-sphinx

  BuildRequires:  python3-sphinx_rtd_theme

+ BuildRequires:  python3-sphinxcontrib-github-alt

  BuildRequires:  python3-ipython-sphinx

  

  

@@ -95,16 +93,15 @@ 

  # Versions from bower.json

  Provides:       bundled(bootstrap) = 3.4

  Provides:       bundled(bootstrap-tour) = 0.9.0

- Provides:       bundled(codemirror) = 5.37

+ Provides:       bundled(codemirror) = 5.48.4

+ Provides:       bundled(create-react-class) = 15.6.3

  Provides:       bundled(es6-promise) = 1.0

  Provides:       bundled(google-caja) = 5669

  Provides:       bundled(jed) = 1.1.1

- Provides:       bundled(jquery) = 3.3

+ Provides:       bundled(jquery) = 3.4.1

  Provides:       bundled(jquery-typeahead) = 2.0.0

  Provides:       bundled(jquery-ui) = 1.12

- Provides:       bundled(preact) = 7.2.0

- Provides:       bundled(preact-compat) = 3.14.3

- Provides:       bundled(proptypes) = 0.14.4

+ Provides:       bundled(react) = 16.0.0

  Provides:       bundled(requirejs) = 2.2

  Provides:       bundled(requirejs-text) = 2.0.15

  Provides:       bundled(requirejs-plugins) = 1.0.3

@@ -174,7 +171,7 @@ 

  

  %files -n python3-%{pypi_name}

  %doc README.md

- %license COPYING.md

+ %license LICENSE

  %{_bindir}/jupyter-bundlerextension

  %{_bindir}/jupyter-nbextension

  %{_bindir}/jupyter-serverextension

@@ -184,10 +181,13 @@ 

  

  %files -n python-%{pypi_name}-doc

  %doc html

- %license COPYING.md

+ %license LICENSE

  

  

  %changelog

+ * Tue Nov 12 2019 Miro Hrončok <mhroncok@redhat.com> - 6.0.2-1

+ - Update to 6.0.2 (#1724407)

+ 

  * Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 5.7.8-4

  - Rebuilt for Python 3.8.0rc1 (#1748018)

  

file modified
+1 -1

@@ -1,1 +1,1 @@ 

- SHA512 (notebook-5.7.8.tar.gz) = 1cccb23ce6810df85b3b600c0e2e5d6599be5551ea5243c7b1a9c73ed45c34dea8b16b0fbb3624aefb9eda848bce2fdcea1f3add8df3f00a90c13a9b01ea3f07

+ SHA512 (notebook-6.0.2.tar.gz) = bdff994ddde98ca50d66e1c78326ae4fc15a38ea7bc1dd10dbcd14af4cc7631f09d8d15d25bb6a46111f45a0dc0b29a55b52b8b034c142294b4ec7f7b3ece9fa

rebased onto d101ac6

a month ago

Rebased to 6.0.2. it built locally in my mock.

  • nothing provides python3.8dist(jupyter-client) >= 5.3.4 needed by python3-notebook-6.0.2-1.fc32.noarch
  • nothing provides python3.8dist(jupyter-core) >= 4.6 needed by python3-notebook-6.0.2-1.fc32.noarch

OK, this will need more upgrades.

The patch looks fine, merge when ready.

I noticed in the build log that rebuilding the JS parts fails due to missing requirejs. I guess notebook uses pre-built JS in that case?

Yes. And that has been the case for years. I remember trying to make build the JS back then, but I have not succeeded.

Pull-Request has been merged by churchyard

14 days ago