From a9629a9c96e35320e186977b05b8f104f237428a97e2bd5fb4de365e1b0ee679 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Sun, 24 Dec 2023 14:16:20 +0000 Subject: [PATCH 1/5] - Update to 0.8.0 * Allow passing request_timeout to client_fetch #67 (@afbarbaro) * code maintenance - Disable the -server subpackage for Ring1 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-pytest-jupyter?expand=0&rev=9 --- pytest_jupyter-0.7.0.tar.gz | 3 --- pytest_jupyter-0.8.0.tar.gz | 3 +++ python-pytest-jupyter.changes | 8 ++++++++ python-pytest-jupyter.spec | 10 +++++++++- 4 files changed, 20 insertions(+), 4 deletions(-) delete mode 100644 pytest_jupyter-0.7.0.tar.gz create mode 100644 pytest_jupyter-0.8.0.tar.gz diff --git a/pytest_jupyter-0.7.0.tar.gz b/pytest_jupyter-0.7.0.tar.gz deleted file mode 100644 index 50b8e73..0000000 --- a/pytest_jupyter-0.7.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6403b7f6f5eaaa5a9faffd73d2ff1097106a7dc5c3204292212487fc9fb71843 -size 15507 diff --git a/pytest_jupyter-0.8.0.tar.gz b/pytest_jupyter-0.8.0.tar.gz new file mode 100644 index 0000000..f9ca551 --- /dev/null +++ b/pytest_jupyter-0.8.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:842817c300802c8608676bbb1460ba0081f2688cf5cb55b87d7bad5dcb0e9729 +size 15716 diff --git a/python-pytest-jupyter.changes b/python-pytest-jupyter.changes index e11f8b9..73850b5 100644 --- a/python-pytest-jupyter.changes +++ b/python-pytest-jupyter.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Dec 24 14:14:51 UTC 2023 - Ben Greiner + +- Update to 0.8.0 + * Allow passing request_timeout to client_fetch #67 (@afbarbaro) + * code maintenance +- Disable the -server subpackage for Ring1 + ------------------------------------------------------------------- Sun Apr 23 17:24:28 UTC 2023 - Ben Greiner diff --git a/python-pytest-jupyter.spec b/python-pytest-jupyter.spec index 37dc154..e24c3f4 100644 --- a/python-pytest-jupyter.spec +++ b/python-pytest-jupyter.spec @@ -25,8 +25,12 @@ %bcond_with test %endif +# defined at Ring1-MinimalX lettered staging prjconf +# We do not want jupyter-server in ring1 +%bcond_with ringdisabled + Name: python-pytest-jupyter%{psuffix} -Version: 0.7.0 +Version: 0.8.0 Release: 0 Summary: A pytest plugin for testing Jupyter libraries and extensions License: BSD-3-Clause AND MIT @@ -44,7 +48,9 @@ BuildArch: noarch BuildRequires: %{python_module nbformat} BuildRequires: %{python_module pytest-jupyter = %{version}} BuildRequires: %{python_module pytest-jupyter-client = %{version}} +%if !%{with ringdisabled} BuildRequires: %{python_module pytest-jupyter-server = %{version}} +%endif BuildRequires: %{python_module pytest-timeout} %endif %python_subpackages @@ -101,8 +107,10 @@ sed -i 's/--color=yes//' pyproject.toml %files %{python_files client} %license LICENSE +%if !%{with ringdisabled} %files %{python_files server} %license LICENSE %endif +%endif %changelog From 8c96429b5eca69608803d484044bdb1ff87e9492bdffec186c8ad345edd1d2c1 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Sun, 24 Dec 2023 14:24:51 +0000 Subject: [PATCH 2/5] update reqs OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-pytest-jupyter?expand=0&rev=10 --- python-pytest-jupyter.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/python-pytest-jupyter.spec b/python-pytest-jupyter.spec index e24c3f4..31cbe14 100644 --- a/python-pytest-jupyter.spec +++ b/python-pytest-jupyter.spec @@ -36,7 +36,7 @@ Summary: A pytest plugin for testing Jupyter libraries and extensions License: BSD-3-Clause AND MIT URL: https://github.com/jupyter-server/pytest-jupyter Source: https://files.pythonhosted.org/packages/source/p/pytest_jupyter/pytest_jupyter-%{version}.tar.gz -BuildRequires: %{python_module base >= 3.7} +BuildRequires: %{python_module base >= 3.8} BuildRequires: %{python_module hatchling} BuildRequires: %{python_module pip} BuildRequires: fdupes @@ -45,7 +45,6 @@ Requires: python-jupyter_core Requires: python-pytest BuildArch: noarch %if %{with test} -BuildRequires: %{python_module nbformat} BuildRequires: %{python_module pytest-jupyter = %{version}} BuildRequires: %{python_module pytest-jupyter-client = %{version}} %if !%{with ringdisabled} @@ -60,8 +59,9 @@ A pytest plugin for testing Jupyter libraries and extensions. %package client Summary: A pytest plugin for testing Jupyter libraries and extensions [client] extra -Requires: python-ipykernel +Requires: python-ipykernel >= 6.14 Requires: python-jupyter_client >= 7.4 +Requires: python-nbformat >= 5.3 Requires: python-pytest-jupyter = %{version} %description client @@ -70,6 +70,7 @@ This subpackage provides the [client] extra dependencies %package server Summary: A pytest plugin for testing Jupyter libraries and extensions [server] extra +Requires: python-ipykernel >= 6.14 Requires: python-jupyter-server >= 1.21 Requires: python-nbformat >= 5.3 Requires: python-pytest-jupyter = %{version} @@ -81,7 +82,7 @@ This subpackage provides the [server] extra dependencies %prep %setup -q -n pytest_jupyter-%{version} -sed -i 's/--color=yes//' pyproject.toml +sed -i 's/ "--color=yes",//' pyproject.toml %if !%{with test} %build @@ -94,6 +95,7 @@ sed -i 's/--color=yes//' pyproject.toml %if %{with test} %check +mv pytest_jupyter pytest_jupyter.moved %pytest %endif From 1460eb66c1750885e8bb83b340a66a04d04e6b344c47729f08d80aa1d821508a Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Sun, 24 Dec 2023 14:36:38 +0000 Subject: [PATCH 3/5] go OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-pytest-jupyter?expand=0&rev=11 --- python-pytest-jupyter.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python-pytest-jupyter.spec b/python-pytest-jupyter.spec index 31cbe14..575af08 100644 --- a/python-pytest-jupyter.spec +++ b/python-pytest-jupyter.spec @@ -82,7 +82,10 @@ This subpackage provides the [server] extra dependencies %prep %setup -q -n pytest_jupyter-%{version} -sed -i 's/ "--color=yes",//' pyproject.toml +sed -e 's/ "--color=yes",//' -i pyproject.toml +%if %{with ringdisabled} +sed -e "/jupyter_server/d" -i tests/conftest.py +%endif %if !%{with test} %build @@ -96,7 +99,7 @@ sed -i 's/ "--color=yes",//' pyproject.toml %if %{with test} %check mv pytest_jupyter pytest_jupyter.moved -%pytest +%pytest %{?_with_ringdisabled:--ignore tests/test_jupyter_server.py} %endif %if !%{with test} From eb6083ffab744a92d113937e5daa7fd4f10cc13751cfe34a665e691bca5f6ced Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Sun, 24 Dec 2023 14:41:30 +0000 Subject: [PATCH 4/5] . OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-pytest-jupyter?expand=0&rev=12 --- python-pytest-jupyter.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-pytest-jupyter.spec b/python-pytest-jupyter.spec index 575af08..7d0e83e 100644 --- a/python-pytest-jupyter.spec +++ b/python-pytest-jupyter.spec @@ -72,9 +72,9 @@ This subpackage provides the [client] extra dependencies Summary: A pytest plugin for testing Jupyter libraries and extensions [server] extra Requires: python-ipykernel >= 6.14 Requires: python-jupyter-server >= 1.21 +Requires: python-jupyter_client >= 7.4 Requires: python-nbformat >= 5.3 Requires: python-pytest-jupyter = %{version} -Requires: python-pytest-jupyter-client = %{version} %description server A pytest plugin for testing Jupyter libraries and extensions. From 57022ff97d26f28437735b67bc2048ee0581d7f2be0168d7d22a8625fc367734 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Sun, 24 Dec 2023 14:42:41 +0000 Subject: [PATCH 5/5] canonicalize OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-pytest-jupyter?expand=0&rev=13 --- python-pytest-jupyter.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python-pytest-jupyter.spec b/python-pytest-jupyter.spec index 7d0e83e..3022658 100644 --- a/python-pytest-jupyter.spec +++ b/python-pytest-jupyter.spec @@ -60,7 +60,7 @@ A pytest plugin for testing Jupyter libraries and extensions. %package client Summary: A pytest plugin for testing Jupyter libraries and extensions [client] extra Requires: python-ipykernel >= 6.14 -Requires: python-jupyter_client >= 7.4 +Requires: python-jupyter-client >= 7.4 Requires: python-nbformat >= 5.3 Requires: python-pytest-jupyter = %{version} @@ -71,8 +71,8 @@ This subpackage provides the [client] extra dependencies %package server Summary: A pytest plugin for testing Jupyter libraries and extensions [server] extra Requires: python-ipykernel >= 6.14 +Requires: python-jupyter-client >= 7.4 Requires: python-jupyter-server >= 1.21 -Requires: python-jupyter_client >= 7.4 Requires: python-nbformat >= 5.3 Requires: python-pytest-jupyter = %{version}