15
0
forked from pool/python-bindep

Accepting request 1074564 from devel:languages:python

- Add patch remove-mock.patch:
  * Remove use of external mock module, try unittest.mock first.
- Switch to pyproject macros.
- Actually run the testsuite using pytest. 
- Stop using %python_sitelib/*

- recreate spec file using py2pack

- Update to 2.11.0
- add python-rpm-macros dependency

OBS-URL: https://build.opensuse.org/request/show/1074564
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-bindep?expand=0&rev=5
This commit is contained in:
2023-03-27 16:15:19 +00:00
committed by Git OBS Bridge
3 changed files with 82 additions and 19 deletions

View File

@@ -1,13 +1,27 @@
-------------------------------------------------------------------
Mon Mar 27 06:49:08 UTC 2023 - Steve Kowalik <steven.kowalik@suse.com>
- Add patch remove-mock.patch:
* Remove use of external mock module, try unittest.mock first.
- Switch to pyproject macros.
- Actually run the testsuite using pytest.
- Stop using %python_sitelib/*
-------------------------------------------------------------------
Tue Mar 21 07:08:38 UTC 2023 - Johannes Kastl <kastl@b1-systems.de>
- recreate spec file using py2pack
-------------------------------------------------------------------
Fri Sep 23 02:33:16 UTC 2022 - Yogalakshmi Arunachalam <yarunachalam@suse.com>
- Update to 2.11.0
- Update to 2.11.0
* Add support for Rocky Linux and Manjaro to Bindep.
-------------------------------------------------------------------
Tue Jan 11 20:56:10 UTC 2022 - Dirk Müller <dmueller@suse.com>
- add python-rpm-macros dependency
- add python-rpm-macros dependency
-------------------------------------------------------------------
Tue Jan 4 09:01:17 UTC 2022 - Dirk Müller <dmueller@suse.com>

View File

@@ -1,7 +1,7 @@
#
# spec file for package python-bindep
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,25 +16,40 @@
#
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%global pythons python3
Name: python-bindep
Version: 2.11.0
Release: 0
Summary: Binary dependency utility
License: Apache-2.0
Group: Development/Languages/Python
URL: https://docs.openstack.org/infra/bindep
URL: https://docs.opendev.org/opendev/bindep
Source: https://files.pythonhosted.org/packages/source/b/bindep/bindep-%{version}.tar.gz
BuildRequires: %{python_module Parsley}
BuildRequires: %{python_module cliff}
Patch0: remove-mock.patch
BuildRequires: %{python_module pbr}
BuildRequires: %{python_module setuptools}
BuildRequires: python-rpm-macros
# SECTION test requirements
BuildRequires: %{python_module distro >= 1.7.0}
BuildRequires: %{python_module Parsley}
BuildRequires: %{python_module coverage >= 3.6}
BuildRequires: %{python_module fixtures >= 0.3.12}
BuildRequires: %{python_module hatchling}
BuildRequires: %{python_module packaging}
BuildRequires: %{python_module pbr >= 2.0.0}
BuildRequires: %{python_module pip}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module python-subunit}
BuildRequires: %{python_module testrepository >= 0.0.13}
BuildRequires: %{python_module testtools >= 0.9.27}
BuildRequires: %{python_module wheel}
# /SECTION
BuildRequires: fdupes
BuildRequires: openSUSE-release
Requires: python-Parsley
Requires: python-distro
Requires: python-distro >= 1.7.0
Requires: python-packaging
Requires: python-pbr >= 2.0.0
Suggests: python-distro < 1.7.0
Suggests: python-packaging < 21.0
BuildArch: noarch
%python_subpackages
@@ -47,28 +62,30 @@ not Python based, and particularly for testing, some dependencies have to be
installed before `pip` can be used - such as `virtualenv` and `pip` itself.
%prep
%setup -q -n bindep-%{version}
%autosetup -p1 -n bindep-%{version}
%build
%python_build
%pyproject_wheel
%install
%python_install
%pyproject_install
%python_clone -a %{buildroot}%{_bindir}/bindep
%python_expand %fdupes %{buildroot}%{$python_sitelib}
%check
%pytest -s -k 'not (test_arch_implies_pacman or test_manjaro_implies_pacman)'
%post
%{python_install_alternative bindep}
%python_install_alternative bindep
%postun
%python_uninstall_alternative bindep
# %check
# %xpython_exec setup.py test
%files %{python_files}
%doc AUTHORS ChangeLog NEWS.rst README.rst
%license LICENSE
%doc README.rst ChangeLog AUTHORS NEWS.rst
%python_alternative %{_bindir}/bindep
%{python_sitelib}/*
%{python_sitelib}/bindep
%{python_sitelib}/bindep-%{version}*info
%changelog

32
remove-mock.patch Normal file
View File

@@ -0,0 +1,32 @@
Index: bindep-2.11.0/bindep/tests/test_main.py
===================================================================
--- bindep-2.11.0.orig/bindep/tests/test_main.py
+++ bindep-2.11.0/bindep/tests/test_main.py
@@ -24,7 +24,10 @@ from fixtures import FakeLogger
from fixtures import Fixture
from fixtures import MonkeyPatch
from fixtures import TempDir
-import mock
+try:
+ from unittest import mock
+except ImportError:
+ import mock
from testtools import TestCase
from bindep.__main__ import main
Index: bindep-2.11.0/bindep/tests/test_depends.py
===================================================================
--- bindep-2.11.0.orig/bindep/tests/test_depends.py
+++ bindep-2.11.0/bindep/tests/test_depends.py
@@ -23,7 +23,10 @@ from textwrap import dedent
import distro
import fixtures
-import mock
+try:
+ from unittest import mock
+except ImportError:
+ import mock
import ometa.runtime
from testtools import ExpectedException
from testtools.matchers import Contains