[packages/python-distro] - updated to 1.6.0
qboosh
qboosh at pld-linux.org
Wed Jan 10 21:00:51 CET 2024
commit e6e54422a18cc538a06390886ce7e384a1b42d52
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Jan 10 20:48:07 2024 +0100
- updated to 1.6.0
python-distro-docs.patch | 15 ---------------
python-distro.spec | 16 +++++++++-------
2 files changed, 9 insertions(+), 22 deletions(-)
---
diff --git a/python-distro.spec b/python-distro.spec
index ab3b560..6c53ddf 100644
--- a/python-distro.spec
+++ b/python-distro.spec
@@ -9,13 +9,13 @@
Summary: An OS platform information API
Summary(pl.UTF-8): API do intermacji o platformie systemu operacyjnego
Name: python-%{module}
-Version: 1.5.0
-Release: 5
+# keep 1.6.x here for python2 support
+Version: 1.6.0
+Release: 1
License: Apache v2.0
Group: Libraries/Python
Source0: https://github.com/nir0s/distro/archive/v%{version}/%{module}-%{version}.tar.gz
-# Source0-md5: da1cab49e8aad7bd6ae5c9f66657bd2e
-Patch0: %{name}-docs.patch
+# Source0-md5: 50fbf6f3f123747a438c2749e9d903eb
URL: https://github.com/nir0s/distro
%if %{with python2}
BuildRequires: python-modules >= 1:2.7
@@ -34,7 +34,8 @@ BuildRequires: python3-pytest
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.714
%if %{with doc}
-BuildRequires: sphinx-pdg >= 1.1
+BuildRequires: python3 >= 1:3.6
+BuildRequires: sphinx-pdg-3 >= 2
%endif
Requires: python-modules >= 1:2.7
BuildArch: noarch
@@ -83,13 +84,13 @@ Dokumentacja API modułu Pythona distro.
%prep
%setup -q -n %{module}-%{version}
-%patch0 -p1
%build
%if %{with python2}
%py_build
%if %{with tests}
+PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 \
%{__python} -m pytest tests
%endif
%endif
@@ -98,12 +99,13 @@ Dokumentacja API modułu Pythona distro.
%py3_build
%if %{with tests}
+PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 \
%{__python3} -m pytest tests
%endif
%endif
%if %{with doc}
-sphinx-build -b html docs docs/_build/html
+sphinx-build-3 -b html docs docs/_build/html
%endif
%install
diff --git a/python-distro-docs.patch b/python-distro-docs.patch
deleted file mode 100644
index 157c8b6..0000000
--- a/python-distro-docs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- distro-1.5.0/docs/conf.py.orig 2020-03-30 23:10:27.000000000 +0200
-+++ distro-1.5.0/docs/conf.py 2020-04-19 12:21:54.228345350 +0200
-@@ -49,11 +49,7 @@
- source_encoding = 'utf-8'
-
- # The master toctree document.
--on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
--if on_rtd:
-- master_doc = 'index'
--else:
-- master_doc = 'docs/index'
-+master_doc = 'index'
-
- # General information about the project.
- project = u'distro'
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python-distro.git/commitdiff/e6e54422a18cc538a06390886ce7e384a1b42d52
More information about the pld-cvs-commit
mailing list