Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package python-pip-run for openSUSE:Factory 
checked in at 2022-08-06 22:07:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pip-run (Old)
 and      /work/SRC/openSUSE:Factory/.python-pip-run.new.1521 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "python-pip-run"

Sat Aug  6 22:07:52 2022 rev:2 rq:993328 version:8.8.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pip-run/python-pip-run.changes    
2022-07-14 16:34:52.228662840 +0200
+++ /work/SRC/openSUSE:Factory/.python-pip-run.new.1521/python-pip-run.changes  
2022-08-06 22:08:00.638630832 +0200
@@ -1,0 +2,6 @@
+Fri Aug  5 09:14:48 UTC 2022 - Ben Greiner <[email protected]>
+
+- Add pip-run-suse-ring1-no-nbformat.patch for removal of nbformat
+  from Ring1 (pip-run will be in Ring1 for setuptools:test)
+
+-------------------------------------------------------------------

New:
----
  pip-run-suse-ring1-no-nbformat.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-pip-run.spec ++++++
--- /var/tmp/diff_new_pack.J8LnFm/_old  2022-08-06 22:08:01.102632181 +0200
+++ /var/tmp/diff_new_pack.J8LnFm/_new  2022-08-06 22:08:01.106632193 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package python-pip-run
+# spec file
 #
 # Copyright (c) 2022 SUSE LLC
 #
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
+
 %global flavor @BUILD_FLAVOR@%{nil}
 %if "%{flavor}" == "test"
 %define psuffix -test
@@ -23,6 +24,8 @@
 %define psuffix %{nil}
 %bcond_with test
 %endif
+# Disables installing nbformat for tests in Ring1 (see also Patch1)
+%bcond_with ringdisabled
 
 Name:           python-pip-run%{psuffix}
 Version:        8.8.1
@@ -34,28 +37,32 @@
 # Needs the wheels for path and path.py for testing
 Source10:       
https://files.pythonhosted.org/packages/py3/p/path.py/path.py-12.5.0-py3-none-any.whl
 Source11:       
https://files.pythonhosted.org/packages/py3/p/path/path-16.4.0-py3-none-any.whl
-BuildRequires:  python-rpm-macros
-BuildRequires:  %{python_module setuptools >= 56}
-BuildRequires:  %{python_module setuptools_scm >= 3.4.1}
+# PATCH-FEATURE-OPENSUSE pip-run-suse-ring1-no-nbformat.patch 
[email protected] -- Don't test with nbformat if not available
+Patch1:         pip-run-suse-ring1-no-nbformat.patch
 BuildRequires:  %{python_module base >= 3.7}
 BuildRequires:  %{python_module pip}
+BuildRequires:  %{python_module setuptools >= 56}
+BuildRequires:  %{python_module setuptools_scm >= 3.4.1}
 BuildRequires:  %{python_module wheel}
 BuildRequires:  fdupes
-Requires:       python-pip >= 19.3
+BuildRequires:  python-rpm-macros
 Requires:       python-autocommand
-Requires:       python-path >= 15.1
 Requires:       python-packaging
+Requires:       python-path >= 15.1
+Requires:       python-pip >= 19.3
 Requires(post): update-alternatives
 Requires(postun):update-alternatives
 %if 0%{?python_version_nodots} < 38
 Requires:       python-importlib-metadata
 %endif
 %if %{with test}
+BuildRequires:  %{python_module Pygments}
 BuildRequires:  %{python_module pip-run = %{version}}
 BuildRequires:  %{python_module pytest >= 6}
-BuildRequires:  %{python_module nbformat}
-BuildRequires:  %{python_module Pygments}
 BuildRequires:  ca-certificates
+%if !%{with ringdisabled}
+BuildRequires:  %{python_module nbformat}
+%endif
 %endif
 BuildArch:      noarch
 %python_subpackages
@@ -76,7 +83,7 @@
 readily address the on-demand needs.
 
 %prep
-%setup -q -n pip-run-%{version}
+%autosetup -p1 -n pip-run-%{version}
 
 %if !%{with test}
 %build



++++++ pip-run-suse-ring1-no-nbformat.patch ++++++
Index: pip-run-8.8.1/pip_run/tests/test_scripts.py
===================================================================
--- pip-run-8.8.1.orig/pip_run/tests/test_scripts.py
+++ pip-run-8.8.1/pip_run/tests/test_scripts.py
@@ -4,7 +4,6 @@ import sys
 import subprocess
 
 import pytest
-import nbformat
 
 from pip_run import scripts
 
@@ -85,6 +84,8 @@ class TestSourceDepsReader:
 class TestNotebookDepsReader:
     @pytest.fixture
     def notebook_factory(self, tmpdir, request):
+        nbformat = pytest.importorskip("nbformat")
+
         class Factory:
             def __init__(self):
                 self.nb = nbformat.v4.new_notebook()

Reply via email to