PR#22: Update to 6.1.6, lists files manually - rpms/python-notebook

rpms / python-notebook

#22 Update to 6.1.6, lists files manually

Merged 3 years ago by churchyard. Opened 3 years ago by churchyard.

rpms/ churchyard/python-notebook 6.1.6 into master

Update to 6.1.6

Miro Hrončok • 3 years ago

7722c40

Manually list files

Miro Hrončok • 3 years ago

666b2ca

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

file modified

+14 -14

		`@@ -1,18 +1,18 @@`
		`- From d049b9309cf682c777a974d69bfa83f1abe5ad35 Mon Sep 17 00:00:00 2001`
		`+ From ea89aee27489e44c2366f086f524a1564f2a3f63 Mon Sep 17 00:00:00 2001`
		`From: Jonathan Underwood <jonathan.underwood@gmail.com>`
		`Date: Sat, 26 May 2018 21:15:14 +0100`
		`Subject: [PATCH] Use MathJax TeX fonts rather than STIXWeb`

		`---`
		`- notebook/static/notebook/js/main.min.js \| 6 +++---`
		`- notebook/static/notebook/js/mathjaxutils.js \| 6 +++---`
		`+ notebook/static/base/js/mathjaxutils.js \| 6 +++---`
		`+ notebook/static/notebook/js/main.min.js \| 6 +++---`
		`2 files changed, 6 insertions(+), 6 deletions(-)`

		`- diff --git a/notebook/static/notebook/js/main.min.js b/notebook/static/notebook/js/main.min.js`
		`- index a2c5832..1d1ccee 100644`
		`- --- a/notebook/static/notebook/js/main.min.js`
		`- +++ b/notebook/static/notebook/js/main.min.js`
		`- @@ -28427,10 +28427,10 @@ define('notebook/js/mathjaxutils',[`
		`+ diff --git a/notebook/static/base/js/mathjaxutils.js b/notebook/static/base/js/mathjaxutils.js`
		`+ index 296f15e..4430bdf 100644`
		`+ --- a/notebook/static/base/js/mathjaxutils.js`
		`+ +++ b/notebook/static/base/js/mathjaxutils.js`
		`+ @@ -29,10 +29,10 @@ define([`
		`// we use CSS to left justify single line equations in code cells.`
		`displayAlign: 'center',`
		`"HTML-CSS": {`
		`@@ -26,11 +26,11 @@`
		`styles: {'.MathJax_Display': {"margin": 0}},`
		`linebreaks: { automatic: true }`
		`},`
		`- diff --git a/notebook/static/notebook/js/mathjaxutils.js b/notebook/static/notebook/js/mathjaxutils.js`
		`- index 20dbfa9..c1020d4 100644`
		`- --- a/notebook/static/notebook/js/mathjaxutils.js`
		`- +++ b/notebook/static/notebook/js/mathjaxutils.js`
		`- @@ -26,10 +26,10 @@ define([`
		`+ diff --git a/notebook/static/notebook/js/main.min.js b/notebook/static/notebook/js/main.min.js`
		`+ index d782d36..4363c16 100644`
		`+ --- a/notebook/static/notebook/js/main.min.js`
		`+ +++ b/notebook/static/notebook/js/main.min.js`
		`+ @@ -26895,10 +26895,10 @@ define('base/js/mathjaxutils',[`
		`// we use CSS to left justify single line equations in code cells.`
		`displayAlign: 'center',`
		`"HTML-CSS": {`
		`@@ -45,5 +45,5 @@`
		`linebreaks: { automatic: true }`
		`},`
		`--`
		`- 2.17.0`
		`+ 2.30.0`

cdb103c3f097dd680fea3a2ea0391b01b744884a.patch

file removed

-24

		`@@ -1,24 +0,0 @@`
		`- From cdb103c3f097dd680fea3a2ea0391b01b744884a Mon Sep 17 00:00:00 2001`
		`- From: Tomas Hrnciar <thrnciar@redhat.com>`
		`- Date: Wed, 30 Sep 2020 13:00:39 +0200`
		`- Subject: [PATCH] Add sphinx_rtd_theme to documentation dependencies in`
		`- setup.py`
		`-`
		`- Fixes: #5781`
		`- ---`
		`- setup.py \| 2 +-`
		`- 1 file changed, 1 insertion(+), 1 deletion(-)`
		`-`
		`- diff --git a/setup.py b/setup.py`
		`- index de6ab7ae12..b1dccc909f 100755`
		`- --- a/setup.py`
		`- +++ b/setup.py`
		`- @@ -118,7 +118,7 @@`
		`- extras_require = {`
		`- 'test': ['nose', 'coverage', 'requests', 'nose_warnings_filters',`
		`- 'nbval', 'nose-exclude', 'selenium', 'pytest', 'pytest-cov'],`
		`- - 'docs': ['sphinx', 'nbsphinx', 'sphinxcontrib_github_alt'],`
		`- + 'docs': ['sphinx', 'nbsphinx', 'sphinxcontrib_github_alt', 'sphinx_rtd_theme'],`
		`- 'test:sys_platform != "win32"': ['requests-unixsocket'],`
		`- },`
		`- python_requires = '>=3.5',`

python-notebook.spec

file modified

+31 -16

		`@@ -4,7 +4,7 @@`
		`%global _docdir_fmt %{name}`

		`# Updating this package? Update the list of bundled things bellow`
		`- Version: 6.1.4`
		`+ Version: 6.1.6`

		`# a tag like rc1, set to %%{nil} if stable`
		`%global tag %{nil}`
		`@@ -22,12 +22,6 @@`
		`# See BZ: 1581899, 1580129`
		`Patch0: 0001-Use-MathJax-TeX-fonts-rather-than-STIXWeb.patch`

		`- # sphinx_rtd_theme is no longer a hard dependency since sphinx 1.4.0`
		`- # and must be listed between docs dependencies in setup.py to be`
		`- # detected by pyproject-rpm-macros.`
		`- # It was reported to upstream and can be removed once it is released.`
		`- Patch1: https://github.com/jupyter/notebook/commit/cdb103c3f097dd680fea3a2ea0391b01b744884a.patch`
		`-`
		`BuildArch: noarch`

		`BuildRequires: python3-devel`
		`@@ -42,6 +36,10 @@`
		`# it is required to build the docs`
		`BuildRequires: python3-ipython-sphinx`

		`+ # ipython_genutils/testing/decorators.py imports nose`
		`+ # https://github.com/jupyter/notebook/pull/5826#issuecomment-756231610`
		`+ BuildRequires: python3-nose`
		`+`
		`# for tests`
		`BuildRequires: pandoc`

		`@@ -103,16 +101,12 @@`
		`%prep`
		`%autosetup -n %{pypi_name}-%{uversion} -S git`

		`- # Nose plugins are needed for tests run with nose.`
		`- # Upstream supports it, but we don't need it since we use pytest.`
		`- # Note that unfortunately we still need nose itself because it is imported.`
		`- #`
		`# The nbval package is used for validation of notebooks.`
		`# It's sedded out because it isn't yet packaged in Fedora.`
		`#`
		`# Selenium tests are skipped.`
		`# We don't test coverage.`
		`- for pkg in nose_warnings_filters nose-exclude nbval selenium coverage pytest-cov; do`
		`+ for pkg in nbval selenium coverage pytest-cov; do`
		`sed -Ei "s/'$pkg',? ?//" setup.py`
		`done`

		`@@ -132,10 +126,8 @@`

		`%install`
		`%pyproject_install`
		`- %pyproject_save_files %{pypi_name}`

		`- # https://github.com/jupyter/notebook/issues/2373`
		`- rm -f %{buildroot}%{_bindir}/less-watch`
		`+ # Don't use %%pyproject_save_files, because we'll change a lot`

		`# unbundle stuff`
		`pushd %{buildroot}%{python3_sitelib}/%{pypi_name}/static/components`
		`@@ -161,6 +153,9 @@`
		`# Remove packaged tests`
		`rm -rv $(find %{buildroot}%{python3_sitelib}/%{pypi_name} -type d -name tests)`

		`+ # Remove .po files`
		`+ rm -v $(find %{buildroot}%{python3_sitelib}/%{pypi_name}/i18n -type f -name '*.po')`
		`+`

		`%check`
		`# Workaround: OSError: [Errno 18] Invalid cross-device link: b'/tmp/...' -> b'/builddir/.local/share/Trash/files/...'`
		`@@ -180,13 +175,29 @@`
		`end`


		`- %files -n python3-%{pypi_name} -f %{pyproject_files}`
		`+ %files -n python3-%{pypi_name}`
		`%doc README.md`
		`%license LICENSE`
		`%{_bindir}/jupyter-bundlerextension`
		`%{_bindir}/jupyter-nbextension`
		`%{_bindir}/jupyter-serverextension`
		`%{_bindir}/jupyter-notebook`
		`+ %{python3_sitelib}/notebook-%{version}.dist-info/`
		`+`
		`+ # Exclude i18n:`
		`+ %dir %{python3_sitelib}/notebook/`
		`+ %{python3_sitelib}/notebook/[_a-hj-z]*`
		`+`
		`+ # Language files (could be scripted, but is short)`
		`+ %dir %{python3_sitelib}/notebook/i18n/`
		`+ %{python3_sitelib}/notebook/i18n/*.py`
		`+ %{python3_sitelib}/notebook/i18n/__pycache__/`
		`+ %lang(fr) %{python3_sitelib}/notebook/i18n/fr_FR/`
		`+ %lang(ja) %{python3_sitelib}/notebook/i18n/ja_JP/`
		`+ %lang(nl) %{python3_sitelib}/notebook/i18n/nl/`
		`+ %lang(ru) %{python3_sitelib}/notebook/i18n/ru_RU/`
		`+ %lang(zh) %{python3_sitelib}/notebook/i18n/zh_CN/`
		`+`

		`%files -n python-%{pypi_name}-doc`
		`%doc html`
		`@@ -194,6 +205,10 @@`


		`%changelog`
		`+ * Thu Jan 07 2021 Miro Hrončok <mhroncok@redhat.com> - 6.1.6-1`
		`+ - Update to 6.1.6`
		`+ - Fixes: rhbz#1895357`
		`+`
		`* Thu Sep 10 2020 Tomas Hrnciar <thrnciar@redhat.com> - 6.1.4-1`
		`- Update to 6.1.4`
		`- fixes rhbz#1844874`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (notebook-6.1.4.tar.gz) = 55637ec76b283429ac8bc1de260529983cf0e4cb0f25b268330fcc1d07c6e75329d2806eaa5f10d149bf80bd11df26592fa71548fa03bdb05a57265221466b57`
		`+ SHA512 (notebook-6.1.6.tar.gz) = d1271273ae9cc098d5937a3ac91dc8035b033bb8da799f31c5d71abe48b17579f2fadc8b0ff7134dedda72ac49cc29c5adafaa4ef6f347cc4f6698ab46d83040`