From 853f4fd193b9fc1405f1d3d5fce0aefda110d558 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Wed, 25 Sep 2024 07:08:04 +0200 Subject: [PATCH 1/9] Update the synchronizing script --- build-and-update-all-branches | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-and-update-all-branches b/build-and-update-all-branches index 53768c2..e52a0d7 100755 --- a/build-and-update-all-branches +++ b/build-and-update-all-branches @@ -3,7 +3,7 @@ # Prepare main branch, review the list of branches below and then execute this # script. -branches='main epel7 epel8 epel9 f35 f36' +branches='main epel8 epel9 epel10 f39 f40 f41' exit_handler () { From ffb3785f1fee165771ab964d95edcf7486568bc4 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Wed, 25 Sep 2024 07:24:58 +0200 Subject: [PATCH 2/9] Make the changelog chronologically ordered --- python-progress.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-progress.spec b/python-progress.spec index 8532c35..68e07cd 100644 --- a/python-progress.spec +++ b/python-progress.spec @@ -119,7 +119,7 @@ rm -rf %{pypi_name}.egg-info * Fri Jan 20 2023 Fedora Release Engineering - 1.6-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild -* Fri Jul 15 2022 Pavel Raiskup - 1.6-6 +* Fri Jul 22 2022 Pavel Raiskup - 1.6-6 - use time.monotonic(), bar.avg is infinity for zero speed * Fri Jul 22 2022 Fedora Release Engineering - 1.6-5 From 9dde5d8b5f7ed07dbf606b382574b2945ecda89c Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Wed, 25 Sep 2024 07:27:16 +0200 Subject: [PATCH 3/9] README.md: note about Copr builds --- README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..9d9b529 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +See also automatic push/pr [Copr builds](https://copr.fedorainfracloud.org/coprs/praiskup/enterprise-ci-python-progress/). From 70c30f0ba5a26a1e829140b1821b8aacf9c962cc Mon Sep 17 00:00:00 2001 From: Carl George Date: Mon, 23 Sep 2024 20:53:27 -0500 Subject: [PATCH 4/9] Convert to pyproject macros This updates the spec file to follow the modern Python Packaging guidelines where possible. --- python-progress.spec | 94 +++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 57 deletions(-) diff --git a/python-progress.spec b/python-progress.spec index 68e07cd..9383ca3 100644 --- a/python-progress.spec +++ b/python-progress.spec @@ -1,103 +1,83 @@ -%if 0%{?fedora} - %bcond_without python3 - %if 0%{?fedora} > 29 - %bcond_with python2 - %else - %bcond_without python2 - %endif -%else - %if 0%{?rhel} > 7 - %bcond_with python2 - %bcond_without python3 - %else - %bcond_without python2 - %bcond_with python3 - %endif -%endif - -# Created by pyp2rpm-0.5.2 %global pypi_name progress Name: python-%{pypi_name} Version: 1.6 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Easy to use progress bars License: ISC URL: http://github.com/verigak/progress/ -Source0: %pypi_source +Source0: %{pypi_source %{pypi_name}} BuildArch: noarch -%if %{with python2} -BuildRequires: python2-devel -BuildRequires: python2-setuptools -%endif - -%if %{with python3} BuildRequires: python3-devel +%if %{defined el8} BuildRequires: python3-setuptools %endif Patch1: 0001-fixup-moving-average-window.patch -%global _description\ -Collection of easy to use progress bars and spinners.\ +%global _description %{expand: +Collection of easy to use progress bars and spinners.} %description %_description -%if 0%{with python2} -%package -n python2-%{pypi_name} -Summary: %summary -%{?python_provide:%python_provide python2-%{pypi_name}} - -%description -n python2-%{pypi_name} %_description -%endif - - -%if 0%{with python3} %package -n python3-%{pypi_name} Summary: Easy to use progress bars -%description -n python3-%{pypi_name} -Collection of easy to use progress bars and spinners. -%endif +%description -n python3-%{pypi_name} %_description %prep %autosetup -p1 -n %{pypi_name}-%{version} -# Remove bundled egg-info -rm -rf %{pypi_name}.egg-info + +%if %{undefined el8} +%generate_buildrequires +%pyproject_buildrequires +%endif %build -%{?with_python2: %py2_build} -%{?with_python3: %py3_build} +%if %{defined el8} +%py3_build +%else +%pyproject_wheel +%endif %install -%{?with_python2: %py2_install} -%{?with_python3: %py3_install} - - -%if 0%{with python2} -%files -n python2-%{pypi_name} -%doc README.rst LICENSE -%{python2_sitelib}/%{pypi_name} -%{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info +%if %{defined el8} +%py3_install +%else +%pyproject_install +%pyproject_save_files -l %{pypi_name} %endif -%if 0%{with python3} -%files -n python3-%{pypi_name} -%doc README.rst LICENSE + +%check +%if %{defined el8} +%py3_check_import %{pypi_name} +%else +%pyproject_check_import +%endif + + +%files -n python3-%{pypi_name} %{!?el8:-f %{pyproject_files}} +%doc README.rst +%if %{defined el8} +%license LICENSE %{python3_sitelib}/%{pypi_name} %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %endif %changelog +* Tue Sep 24 2024 Carl George - 1.6-14 +- Convert to pyproject macros + * Fri Jul 19 2024 Fedora Release Engineering - 1.6-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 0574505f81582afea1c3ef8b6f1fb3580fb9ba17 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 17:25:08 +0000 Subject: [PATCH 5/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- python-progress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-progress.spec b/python-progress.spec index 9383ca3..580fafd 100644 --- a/python-progress.spec +++ b/python-progress.spec @@ -2,7 +2,7 @@ Name: python-%{pypi_name} Version: 1.6 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Easy to use progress bars License: ISC @@ -75,6 +75,9 @@ Summary: Easy to use progress bars %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 1.6-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Sep 24 2024 Carl George - 1.6-14 - Convert to pyproject macros From b9cfe2cc7866194ebebf4657599939e8922da5d6 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 20:34:02 +0200 Subject: [PATCH 6/9] Rebuilt for Python 3.14 --- python-progress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-progress.spec b/python-progress.spec index 580fafd..2d62614 100644 --- a/python-progress.spec +++ b/python-progress.spec @@ -2,7 +2,7 @@ Name: python-%{pypi_name} Version: 1.6 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Easy to use progress bars License: ISC @@ -75,6 +75,9 @@ Summary: Easy to use progress bars %changelog +* Mon Jun 02 2025 Python Maint - 1.6-16 +- Rebuilt for Python 3.14 + * Sat Jan 18 2025 Fedora Release Engineering - 1.6-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 11086bec8a8f38cd13fdf1fe8b560b1449a725f4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 09:27:00 +0000 Subject: [PATCH 7/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- python-progress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-progress.spec b/python-progress.spec index 2d62614..112dc37 100644 --- a/python-progress.spec +++ b/python-progress.spec @@ -2,7 +2,7 @@ Name: python-%{pypi_name} Version: 1.6 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Easy to use progress bars License: ISC @@ -75,6 +75,9 @@ Summary: Easy to use progress bars %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.6-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jun 02 2025 Python Maint - 1.6-16 - Rebuilt for Python 3.14 From 47d1dfb924d5269e4f5b2d9eecebf7c613f32e0a Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 14:25:42 +0200 Subject: [PATCH 8/9] Rebuilt for Python 3.14.0rc2 bytecode --- python-progress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-progress.spec b/python-progress.spec index 112dc37..b1bc82d 100644 --- a/python-progress.spec +++ b/python-progress.spec @@ -2,7 +2,7 @@ Name: python-%{pypi_name} Version: 1.6 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Easy to use progress bars License: ISC @@ -75,6 +75,9 @@ Summary: Easy to use progress bars %changelog +* Fri Aug 15 2025 Python Maint - 1.6-18 +- Rebuilt for Python 3.14.0rc2 bytecode + * Fri Jul 25 2025 Fedora Release Engineering - 1.6-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From bb4d7e807721bf5352636aeaa92085c6d873eb49 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 14:01:43 +0200 Subject: [PATCH 9/9] Rebuilt for Python 3.14.0rc3 bytecode --- python-progress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-progress.spec b/python-progress.spec index b1bc82d..d8c3ee7 100644 --- a/python-progress.spec +++ b/python-progress.spec @@ -2,7 +2,7 @@ Name: python-%{pypi_name} Version: 1.6 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Easy to use progress bars License: ISC @@ -75,6 +75,9 @@ Summary: Easy to use progress bars %changelog +* Fri Sep 19 2025 Python Maint - 1.6-19 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Aug 15 2025 Python Maint - 1.6-18 - Rebuilt for Python 3.14.0rc2 bytecode