From 20498fd50e7a03452a43c4d4a87c1ca3a2fd4bf4134880e2f39bb3d917d52058 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Wed, 13 Jul 2022 08:25:10 +0000 Subject: [PATCH] Accepting request 988792 from home:apersaud:branches:devel:languages:python:jupyter update to latest version OBS-URL: https://build.opensuse.org/request/show/988792 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-ipykernel?expand=0&rev=52 --- ipykernel-6.15.0.tar.gz | 3 -- ipykernel-6.15.1.tar.gz | 3 ++ python-ipykernel.changes | 14 +++++++ python-ipykernel.spec | 82 +++++++++++++++++++------------------- support-hatchling-14.patch | 71 --------------------------------- 5 files changed, 57 insertions(+), 116 deletions(-) delete mode 100644 ipykernel-6.15.0.tar.gz create mode 100644 ipykernel-6.15.1.tar.gz delete mode 100644 support-hatchling-14.patch diff --git a/ipykernel-6.15.0.tar.gz b/ipykernel-6.15.0.tar.gz deleted file mode 100644 index 9ca672f..0000000 --- a/ipykernel-6.15.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b59f9d9672c3a483494bb75915a2b315e78b833a38b039b1ee36dc28683f0d89 -size 134691 diff --git a/ipykernel-6.15.1.tar.gz b/ipykernel-6.15.1.tar.gz new file mode 100644 index 0000000..c18f4f9 --- /dev/null +++ b/ipykernel-6.15.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:37acc3254caa8a0dafcddddc8dc863a60ad1b46487b68aee361d9a15bda98112 +size 133140 diff --git a/python-ipykernel.changes b/python-ipykernel.changes index 7d80154..b1e5434 100644 --- a/python-ipykernel.changes +++ b/python-ipykernel.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sat Jul 9 13:30:40 UTC 2022 - Arun Persaud + +- specfile: + * remove patch support-hatchling-14.patch (included upstream) + +- update to version 6.15.1: + * Bugs fixed + + Fix inclusion of launcher file and check in CI #964 (@blink1073) + * Maintenance and upkeep improvements + + [pre-commit.ci] pre-commit autoupdate #962 (@pre-commit-ci) + + [pre-commit.ci] pre-commit autoupdate #961 (@pre-commit-ci) + + [pre-commit.ci] pre-commit autoupdate #960 (@pre-commit-ci) + ------------------------------------------------------------------- Fri Jul 8 10:57:40 UTC 2022 - Steve Kowalik diff --git a/python-ipykernel.spec b/python-ipykernel.spec index 251cf85..bcb4e86 100644 --- a/python-ipykernel.spec +++ b/python-ipykernel.spec @@ -19,54 +19,13 @@ %{?!python_module:%define python_module() python3-%{**}} %define skip_python2 1 Name: python-ipykernel -Version: 6.15.0 +Version: 6.15.1 Release: 0 Summary: IPython Kernel for Jupyter License: BSD-3-Clause Group: Development/Languages/Python URL: https://github.com/ipython/ipykernel Source: https://files.pythonhosted.org/packages/source/i/ipykernel/ipykernel-%{version}.tar.gz -# PATCH-FIX-UPSTREAM Support hatchling >= 1.4 gh#ipython/ipykernel#964 -Patch0: support-hatchling-14.patch -# SECTION build-system -BuildRequires: %{python_module base >= 3.7} -BuildRequires: %{python_module hatchling >= 1.4} -BuildRequires: %{python_module pip} -BuildRequires: fdupes -BuildRequires: jupyter-jupyter_core-filesystem -BuildRequires: python-rpm-macros -# /SECTION -# SECTION dependencies -Requires: python-debugpy >= 1.0 -Requires: python-ipython >= 7.23.1 -Requires: python-jupyter-client >= 6.1.12 -Requires: python-matplotlib-inline >= 0.1 -Requires: python-nest-asyncio -Requires: python-packaging -Requires: python-psutil -Requires: python-pyzmq >= 17 -Requires: python-tornado >= 6.1 -Requires: python-traitlets >= 5.1.0 -BuildRequires: %{python_module debugpy >= 1.0} -BuildRequires: %{python_module ipython >= 7.23.1} -BuildRequires: %{python_module jupyter-client >= 6.1.12} -BuildRequires: %{python_module matplotlib-inline >= 0.1} -BuildRequires: %{python_module nest-asyncio} -BuildRequires: %{python_module packaging} -BuildRequires: %{python_module psutil} -BuildRequires: %{python_module pyzmq >= 17} -BuildRequires: %{python_module tornado >= 6.1} -BuildRequires: %{python_module traitlets >= 5.1.0} -# /SECTION -# SECTION test requirements -BuildRequires: %{python_module pytest >= 6.0} -BuildRequires: %{python_module curio} -BuildRequires: %{python_module flaky} -BuildRequires: %{python_module pytest-timeout} -BuildRequires: %{python_module trio} -# we don't want ipyparallel and its dependencies in Ring1, see below -#BuildRequires: #{python_module ipyparallel} -# /SECTION Requires: jupyter-jupyter-client >= 6.1.12 Provides: python-jupyter_ipykernel = %{version} Obsoletes: python-jupyter_ipykernel < %{version} @@ -77,6 +36,45 @@ Obsoletes: %{python_module jupyter_ipykernel-doc < %{version}} Provides: %{python_module jupyter-ipykernel-doc = %{version}} Obsoletes: %{python_module jupyter-ipykernel-doc < %{version}} BuildArch: noarch +# SECTION build-system +BuildRequires: %{python_module base >= 3.7} +BuildRequires: %{python_module hatchling >= 1.4} +BuildRequires: %{python_module pip} +BuildRequires: fdupes +BuildRequires: jupyter-jupyter_core-filesystem +BuildRequires: python-rpm-macros +# /SECTION +# SECTION dependencies +BuildRequires: %{python_module debugpy >= 1.0} +BuildRequires: %{python_module ipython >= 7.23.1} +BuildRequires: %{python_module jupyter-client >= 6.1.12} +BuildRequires: %{python_module matplotlib-inline >= 0.1} +BuildRequires: %{python_module nest-asyncio} +BuildRequires: %{python_module packaging} +BuildRequires: %{python_module psutil} +BuildRequires: %{python_module pyzmq >= 17} +BuildRequires: %{python_module tornado >= 6.1} +BuildRequires: %{python_module traitlets >= 5.1.0} +Requires: python-debugpy >= 1.0 +Requires: python-ipython >= 7.23.1 +Requires: python-jupyter-client >= 6.1.12 +Requires: python-matplotlib-inline >= 0.1 +Requires: python-nest-asyncio +Requires: python-packaging +Requires: python-psutil +Requires: python-pyzmq >= 17 +Requires: python-tornado >= 6.1 +Requires: python-traitlets >= 5.1.0 +# /SECTION +# SECTION test requirements +BuildRequires: %{python_module curio} +BuildRequires: %{python_module flaky} +BuildRequires: %{python_module pytest >= 6.0} +BuildRequires: %{python_module pytest-timeout} +BuildRequires: %{python_module trio} +# we don't want ipyparallel and its dependencies in Ring1, see below +#BuildRequires: #{python_module ipyparallel} +# /SECTION %if "%{python_flavor}" == "python3" || "%{python_provides}" == "python3" Provides: jupyter-ipykernel = %{version}-%{release} Obsoletes: jupyter-ipykernel < %{version}-%{release} diff --git a/support-hatchling-14.patch b/support-hatchling-14.patch deleted file mode 100644 index b7687df..0000000 --- a/support-hatchling-14.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 694a01ee595efb29455a019dcc880746b5ab00b3 Mon Sep 17 00:00:00 2001 -From: Steven Silvester -Date: Fri, 8 Jul 2022 05:30:41 -0500 -Subject: [PATCH 1/2] fix inclusion of launcher file and check in CI - ---- - .github/workflows/ci.yml | 4 ++++ - pyproject.toml | 6 +++--- - 2 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml -index 151dd3e9..4548c1a8 100644 ---- a/.github/workflows/ci.yml -+++ b/.github/workflows/ci.yml -@@ -77,6 +77,10 @@ jobs: - run: | - codecov - -+ - name: Check Launcher -+ run: cd $HOME -+ python -m ipykernel_launcher --help -+ - pre-commit: - name: pre-commit - runs-on: ubuntu-latest -diff --git a/pyproject.toml b/pyproject.toml -index 3c6487ab..5de353fb 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -1,5 +1,5 @@ - [build-system] --requires = ["hatchling>=0.25", "jupyter_client>=6"] -+requires = ["hatchling>=1.4", "jupyter_client>=6"] - build-backend = "hatchling.build" - - [project] -@@ -54,8 +54,8 @@ test = [ - [tool.hatch.build.targets.wheel.shared-data] - "data_kernelspec" = "share/jupyter/kernels/python3" - --[tool.hatch.build] --artifacts = ["ipykernel_launcher.py"] -+[tool.hatch.build.force-include] -+"./ipykernel_launcher.py" = "ipykernel_launcher.py" - - [tool.jupyter-releaser] - skip = ["check-links"] - -From b743712e07bf5ed2d9c019e3b593eb4cb009d76c Mon Sep 17 00:00:00 2001 -From: Steven Silvester -Date: Fri, 8 Jul 2022 05:36:40 -0500 -Subject: [PATCH 2/2] fix workflow syntax - ---- - .github/workflows/ci.yml | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml -index 4548c1a8..8464830c 100644 ---- a/.github/workflows/ci.yml -+++ b/.github/workflows/ci.yml -@@ -78,7 +78,8 @@ jobs: - codecov - - - name: Check Launcher -- run: cd $HOME -+ run: | -+ cd $HOME - python -m ipykernel_launcher --help - - pre-commit: