[packages/python-PyGitUp] - up to 2.4.0 for real

baggins baggins at pld-linux.org
Tue Feb 17 22:04:27 CET 2026


commit ce9d82f743a8ccd0458eddd55661c80f11faa270
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Feb 17 23:04:19 2026 +0100

    - up to 2.4.0 for real

 python-PyGitUp.spec | 76 ++++++++++++-----------------------------------------
 1 file changed, 17 insertions(+), 59 deletions(-)
---
diff --git a/python-PyGitUp.spec b/python-PyGitUp.spec
index 52be1d5..fe7bc69 100644
--- a/python-PyGitUp.spec
+++ b/python-PyGitUp.spec
@@ -1,38 +1,23 @@
 #
 # Conditional build:
-%bcond_without	python2	# CPython 2.x module
-%bcond_without	python3	# CPython 3.x module
 %bcond_with	tests	# unit tests (need git configured for user)
 
 %define		module	PyGitUp
 Summary:	git-up(1) - fetch and rebase all locally-tracked remote branches
 Summary(pl.UTF-8):	git-up(1) - pobieranie i rebase wszystkich śledzonych lokalnie zdanych gałęzi
 Name:		python-%{module}
-Version:	1.6.1
-Release:	11
+Version:	2.4.0
+Release:	1
 License:	MIT
 Group:		Libraries/Python
 #Source0Download: https://github.com/msiemens/PyGitUp/releases
 Source0:	https://github.com/msiemens/PyGitUp/archive/v%{version}/%{module}-v%{version}.tar.gz
-# Source0-md5:	8573a0c48aa0afa6dddae51d1cd204c1
-Patch0:		click-version.patch
+# Source0-md5:	c722574b2a9554517dd2614a8a43362d
 URL:		https://github.com/msiemens/PyGitUp
 %{?with_tests:BuildRequires:	git-core}
-%if %{with python2}
-BuildRequires:	python-modules >= 1:2.7
-BuildRequires:	python-setuptools
-%if %{with tests}
-BuildRequires:	python-click >= 7.0
-BuildRequires:	python-colorama >= 0.3.7
-BuildRequires:	python-git >= 2.1.8
-BuildRequires:	python-nose >= 1.3.7
-BuildRequires:	python-six >= 1.10.0
-BuildRequires:	python-termcolor >= 1.1.0
-%endif
-%endif
-%if %{with python3}
-BuildRequires:	python3-modules >= 1:3.4
-BuildRequires:	python3-setuptools
+BuildRequires:	python3-modules >= 1:3.10
+BuildRequires:	python3-build
+BuildRequires:	python3-installer
 %if %{with tests}
 BuildRequires:	python3-click >= 7.0
 BuildRequires:	python3-colorama >= 0.3.7
@@ -41,10 +26,8 @@ BuildRequires:	python3-nose >= 1.3.7
 BuildRequires:	python3-six >= 1.10.0
 BuildRequires:	python3-termcolor >= 1.1.0
 %endif
-%endif
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.714
-Requires:	python-modules >= 1:2.7
+BuildRequires:	rpmbuild(macros) >= 2.044
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -59,7 +42,7 @@ gałęzi.
 Summary:	git-up(1) - fetch and rebase all locally-tracked remote branches
 Summary(pl.UTF-8):	git-up(1) - pobieranie i rebase wszystkich śledzonych lokalnie zdanych gałęzi
 Group:		Libraries/Python
-Requires:	python3-modules >= 1:3.4
+Requires:	python3-modules >= 1:3.10
 
 %description -n python3-%{module}
 git-up(1) - fetch and rebase all locally-tracked remote branches.
@@ -70,51 +53,28 @@ gałęzi.
 
 %prep
 %setup -q -n %{module}-%{version}
-%patch -P 0 -p1
 
 %build
-%if %{with python2}
-%py_build %{?with_tests:test}
-%endif
+%py3_build_pyproject
 
-%if %{with python3}
-%py3_build %{?with_tests:test}
+%if %{with tests}
+%{__python3} -m zipfile -e build-3/*.whl build-3-test
+# use explicit plugins list for reliable builds (delete PYTEST_PLUGINS if empty)
+PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 \
+PYTEST_PLUGINS= \
+%{__python3} -m pytest -o pythonpath="$PWD/build-3-test" tests
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%if %{with python2}
-%py_install
-
-%{__mv} $RPM_BUILD_ROOT%{_bindir}/git-up{,-2}
-
-%py_postclean
-
-%{__rm} -r $RPM_BUILD_ROOT%{py_sitescriptdir}/PyGitUp/tests
-%endif
-
-%if %{with python3}
-%py3_install
+%py3_install_pyproject
 
 %{__rm} -r $RPM_BUILD_ROOT%{py3_sitescriptdir}/PyGitUp/tests
-%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if %{with python2}
-%files
-%defattr(644,root,root,755)
-%doc LICENCE README.rst
-%attr(755,root,root) %{_bindir}/git-up-2
-%dir %{py_sitescriptdir}/PyGitUp
-%{py_sitescriptdir}/PyGitUp/*.py[co]
-%{py_sitescriptdir}/PyGitUp/check-bundler.rb
-%{py_sitescriptdir}/git_up-%{version}-py*.egg-info
-%endif
-
-%if %{with python3}
 %files -n python3-%{module}
 %defattr(644,root,root,755)
 %doc LICENCE README.rst
@@ -122,6 +82,4 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{py3_sitescriptdir}/PyGitUp
 %{py3_sitescriptdir}/PyGitUp/*.py
 %{py3_sitescriptdir}/PyGitUp/__pycache__
-%{py3_sitescriptdir}/PyGitUp/check-bundler.rb
-%{py3_sitescriptdir}/git_up-%{version}-py*.egg-info
-%endif
+%{py3_sitescriptdir}/git_up-%{version}.dist-info
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python-PyGitUp.git/commitdiff/ce9d82f743a8ccd0458eddd55661c80f11faa270



More information about the pld-cvs-commit mailing list