!12 Update to version 1.8.0
From: @wang--ge Reviewed-by: @lyn1001 Signed-off-by: @lyn1001
This commit is contained in:
commit
20b06a80b7
Binary file not shown.
BIN
distro-1.8.0.tar.gz
Normal file
BIN
distro-1.8.0.tar.gz
Normal file
Binary file not shown.
34
fix-ModuleNoFoundError-in-test-case.patch
Normal file
34
fix-ModuleNoFoundError-in-test-case.patch
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
From 313deda21e33fa7cafdf95e2c048fde1c3a65c2d Mon Sep 17 00:00:00 2001
|
||||||
|
From: wang--ge <wang__ge@126.com>
|
||||||
|
Date: Wed, 31 May 2023 16:26:34 +0800
|
||||||
|
Subject: [PATCH] fix ModuleNoFoundError in test case
|
||||||
|
|
||||||
|
---
|
||||||
|
tests/test_distro.py | 4 +++-
|
||||||
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/tests/test_distro.py b/tests/test_distro.py
|
||||||
|
index 3dda970..dde0a7e 100644
|
||||||
|
--- a/tests/test_distro.py
|
||||||
|
+++ b/tests/test_distro.py
|
||||||
|
@@ -33,6 +33,8 @@ DISTROS = [dist for dist in os.listdir(DISTROS_DIR) if dist != "__shared__"]
|
||||||
|
|
||||||
|
IS_LINUX = sys.platform.startswith("linux")
|
||||||
|
if IS_LINUX:
|
||||||
|
+ path="./src"
|
||||||
|
+ sys.path.append(os.path.abspath(path))
|
||||||
|
from distro import distro
|
||||||
|
|
||||||
|
RELATIVE_UNIXCONFDIR = distro._UNIXCONFDIR[1:]
|
||||||
|
@@ -48,7 +50,7 @@ class TestNonLinuxPlatform:
|
||||||
|
assert "Unsupported platform" in str(ex)
|
||||||
|
|
||||||
|
|
||||||
|
-@pytest.mark.skipif(not IS_LINUX, reason="Irrelevant on non-linux")
|
||||||
|
+@pytest.mark.skipif(IS_LINUX, reason="Irrelevant on non-linux")
|
||||||
|
class TestCli:
|
||||||
|
def _parse(self, command: str) -> None:
|
||||||
|
sys.argv = command.split()
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
||||||
@ -1,12 +1,13 @@
|
|||||||
Name: python-distro
|
Name: python-distro
|
||||||
Version: 1.6.0
|
Version: 1.8.0
|
||||||
Release: 2
|
Release: 1
|
||||||
Summary: Linux Distribution - a Linux OS platform information API
|
Summary: Linux Distribution - a Linux OS platform information API
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
URL: https://github.com/nir0s/distro
|
URL: https://github.com/nir0s/distro
|
||||||
Source0: https://files.pythonhosted.org/packages/source/d/distro/distro-%{version}.tar.gz
|
Source0: https://files.pythonhosted.org/packages/source/d/distro/distro-%{version}.tar.gz
|
||||||
|
Patch0: fix-ModuleNoFoundError-in-test-case.patch
|
||||||
|
|
||||||
BuildRequires: python3-devel python3-setuptools python3-pytest
|
BuildRequires: python3-devel python3-pytest python3-pip python3-wheel
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -40,10 +41,10 @@ Python3 version of distro.
|
|||||||
rm -rf distro.egg-info
|
rm -rf distro.egg-info
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%py3_build
|
%pyproject_build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%py3_install
|
%pyproject_install
|
||||||
|
|
||||||
%check
|
%check
|
||||||
%{__python3} -m pytest tests -v
|
%{__python3} -m pytest tests -v
|
||||||
@ -55,6 +56,9 @@ rm -rf distro.egg-info
|
|||||||
%{_bindir}/distro
|
%{_bindir}/distro
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed May 31 2023 Ge Wang <wang__ge@126.com> - 1.8.0-1
|
||||||
|
- update to 1.8.0
|
||||||
|
|
||||||
* Tue Oct 25 2022 wangkerong <wangkerong@h-partners.com> - 1.6.0-2
|
* Tue Oct 25 2022 wangkerong <wangkerong@h-partners.com> - 1.6.0-2
|
||||||
- rebuild for next release
|
- rebuild for next release
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user