#43 Update to 7.0.0
Merged a year ago by churchyard. Opened a year ago by lbalhar.
rpms/ lbalhar/python-notebook v7  into  rawhide

file modified
+15 -57
@@ -1,11 +1,12 @@ 

  # Unset -s on python shebang - ensure that extensions installed with pip

  # to user locations are seen and properly loaded

  %global py3_shebang_flags %(echo %py3_shebang_flags | sed s/s//)

+ %global prerel a15

  

  Name:           python-notebook

  %global _docdir_fmt %{name}

  

- Version:        6.5.3

+ Version:        7.0.0%{prerel}

  Release:        %autorelease

  Summary:        A web-based notebook environment for interactive computing

  License:        BSD
@@ -15,8 +16,6 @@ 

  BuildArch:      noarch

  

  BuildRequires:  python3-devel

- # For translations

- BuildRequires:  babel

  # For validating desktop entry

  BuildRequires:  desktop-file-utils

  
@@ -30,6 +29,7 @@ 

  

  %package -n     python3-notebook

  Summary:        %{summary}

+ Requires:       python-jupyter-filesystem

  %py_provides    python3-jupyter-notebook

  %py_provides    python3-ipython-notebook

  %py_provides    notebook
@@ -43,40 +43,22 @@ 

  

  # 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 because the version in Fedora is too old.

  # We don't test coverage.

- for pkg in nbval "selenium==.*" coverage pytest-cov; do

-   sed -Ei "s/'$pkg',? ?//" setup.py

+ # pytest-tornasync is unmaintained upstream and will be

+ # replaced by pytest-jupyter.

+ for pkg in nbval "selenium==.*" coverage pytest-cov pytest-tornasync; do

+   sed -Ei "/\"$pkg\",?/d" pyproject.toml

  done

  

+ # Remove all backup files

+ find ./ -name "*.json.orig" -delete

  

  %generate_buildrequires

  %pyproject_buildrequires -x test

  

  

  %build

- # Generate .mo files from .po files and remove .po files

- pushd notebook/i18n

- for lang in $(ls -d */ | tr -d "/")

- do

-   for file in nbui notebook

-   do

-     pybabel compile -D ${file} -f -l ${lang} -i ${lang}/LC_MESSAGES/${file}.po -o ${lang}/LC_MESSAGES/${file}.mo

-     rm -v ${lang}/LC_MESSAGES/${file}.po

-   done

- 

-   # Unfortunately this neither works with po2json from translate-toolkit nor

-   # with the po2json package from PyPI and the JS implementation:

-   # https://www.npmjs.com/package/po2json

-   # is not availabe in Fedora. But the files should be available

-   # upstream. Issue: https://github.com/jupyter/notebook/issues/6717

-   # po2json -p -F -f jed1.x -d nbjs ${lang}/LC_MESSAGES/nbjs.po ${lang}/LC_MESSAGES/nbjs.json

-   rm -v ${lang}/LC_MESSAGES/nbjs.po

- 

- done

- popd

- 

  %pyproject_wheel

  

  
@@ -84,13 +66,11 @@ 

  %pyproject_install

  %pyproject_save_files notebook

  

- # Remove nbjs.json files from pyproject_files

- # to add them manually later with %%lang

- sed -i "/LC_MESSAGES\/nbjs.json/d" %{pyproject_files}

- 

+ install -m 0755 -p -d %{buildroot}%{_sysconfdir}/jupyter/jupyter_server_config.d

+ mv -v %{buildroot}{%{_prefix},}%{_sysconfdir}/jupyter/jupyter_server_config.d/notebook.json

  

  %check

- %pytest --ignore notebook/tests/selenium

+ %pytest -W ignore::DeprecationWarning --ignore notebook/tests/selenium

  

  desktop-file-validate %{buildroot}%{_datadir}/applications/jupyter-notebook.desktop

  
@@ -98,34 +78,12 @@ 

  %files -n python3-notebook -f %{pyproject_files}

  %doc README.md

  %license LICENSE

- %{_bindir}/jupyter-bundlerextension

- %{_bindir}/jupyter-nbextension

- %{_bindir}/jupyter-serverextension

  %{_bindir}/jupyter-notebook

- # lang .json files not detected by save_files

- %lang(fr) %{python3_sitelib}/notebook/i18n/fr_FR/LC_MESSAGES/nbjs.json

- %lang(ja) %{python3_sitelib}/notebook/i18n/ja_JP/LC_MESSAGES/nbjs.json

- %lang(nl) %{python3_sitelib}/notebook/i18n/nl/LC_MESSAGES/nbjs.json

- %lang(ru) %{python3_sitelib}/notebook/i18n/ru_RU/LC_MESSAGES/nbjs.json

- %lang(zh) %{python3_sitelib}/notebook/i18n/zh_CN/LC_MESSAGES/nbjs.json

- # Desktop integration

+ %config(noreplace) %{_sysconfdir}/jupyter/jupyter_server_config.d/notebook.json

+ %{_datadir}/jupyter/lab/schemas/@jupyter-notebook/

+ %{_datadir}/jupyter/labextensions/@jupyter-notebook/

  %{_datadir}/applications/jupyter-notebook.desktop

  %{_datadir}/icons/hicolor/scalable/apps/notebook.svg

- # Tests

- %exclude %{python3_sitelib}/notebook/auth/tests

- %exclude %{python3_sitelib}/notebook/bundler/tests

- %exclude %{python3_sitelib}/notebook/nbconvert/tests

- %exclude %{python3_sitelib}/notebook/services/api/tests

- %exclude %{python3_sitelib}/notebook/services/config/tests

- %exclude %{python3_sitelib}/notebook/services/contents/tests

- %exclude %{python3_sitelib}/notebook/services/kernels/tests

- %exclude %{python3_sitelib}/notebook/services/kernelspecs/tests

- %exclude %{python3_sitelib}/notebook/services/nbconvert/tests

- %exclude %{python3_sitelib}/notebook/services/sessions/tests

- %exclude %{python3_sitelib}/notebook/terminal/tests

- %exclude %{python3_sitelib}/notebook/tests

- %exclude %{python3_sitelib}/notebook/tree/tests

- 

  

  %changelog

  %autochangelog

file modified
+1 -1
@@ -1,1 +1,1 @@ 

- SHA512 (notebook-6.5.3.tar.gz) = 27177908960ca2e4c83bc5f4502250e02a885daed5f9ad67694502794f140e9e66f0cb24568a3903600c8f5cbae6d626fd7bfd362e23cc523bb42c210f5d2c70

+ SHA512 (notebook-7.0.0a15.tar.gz) = f1f0638a39803fb7644f85929896374eb594675739326a61e8a7df1057eefae24e07d5edcfbb684382b7d45503930e8450d11fb01cb73bd17c7dee145105711f

This is based on the update to 6.5.2: https://src.fedoraproject.org/rpms/python-notebook/pull-request/42 and on top of JupyterLab and all its dependencies (https://copr.fedorainfracloud.org/coprs/lbalhar/notebook/).

I'm opening this just because I wanted to test version 7 on top of JupyterLab to see that the whole stack is working.

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.
Warning:
Error merging src.fedoraproject.org/rpms/python-notebook for 43,0c4d4980cc6326a6dffa290fae3d9502ea473182

2 new commits added

  • Update to 7.0.0a14
  • Update to 6.5.2 (#2062405)
a year ago

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.
Warning:
Error merging src.fedoraproject.org/rpms/python-notebook for 43,61dfe40b1067f8bda7a7605c95d7a2e1724db7a9

rebased onto 8b6d452159f7a9d2cfcd0ef5e822db5dcf9ed2e1

a year ago

rebased onto 15ff647c7acb10d041824006ba93ed1de40acf6c

a year ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/9becdc88b705448db6424f295764d4c1

rebased onto 65ceb49062f1b6601ce31c24710b20290bd8c060

a year ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/78a243635d994014ab4d01edfa9cb369

This is no longer a WIP as everything what this update needs should already be available in rawhide. @ksurma are you still interested in this stack if I promise that this is the very last missing piece? :smile:

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/e5ec813e792a49fbb3d5679225415241

rpminspect says:

Packages should not contain files or directories ending with .orig on noarch in python3-notebook: /usr/share/jupyter/lab/schemas/@jupyter-notebook/application-extension/package.json.orig
/usr/share/jupyter/lab/schemas/@jupyter-notebook/documentsearch-extension/package.json.orig
/usr/share/jupyter/lab/schemas/@jupyter-notebook/help-extension/package.json.orig
/usr/share/jupyter/lab/schemas/@jupyter-notebook/notebook-extension/package.json.orig
/usr/share/jupyter/lab/schemas/@jupyter-notebook/tree-extension/package.json.orig
/usr/share/jupyter/labextensions/@jupyter-notebook/lab-extension/schemas/@jupyter-notebook/lab-extension/package.json.orig

Please use trailing slash for directories for easier readability and an additional check that they remain directories.

1 new commit added

  • fixup! Update to 7.0.0a14
a year ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/70328cee4427410aa229ff4045c455b9

rebased onto 8ab8329a5d8d48e76dbf1bf8f86dbff2c1fb9084

a year ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/da154f5d3ea24ce5a0e92c1a44364bef

Suggestion: Use 7.0.0%{prerel}

Could you please add a comment about the DeprecationWarning? Preferably with an upstream issue link.

rpmlint says:

python3-notebook.noarch: E: zero-length /usr/lib/python3.11/site-packages/notebook/py.test
python-notebook.src: W: strange-permission python-notebook.spec 600

strange-permission is weird, I don't think you ever touched that here, maybe a bug in Zuul or rpmlint, will check in other packages before reporting.

Do you know what the empty file is for?


a15 is out

rebased onto 421a8e13a361363956dc4c69988497f99fb09b37

a year ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/4666d52fa88a4e7190c6b33ee6672fe0

Suggestion: Use 7.0.0%{prerel}

Done.

Could you please add a comment about the DeprecationWarning? Preferably with an upstream issue link.

Not right now. The problem is somewhere between jupyter_client and jupyter_core. Not sure I want to invest time here given the fact we'll update jupyter_client soon.

rpmlint says:

python3-notebook.noarch: E: zero-length /usr/lib/python3.11/site-packages/notebook/py.test

Do you know what the empty file is for?

I don't, https://github.com/jupyter/notebook/issues/6763

a15 is out

Updated.

Updated.

Please upload sources.

rebased onto 96ba0af

a year ago

Updated.

Please upload sources.

Done.

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/6219c38bd1244d4eacbcadd5b3961229

Pull-Request has been merged by churchyard

a year ago
Metadata