Accepting request 972173 from home:pgajdos:python
- do not require pytest-mock for build - added patches fix https://github.com/wting/autojump/pull/648 + autojump-no-mock.patch OBS-URL: https://build.opensuse.org/request/show/972173 OBS-URL: https://build.opensuse.org/package/show/utilities/autojump?expand=0&rev=7
This commit is contained in:
parent
b1ff472d5e
commit
bb58b2f560
14
autojump-no-mock.patch
Normal file
14
autojump-no-mock.patch
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
diff --git a/tests/unit/autojump_utils_test.py b/tests/unit/autojump_utils_test.py
|
||||||
|
index 07f67b3..386b4cd 100644
|
||||||
|
--- a/tests/unit/autojump_utils_test.py
|
||||||
|
+++ b/tests/unit/autojump_utils_test.py
|
||||||
|
@@ -3,7 +3,7 @@
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
|
||||||
|
-import mock
|
||||||
|
+from unittest import mock
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
sys.path.append(os.path.join(os.getcwd(), 'bin')) # noqa
|
||||||
|
|
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Apr 22 12:07:10 UTC 2022 - pgajdos@suse.com
|
||||||
|
|
||||||
|
- do not require pytest-mock for build
|
||||||
|
- added patches
|
||||||
|
fix https://github.com/wting/autojump/pull/648
|
||||||
|
+ autojump-no-mock.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Oct 17 13:57:31 UTC 2019 - Richard Brown <rbrown@suse.com>
|
Thu Oct 17 13:57:31 UTC 2019 - Richard Brown <rbrown@suse.com>
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package autojump
|
# spec file for package autojump
|
||||||
#
|
#
|
||||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2022 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -21,10 +21,12 @@ Version: 22.5.3
|
|||||||
Release: 0
|
Release: 0
|
||||||
Summary: A faster way to navigate the filesystem from a shell
|
Summary: A faster way to navigate the filesystem from a shell
|
||||||
License: GPL-3.0-or-later
|
License: GPL-3.0-or-later
|
||||||
Url: https://github.com/wting/autojump
|
URL: https://github.com/wting/autojump
|
||||||
Source: https://github.com/wting/autojump/archive/release-v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
Source: https://github.com/wting/autojump/archive/release-v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||||
|
# https://github.com/wting/autojump/pull/648
|
||||||
|
Patch0: autojump-no-mock.patch
|
||||||
|
BuildRequires: python-rpm-macros
|
||||||
BuildRequires: python3
|
BuildRequires: python3
|
||||||
BuildRequires: python3-mock
|
|
||||||
BuildRequires: python3-pytest
|
BuildRequires: python3-pytest
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
@ -37,6 +39,7 @@ Directories must be visited first before they can be jumped to.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-release-v%{version}
|
%setup -q -n %{name}-release-v%{version}
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
# Fix shebangs.
|
# Fix shebangs.
|
||||||
sed -i 's/env python$/python3/' bin/%{name}
|
sed -i 's/env python$/python3/' bin/%{name}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user