PR#4: Update to 6.1.7 - rpms/python-jupyter-client

rpms / python-jupyter-client

#4 Update to 6.1.7

Merged 3 years ago by thrnciar. Opened 3 years ago by thrnciar.

rpms/ thrnciar/python-jupyter-client update-to-6.1.7 into master

Update to 6.1.7, convert to pyproject macros

Tomas Hrnciar • 3 years ago

72ed0b9

python-jupyter-client.spec

file modified

+19 -28

		`@@ -2,8 +2,8 @@`
		`%global pypi_name_dash jupyter-client`

		`Name: python-%{pypi_name_dash}`
		`- Version: 6.1.5`
		`- Release: 2%{?dist}`
		`+ Version: 6.1.7`
		`+ Release: 1%{?dist}`
		`Summary: Jupyter protocol implementation and client libraries`

		`License: BSD`
		`@@ -12,33 +12,14 @@`

		`BuildArch: noarch`

		`- BuildRequires: python3-setuptools`
		`BuildRequires: python3-devel`
		`+ BuildRequires: pyproject-rpm-macros`

		`%bcond_without doc`
		`%bcond_without tests`

		`- %if %{with doc}`
		`- BuildRequires: python3-sphinx`
		`- BuildRequires: python3-sphinx_rtd_theme`
		`- BuildRequires: python3-sphinxcontrib-napoleon`
		`- BuildRequires: python3-sphinxcontrib-github-alt`
		`-`
		`- BuildRequires: python3-dateutil`
		`- BuildRequires: python3-ipython-doc`
		`- BuildRequires: python3-traitlets`
		`- BuildRequires: python3-ipykernel`
		`- BuildRequires: python3-jupyter-core`
		`- BuildRequires: python3-zmq`
		`- %endif`
		`-`
		`%if %{with tests}`
		`- BuildRequires: python3-dateutil`
		`- BuildRequires: python3-ipykernel`
		`- BuildRequires: python3-ipython`
		`- BuildRequires: python3-jupyter-core >= 4.6`
		`- BuildRequires: python3-pytest`
		`- BuildRequires: python3-tornado`
		`+ # The zmq tests are split in RPM only, the dependency is not tracked on Python level:`
		`BuildRequires: python3-zmq-tests`
		`%endif`

		`@@ -66,6 +47,10 @@`
		`%if %{with doc}`
		`%package -n python-%{pypi_name_dash}-doc`
		`Summary: Documentation of the Jupyter protocol reference implementation`
		`+ BuildRequires: python3-sphinx`
		`+ BuildRequires: python3-sphinx_rtd_theme`
		`+ BuildRequires: python3-sphinxcontrib-github-alt`
		`+`
		`%description -n python-%{pypi_name_dash}-doc`
		`Documentation of the reference implementation of the Jupyter protocol`
		`%endif`
		`@@ -79,8 +64,12 @@`
		`%endif`


		`+ %generate_buildrequires`
		`+ %pyproject_buildrequires %{?with_tests:-x test}`
		`+`
		`+`
		`%build`
		`- %py3_build`
		`+ %pyproject_wheel`

		`%if %{with doc}`
		`PYTHONPATH=build/lib/ sphinx-build-3 docs html`
		`@@ -90,7 +79,8 @@`


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


		`%if %{with tests}`
		`@@ -103,14 +93,12 @@`

		`%global _docdir_fmt %{name}`

		`- %files -n python3-%{pypi_name_dash}`
		`+ %files -n python3-%{pypi_name_dash} -f %{pyproject_files}`
		`%doc README.md`
		`%license COPYING.md`
		`%{_bindir}/jupyter-kernel`
		`%{_bindir}/jupyter-kernelspec`
		`%{_bindir}/jupyter-run`
		`- %{python3_sitelib}/%{pypi_name}-%{version}-py?.*.egg-info/`
		`- %{python3_sitelib}/%{pypi_name}/`

		`%if %{with doc}`
		`%files -n python-%{pypi_name_dash}-doc`
		`@@ -118,6 +106,9 @@`
		`%endif`

		`%changelog`
		`+ * Thu Sep 17 2020 Tomas Hrnciar <thrnciar@redhat.com> - 6.1.7-1`
		`+ - Update to 6.1.7 (#1868821)`
		`+`
		`* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.1.5-2`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (jupyter_client-6.1.5.tar.gz) = b289b07f1300a7aa541b15ece33340fde7dd9765a200214668ad3a124ec7fd98c742f61417c9d31d6daff9ecc1aaaca6ec516f359cc26007731c0f8d859a73a9`
		`+ SHA512 (jupyter_client-6.1.7.tar.gz) = 154734e75b26ac2db2a724aa40dd4f4bb7599f8a55dad03bbe09e3f29dd224d4cdf566b479661d20e3c13d79c062bc545ab709eab6fe645eff86a4c23c619d14`

thrnciar commented 3 years ago

ImportError while importing test module '/builddir/build/BUILD/jupyter_client-6.1.7/jupyter_client/tests/test_kernelmanager.py'.
Hint: make sure your test modules/packages have valid Python names.
Traceback:
/usr/lib64/python3.9/importlib/__init__.py:127: in import_module
    return _bootstrap._gcd_import(name[level:], package, level)
jupyter_client/tests/test_kernelmanager.py:17: in <module>
    from async_generator import async_generator, yield_
E   ModuleNotFoundError: No module named 'async_generator'

I'll update specfile with async_generator dependency.

thrnciar commented 3 years ago

[citest]

thrnciar commented 3 years ago

Scratch build passed: https://koji.fedoraproject.org/koji/taskinfo?taskID=51934745

PR is ready for review.

churchyard commented on line 19 of python-jupyter-client.spec 3 years ago

The bconds are gone now and so is the doc build. That is not entirely good.

This package needs to be bootstrapped (build without tests and docs first, then the dependencies are built, then this again with tests and docs).
Other packages (Build)Require python-jupyter-client-doc.

Edited 3 years ago by churchyard

rebased onto e0007dc

3 years ago

rebased onto 90347c4

3 years ago

rebased onto 2a982ab

3 years ago

thrnciar commented on line 17 of python-jupyter-client.spec 3 years ago

@churchyard, PTAL. I wasn't sure where to put this BuildRequire. Since there is no package for tests I put it here.

churchyard commented on line 17 of python-jupyter-client.spec 3 years ago

It doesn't really matter "where" you put this, here is fine, but please make sure to:

conditionalize on %{with tests}
add a comment that explains why this is needed (something like: the tests are split in RPM only, the dependency si not tracked on Python level)

churchyard commented on line 14 of python-jupyter-client.spec 3 years ago

BuildRequires: python3-setuptools should be removed (it is brought in by %pyproject_buildrequires if needed).

churchyard commented on line 61 of python-jupyter-client.spec 3 years ago

python-sphinx_rtd_theme -> python3-sphinx_rtd_theme, the same with python-sphinxcontrib-github-alt

churchyard commented on line 52 of python-jupyter-client.spec 3 years ago

+ Requires:  python-%{pypi_name_dash}-doc

Why was this added?

churchyard commented on line 71 of python-jupyter-client.spec 3 years ago

Please only use -x test when %{with tests}, for example:

%pyproject_buildrequires %{?with_tests:-t}

churchyard commented on line 74 of python-jupyter-client.spec 3 years ago

This should be part of the %prep section, not %generate_buildrequires.

thrnciar commented 3 years ago

+ Requires: python-%{pypi_name_dash}-doc

Why was this added?

I thought that it's needed for 2nd build with tests and docs.

The bconds are gone now and so is the doc build. That is not entirely good.

This package needs to be bootstrapped (build without tests and docs first, then the dependencies are built, then this again with tests and docs).

Other packages (Build)Require python-jupyter-client-doc.

rebased onto f178a67

3 years ago

churchyard commented 3 years ago

I thought that it's needed for 2nd build with tests and docs.

The need for 2 builds is "bootstrapping" -- it is not possible to build python-jupyter-client with doc+tests before other packages that (build)require python3-jupyter-client are rebuilt. That creates a build dependency loop that is often described as "dependency hell": You need to build A in order to build B, but you need B to build A.

So we first build this package without doc+tests in order to have (an untested) build of python3-jupyter-client available for other packages. Once all the (Build)Requires of python-jupyter-client are built, we enable doc and tests and build the package again.

In either case, the python3-jupyter-client package should not require python-jupyter-client-doc:

When built without doc, there is no python-jupyter-client-doc and python3-jupyter-client would fail to install.
When built with doc, the package would install, but the dependency would be redundant (the package does not require its documentation in order to function).

thrnciar commented 3 years ago

Thank you for the thorough explanation. PR is now updated with all of your suggestions.

churchyard commented on line 19 of python-jupyter-client.spec 3 years ago