Compare commits
No commits in common. "d829977897b933fe17fc8438de8067cc35e6c7ce" and "9e15dc3259cadf33e8de241af298170e17bbd6ad" have entirely different histories.
d829977897
...
9e15dc3259
BIN
distro-1.5.0.tar.gz
Normal file
BIN
distro-1.5.0.tar.gz
Normal file
Binary file not shown.
Binary file not shown.
@ -1,34 +0,0 @@
|
|||||||
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,13 +1,12 @@
|
|||||||
Name: python-distro
|
Name: python-distro
|
||||||
Version: 1.9.0
|
Version: 1.5.0
|
||||||
Release: 1
|
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-pytest python3-pip python3-wheel
|
BuildRequires: python2-devel python2-setuptools python2-pytest python3-devel python3-setuptools python3-pytest
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -20,6 +19,22 @@ Python bound, like a command-line interface.
|
|||||||
|
|
||||||
Distro currently supports Linux and BSD based systems but Windows and OS X support is also planned.
|
Distro currently supports Linux and BSD based systems but Windows and OS X support is also planned.
|
||||||
|
|
||||||
|
%package -n python2-distro
|
||||||
|
Summary: Linux Distribution - a Linux OS platform information API
|
||||||
|
%{?python_provide:%python_provide python2-distro}
|
||||||
|
|
||||||
|
%description -n python2-distro
|
||||||
|
Distro provides information about the OS distribution it runs on, such as a reliable machine-readable
|
||||||
|
ID, or version information.
|
||||||
|
|
||||||
|
It is the recommended replacement for Python's original platform.linux_distribution function (which
|
||||||
|
will be removed in Python 3.8). It also provides much more functionality which isn't necessarily
|
||||||
|
Python bound, like a command-line interface.
|
||||||
|
|
||||||
|
Distro currently supports Linux and BSD based systems but Windows and OS X support is also planned.
|
||||||
|
|
||||||
|
Python2 version of distro.
|
||||||
|
|
||||||
%package -n python3-distro
|
%package -n python3-distro
|
||||||
Summary: Linux Distribution - a Linux OS platform information API
|
Summary: Linux Distribution - a Linux OS platform information API
|
||||||
%{?python_provide:%python_provide python3-distro}
|
%{?python_provide:%python_provide python3-distro}
|
||||||
@ -41,14 +56,20 @@ Python3 version of distro.
|
|||||||
rm -rf distro.egg-info
|
rm -rf distro.egg-info
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%pyproject_build
|
%py2_build
|
||||||
|
%py3_build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%pyproject_install
|
%py2_install
|
||||||
|
%py3_install
|
||||||
|
|
||||||
%check
|
%check
|
||||||
|
%{__python2} -m pytest tests -v
|
||||||
%{__python3} -m pytest tests -v
|
%{__python3} -m pytest tests -v
|
||||||
|
|
||||||
|
%files -n python2-distro
|
||||||
|
%doc LICENSE CHANGELOG.md CONTRIBUTORS.md README.md
|
||||||
|
%{python2_sitelib}/*
|
||||||
|
|
||||||
%files -n python3-distro
|
%files -n python3-distro
|
||||||
%doc LICENSE CHANGELOG.md CONTRIBUTORS.md README.md
|
%doc LICENSE CHANGELOG.md CONTRIBUTORS.md README.md
|
||||||
@ -56,21 +77,6 @@ rm -rf distro.egg-info
|
|||||||
%{_bindir}/distro
|
%{_bindir}/distro
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Mon Feb 05 2024 zhouwenpei <zhouwenpei1@h-partners.com> - 1.9.0-1
|
|
||||||
- update to 1.9.0
|
|
||||||
|
|
||||||
* 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
|
|
||||||
- rebuild for next release
|
|
||||||
|
|
||||||
* Wed Nov 24 2021 hanhui <hanhui15@huawei.com> - 1.6.0-1
|
|
||||||
- update to 1.6.0
|
|
||||||
|
|
||||||
* Fri Oct 23 2020 tianwei <tianwei12@huawei.com> - 1.5.0-2
|
|
||||||
- delete python2
|
|
||||||
|
|
||||||
* Thu Jul 23 2020 dingyue <dingyue5@huawei.com> - 1.5.0-1
|
* Thu Jul 23 2020 dingyue <dingyue5@huawei.com> - 1.5.0-1
|
||||||
- Package update
|
- Package update
|
||||||
* Mon Nov 25 2019 lingsheng <lingsheng@huawei.com> - 1.3.0-5
|
* Mon Nov 25 2019 lingsheng <lingsheng@huawei.com> - 1.3.0-5
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user