14
0

Accepting request 993266 from home:bnavigator:setuptools63

- Add pip-run-suse-ring1-no-nbformat.patch for removal of nbformat
  from Ring1 (pip-run will be in Ring1 for setuptools:test)

OBS-URL: https://build.opensuse.org/request/show/993266
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pip-run?expand=0&rev=3
This commit is contained in:
2022-08-05 13:47:49 +00:00
committed by Git OBS Bridge
parent 78b4786474
commit 14c4f7bbfd
3 changed files with 43 additions and 9 deletions

View File

@@ -0,0 +1,21 @@
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()

View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Aug 5 09:14:48 UTC 2022 - Ben Greiner <code@bnavigator.de>
- Add pip-run-suse-ring1-no-nbformat.patch for removal of nbformat
from Ring1 (pip-run will be in Ring1 for setuptools:test)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 13 14:27:22 UTC 2022 - Ben Greiner <code@bnavigator.de> Wed Jul 13 14:27:22 UTC 2022 - Ben Greiner <code@bnavigator.de>

View File

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