From 2b1f7a5adcc7c6df8cef7efe6db9bb1be2034063 Mon Sep 17 00:00:00 2001 From: Matej Focko Date: Fri, 11 Aug 2023 14:26:00 +0200 Subject: [PATCH 01/19] chore: add GitHub's GPG key to Packit config Signed-off-by: Matej Focko (cherry picked from commit c90a1932f9cee1085958836e8a790ad8f80804ef) --- .packit.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.packit.yaml b/.packit.yaml index 3ae2f09..14f6e78 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -6,6 +6,9 @@ issue_repository: https://github.com/packit/specfile copy_upstream_release_description: true +allowed_gpg_keys: + - 5DE3E0509C47EA3CF04A42D34AEE18F83AFDEB23 + packages: specfile: upstream_package_name: specfile From 478a834385a84bfe3ddd96e476f84b7d95ddca0a Mon Sep 17 00:00:00 2001 From: Matej Focko Date: Fri, 11 Aug 2023 14:44:30 +0200 Subject: [PATCH 02/19] chore: be explicit about GPG keys in Packit config Signed-off-by: Matej Focko (cherry picked from commit 4c376af84dfae7ef2bef896fc458763715fead2e) --- .packit.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index 14f6e78..1994760 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -6,14 +6,13 @@ issue_repository: https://github.com/packit/specfile copy_upstream_release_description: true -allowed_gpg_keys: - - 5DE3E0509C47EA3CF04A42D34AEE18F83AFDEB23 - packages: specfile: upstream_package_name: specfile downstream_package_name: python-specfile specfile_path: &specfile_path fedora/python-specfile.spec + allowed_gpg_keys: + - 5DE3E0509C47EA3CF04A42D34AEE18F83AFDEB23 files_to_sync: - *specfile_path - .packit.yaml @@ -36,6 +35,8 @@ packages: upstream_package_name: specfile downstream_package_name: python-specfile specfile_path: &specfile_path_epel8 epel8/python-specfile.spec + allowed_gpg_keys: + - 5DE3E0509C47EA3CF04A42D34AEE18F83AFDEB23 files_to_sync: - *specfile_path_epel8 - .packit.yaml From d5184c2cd62f833feab393a2ddf7abd78f9f913e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Fri, 11 Aug 2023 15:26:16 +0200 Subject: [PATCH 03/19] [packit] 0.21.0 upstream release Upstream tag: 0.21.0 Upstream commit: 56360c0a --- .packit.yaml | 6 ++---- README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- python-specfile.spec | 6 +++++- sources | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index 1994760..060174c 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -11,8 +11,6 @@ packages: upstream_package_name: specfile downstream_package_name: python-specfile specfile_path: &specfile_path fedora/python-specfile.spec - allowed_gpg_keys: - - 5DE3E0509C47EA3CF04A42D34AEE18F83AFDEB23 files_to_sync: - *specfile_path - .packit.yaml @@ -35,8 +33,6 @@ packages: upstream_package_name: specfile downstream_package_name: python-specfile specfile_path: &specfile_path_epel8 epel8/python-specfile.spec - allowed_gpg_keys: - - 5DE3E0509C47EA3CF04A42D34AEE18F83AFDEB23 files_to_sync: - *specfile_path_epel8 - .packit.yaml @@ -163,6 +159,7 @@ jobs: - job: koji_build trigger: commit + packages: [specfile] packit_instances: ["stg"] allowed_pr_authors: ["packit-stg", "packit"] dist_git_branches: @@ -172,6 +169,7 @@ jobs: - job: bodhi_update trigger: commit + packages: [specfile] packit_instances: ["stg"] dist_git_branches: - fedora-branched # rawhide updates are created automatically diff --git a/README.packit b/README.packit index 9d6cbbc..1bb774e 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.78.1. +The file was generated using packit 0.69.0.post78+g1d260fb.d20230418. diff --git a/plans/main.fmf b/plans/main.fmf index 7686ac7..87402eb 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: 4486a88c56fdfdea0c8b1e16f32a76056e9faba3 + ref: 56360c0a80b102065e71ccee587b155dfc83317e execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index 48ba7dd..f901d66 100644 --- a/plans/packit-integration.fmf +++ b/plans/packit-integration.fmf @@ -2,7 +2,7 @@ discover: how: fmf url: https://github.com/packit/packit filter: tier:0 | tier:1 - ref: 4b998555d18e3e7abfb7a521b3b65a34de02dc76 + ref: 804c96beeb46dbb0ef209e545bd46735809628a0 prepare: - how: install copr: packit/packit-dev diff --git a/python-specfile.spec b/python-specfile.spec index dbce3df..53d67c3 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -13,7 +13,7 @@ in a minimal diff.} Name: python-specfile -Version: 0.20.2 +Version: 0.21.0 Release: 1%{?dist} Summary: A library for parsing and manipulating RPM spec files @@ -71,6 +71,10 @@ Summary: %{summary} %changelog +* Fri Aug 11 2023 Nikola Forró - 0.21.0-1 +- `specfile` no longer tracebacks when some sources are missing and can't be _emulated_. In such case the spec file is parsed without them at the cost of `%%setup` and `%%patch` macros potentially expanding differently than with the sources present. (#271) +- Specfile's license in RPM spec file is now confirmed to be SPDX compatible. (#269) + * Mon Jul 31 2023 Packit - 0.20.2-1 - Fixed Packit config to work properly with `propose-downstream` and `pull-from-upstream` jobs. (#261) diff --git a/sources b/sources index 636f4d0..0540e27 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.20.2.tar.gz) = 754a9108589822a17dce79f022c3c2edd5ae86fc3894b874afe6761f18275f7b567af8f953adc474cfe24e67672cae61df26429a5d8a087d6aff8b396f891183 +SHA512 (specfile-0.21.0.tar.gz) = 9860109203c69a586ce3759c983c550ae150aaed9744cf7db740c9bce2e11e5192b0153f923f584d8f8b526d61dca08b308519913c7aa5587e7a09e92487426a From a16986d5c5f57a2bd2a68c1b13042e20ea12085a Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 1 Sep 2023 13:41:18 +0000 Subject: [PATCH 04/19] [packit] 0.22.0 upstream release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream tag: 0.22.0 Upstream commit: e49e5e3f If you need to do any change in this pull request, you need to locally fetch the source branch of it and push it (with a fix) to your fork (as it is not possible to push to the branch created in the Packit’s fork): ``` git fetch https://src.fedoraproject.org/forks/packit-stg/rpms/python-specfile.git refs/heads/*:refs/remotes/packit-stg/* git checkout packit-stg/0.22.0-f39-update-propose_downstream ``` --- .packit.yaml | 10 ++++++++++ README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 4 ++-- plans/performance.fmf | 11 +++++++++++ python-specfile.spec | 7 +++++-- sources | 2 +- 7 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 plans/performance.fmf diff --git a/.packit.yaml b/.packit.yaml index 060174c..1a4f6a8 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -124,15 +124,25 @@ jobs: - job: tests trigger: pull_request packages: [specfile] + tmt_plan: "smoke|full|packit-integration" targets: - fedora-all - epel-9 - job: tests trigger: pull_request packages: [specfile-epel8] + tmt_plan: "smoke|full" targets: - epel-8 + - job: tests + trigger: pull_request + packages: [specfile] + identifier: performance + tmt_plan: performance + targets: + - fedora-rawhide + - job: propose_downstream trigger: release packages: [specfile] diff --git a/README.packit b/README.packit index 1bb774e..00f69f2 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.69.0.post78+g1d260fb.d20230418. +The file was generated using packit 0.79.1.post8+g73d04ae8. diff --git a/plans/main.fmf b/plans/main.fmf index 87402eb..4003017 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: 56360c0a80b102065e71ccee587b155dfc83317e + ref: e49e5e3ff191480046b4c509feacbc0973907d11 execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index f901d66..3306185 100644 --- a/plans/packit-integration.fmf +++ b/plans/packit-integration.fmf @@ -2,7 +2,7 @@ discover: how: fmf url: https://github.com/packit/packit filter: tier:0 | tier:1 - ref: 804c96beeb46dbb0ef209e545bd46735809628a0 + ref: 6208d3bf6bd7b22fcf9e7658e1ffd163fbab0b62 prepare: - how: install copr: packit/packit-dev @@ -21,7 +21,7 @@ adjust: - how: install package: python3-pip - how: shell - script: pip3 install flexmock deepdiff + script: pip3 install flexmock deepdiff==6.3.1 - when: distro == rhel-8 or distro == centos-8 or distro == centos-stream-8 because: packit doesn't support EL 8 enabled: false diff --git a/plans/performance.fmf b/plans/performance.fmf new file mode 100644 index 0000000..bf8bf53 --- /dev/null +++ b/plans/performance.fmf @@ -0,0 +1,11 @@ +summary: + Performance tests +discover+: + filter: tier:3 +prepare: + - how: install + package: python3-pip + - how: shell + script: pip3 install pytest-fail-slow + - how: shell + script: curl --output-dir /tmp -O https://src.fedoraproject.org/rpms/texlive/raw/rawhide/f/texlive.spec diff --git a/python-specfile.spec b/python-specfile.spec index 53d67c3..473301b 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -13,7 +13,7 @@ in a minimal diff.} Name: python-specfile -Version: 0.21.0 +Version: 0.22.0 Release: 1%{?dist} Summary: A library for parsing and manipulating RPM spec files @@ -62,7 +62,7 @@ Summary: %{summary} %if %{with tests} %check -%pytest +%pytest --verbose tests/unit tests/integration %endif @@ -71,6 +71,9 @@ Summary: %{summary} %changelog +* Fri Sep 01 2023 Packit - 0.22.0-1 +- Macro definitions and tags gained a new `valid` attribute. A macro definition/tag is considered valid if it doesn't appear in a false branch of any condition appearing in the spec file. (#276) + * Fri Aug 11 2023 Nikola Forró - 0.21.0-1 - `specfile` no longer tracebacks when some sources are missing and can't be _emulated_. In such case the spec file is parsed without them at the cost of `%%setup` and `%%patch` macros potentially expanding differently than with the sources present. (#271) - Specfile's license in RPM spec file is now confirmed to be SPDX compatible. (#269) diff --git a/sources b/sources index 0540e27..e0e8067 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.21.0.tar.gz) = 9860109203c69a586ce3759c983c550ae150aaed9744cf7db740c9bce2e11e5192b0153f923f584d8f8b526d61dca08b308519913c7aa5587e7a09e92487426a +SHA512 (specfile-0.22.0.tar.gz) = dec198fb81449a5465be00b6e86aebb75287b8ae83cfb6393a08af0711f426342c1cfa9de86bb846d87544025579575e31c0da63944bf8cbf91f92daf30acf01 From 43d842225a1767fa3c1c11bff0e49801af3ee150 Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 6 Oct 2023 13:12:58 +0000 Subject: [PATCH 05/19] [packit] 0.22.1 upstream release Upstream tag: 0.22.1 Upstream commit: 0af08c92 --- README.packit | 2 +- plans/full.fmf | 8 -------- plans/main.fmf | 2 +- plans/packit-integration.fmf | 6 +++--- python-specfile.spec | 14 ++++++++------ sources | 2 +- 6 files changed, 14 insertions(+), 20 deletions(-) diff --git a/README.packit b/README.packit index 00f69f2..21ea346 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.79.1.post8+g73d04ae8. +The file was generated using packit 0.82.0.post1.dev20+g6670daea. diff --git a/plans/full.fmf b/plans/full.fmf index 0b0a12f..36b58ec 100644 --- a/plans/full.fmf +++ b/plans/full.fmf @@ -2,11 +2,3 @@ summary: Unit & integration tests discover+: filter: tier:1 -adjust: - - when: "distro == rhel-9 or distro == centos-9 or distro == centos-stream-9" - because: "flexmock is not in EPEL 9: https://bugzilla.redhat.com/show_bug.cgi?id=2120251" - prepare: - - how: install - package: python3-pip - - how: shell - script: pip3 install flexmock diff --git a/plans/main.fmf b/plans/main.fmf index 4003017..8a9e14c 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: e49e5e3ff191480046b4c509feacbc0973907d11 + ref: 0af08c92db46a042cff83d7e4647be398dba843e execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index 3306185..24734e8 100644 --- a/plans/packit-integration.fmf +++ b/plans/packit-integration.fmf @@ -2,7 +2,7 @@ discover: how: fmf url: https://github.com/packit/packit filter: tier:0 | tier:1 - ref: 6208d3bf6bd7b22fcf9e7658e1ffd163fbab0b62 + ref: 7581995d78074a7a5bbd87b1fab410a40d18f8ed prepare: - how: install copr: packit/packit-dev @@ -16,12 +16,12 @@ adjust: how: install directory: noarch/ - when: distro == rhel-9 or distro == centos-9 or distro == centos-stream-9 - because: 'flexmock and deepdiff are not in EPEL 9: https://bugzilla.redhat.com/show_bug.cgi?id=2120251' + because: 'build and deepdiff are not in EPEL 9: https://bugzilla.redhat.com/show_bug.cgi?id=2120251' prepare+: - how: install package: python3-pip - how: shell - script: pip3 install flexmock deepdiff==6.3.1 + script: pip3 install build deepdiff - when: distro == rhel-8 or distro == centos-8 or distro == centos-stream-8 because: packit doesn't support EL 8 enabled: false diff --git a/python-specfile.spec b/python-specfile.spec index 473301b..da4e4a7 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -1,9 +1,4 @@ -%if 0%{?rhel} == 9 -# RHEL 9 is missing python-flexmock -%bcond_with tests -%else %bcond_without tests -%endif %global desc %{expand: @@ -13,7 +8,7 @@ in a minimal diff.} Name: python-specfile -Version: 0.22.0 +Version: 0.22.1 Release: 1%{?dist} Summary: A library for parsing and manipulating RPM spec files @@ -46,6 +41,10 @@ Summary: %{summary} %prep %autosetup -p1 -n specfile-%{version} +# since we are building from PyPI source, we don't need git-archive +# support in setuptools_scm +sed -i 's/setuptools_scm\[toml\]>=7/setuptools_scm[toml]/' pyproject.toml + %generate_buildrequires %pyproject_buildrequires %{?with_tests: -x testing} @@ -71,6 +70,9 @@ Summary: %{summary} %changelog +* Fri Oct 06 2023 Packit - 0.22.1-1 +- Removed dependency on setuptools-scm-git-archive. (#290) + * Fri Sep 01 2023 Packit - 0.22.0-1 - Macro definitions and tags gained a new `valid` attribute. A macro definition/tag is considered valid if it doesn't appear in a false branch of any condition appearing in the spec file. (#276) diff --git a/sources b/sources index e0e8067..9b9a431 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.22.0.tar.gz) = dec198fb81449a5465be00b6e86aebb75287b8ae83cfb6393a08af0711f426342c1cfa9de86bb846d87544025579575e31c0da63944bf8cbf91f92daf30acf01 +SHA512 (specfile-0.22.1.tar.gz) = 5ca758b923e121ce37003967b538d97e72fca607e63e500a4126da960d210e1ebd897faa0cd446f7f346caab6eca4d899c6190e5c20322047374ca677e925458 From 088a8f06106ee1bb7f30eb4d2ae556cf4094fafc Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 30 Oct 2023 09:15:09 +0000 Subject: [PATCH 06/19] [packit] 0.23.0 upstream release Upstream tag: 0.23.0 Upstream commit: 0e110df4 --- README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- python-specfile.spec | 5 ++++- sources | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/README.packit b/README.packit index 21ea346..a7f0bd7 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.82.0.post1.dev20+g6670daea. +The file was generated using packit 0.83.0.post1.dev20+gaf7edc1f. diff --git a/plans/main.fmf b/plans/main.fmf index 8a9e14c..beddbe7 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: 0af08c92db46a042cff83d7e4647be398dba843e + ref: 0e110df4b4548655ad361f8aece05fd5073cb413 execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index 24734e8..ee2f425 100644 --- a/plans/packit-integration.fmf +++ b/plans/packit-integration.fmf @@ -2,7 +2,7 @@ discover: how: fmf url: https://github.com/packit/packit filter: tier:0 | tier:1 - ref: 7581995d78074a7a5bbd87b1fab410a40d18f8ed + ref: 7351bcb14492e1accb42fd0cf4b93f00f1c37ed7 prepare: - how: install copr: packit/packit-dev diff --git a/python-specfile.spec b/python-specfile.spec index da4e4a7..8ded174 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -8,7 +8,7 @@ in a minimal diff.} Name: python-specfile -Version: 0.22.1 +Version: 0.23.0 Release: 1%{?dist} Summary: A library for parsing and manipulating RPM spec files @@ -70,6 +70,9 @@ sed -i 's/setuptools_scm\[toml\]>=7/setuptools_scm[toml]/' pyproject.toml %changelog +* Mon Oct 30 2023 Packit - 0.23.0-1 +- Sources now have a `valid` property that indicates whether a source is valid in the current context, meaning it is not present in a false branch of any condition. (#295) + * Fri Oct 06 2023 Packit - 0.22.1-1 - Removed dependency on setuptools-scm-git-archive. (#290) diff --git a/sources b/sources index 9b9a431..41ef739 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.22.1.tar.gz) = 5ca758b923e121ce37003967b538d97e72fca607e63e500a4126da960d210e1ebd897faa0cd446f7f346caab6eca4d899c6190e5c20322047374ca677e925458 +SHA512 (specfile-0.23.0.tar.gz) = fd6458e0d3f270c8cca75f63da65982ed4ecaa9a47b88fdaae95f4430aaafd10332e397a340363a0e193d856b152d3314ba43cff00e23d55a19af9b87e119abb From ce94f144fef2f047d2de684cd3846c5c8081228a Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 6 Nov 2023 17:18:59 +0000 Subject: [PATCH 07/19] [packit] 0.24.0 upstream release Upstream tag: 0.24.0 Upstream commit: 2efbd9ce --- README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- python-specfile.spec | 6 +++++- sources | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/README.packit b/README.packit index a7f0bd7..0c8efac 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.83.0.post1.dev20+gaf7edc1f. +The file was generated using packit 0.85.0.post1.dev13+g80a59f61. diff --git a/plans/main.fmf b/plans/main.fmf index beddbe7..82af9d3 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: 0e110df4b4548655ad361f8aece05fd5073cb413 + ref: 2efbd9ce9b4316f1eba34e240be3821c83b774a0 execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index ee2f425..26239d9 100644 --- a/plans/packit-integration.fmf +++ b/plans/packit-integration.fmf @@ -2,7 +2,7 @@ discover: how: fmf url: https://github.com/packit/packit filter: tier:0 | tier:1 - ref: 7351bcb14492e1accb42fd0cf4b93f00f1c37ed7 + ref: 80a59f612fd70d709f9e8c7da141118e17aa7a56 prepare: - how: install copr: packit/packit-dev diff --git a/python-specfile.spec b/python-specfile.spec index 8ded174..bbff586 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -8,7 +8,7 @@ in a minimal diff.} Name: python-specfile -Version: 0.23.0 +Version: 0.24.0 Release: 1%{?dist} Summary: A library for parsing and manipulating RPM spec files @@ -70,6 +70,10 @@ sed -i 's/setuptools_scm\[toml\]>=7/setuptools_scm[toml]/' pyproject.toml %changelog +* Mon Nov 06 2023 Packit - 0.24.0-1 +- Improved type annotations for `UserList` subclasses. (#299) +- Macro definitions gained a new `commented_out` property indicating that a macro definition is commented out. Another new property, `comment_out_style`, determines if it is achieved by using a `%%dnl` (discard next line) directive (e.g. `%%dnl %%global prerelease beta2`) or by replacing the starting `%` with `#` (e.g. `#global prerelease beta2`). (#298) + * Mon Oct 30 2023 Packit - 0.23.0-1 - Sources now have a `valid` property that indicates whether a source is valid in the current context, meaning it is not present in a false branch of any condition. (#295) diff --git a/sources b/sources index 41ef739..da16e02 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.23.0.tar.gz) = fd6458e0d3f270c8cca75f63da65982ed4ecaa9a47b88fdaae95f4430aaafd10332e397a340363a0e193d856b152d3314ba43cff00e23d55a19af9b87e119abb +SHA512 (specfile-0.24.0.tar.gz) = e5728f0b0bfa9c2bcf102d1e65d5182b94e34af2228ef655cc28c83d8f60fa4d08432c61bcf9f6c1c8c3d4aeea0bf1595bead542687d3c2690fe3ddaae34325f From 3e8c28f5410b134bbfc75de403a35ac73c796a91 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 20 Nov 2023 15:01:13 +0000 Subject: [PATCH 08/19] [packit] 0.25.0 upstream release Upstream tag: 0.25.0 Upstream commit: 78f50b4a --- .packit.yaml | 4 ++++ README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- python-specfile.spec | 16 +++++++++++++--- sources | 2 +- 6 files changed, 21 insertions(+), 7 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index 1a4f6a8..3b4d032 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -4,6 +4,10 @@ packit_instances: ["prod", "stg"] upstream_project_url: https://github.com/packit/specfile issue_repository: https://github.com/packit/specfile +# PEP440 +#prerelease_suffix_pattern: "([.\\-_]?)(a(lpha)?|b(eta)?|r?c|pre(view)?)([.\\-_]?\\d+)?" +#prerelease_suffix_macro: prerelease + copy_upstream_release_description: true packages: diff --git a/README.packit b/README.packit index 0c8efac..2d6dd96 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.85.0.post1.dev13+g80a59f61. +The file was generated using packit 0.86.1.post1.dev5+g8b1868cd. diff --git a/plans/main.fmf b/plans/main.fmf index 82af9d3..ad7f0bd 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: 2efbd9ce9b4316f1eba34e240be3821c83b774a0 + ref: 78f50b4a097245938a00e27e7b7165c8eb00ec3b execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index 26239d9..bba32ab 100644 --- a/plans/packit-integration.fmf +++ b/plans/packit-integration.fmf @@ -2,7 +2,7 @@ discover: how: fmf url: https://github.com/packit/packit filter: tier:0 | tier:1 - ref: 80a59f612fd70d709f9e8c7da141118e17aa7a56 + ref: 209847d1ff49e4bc4d1099e77b2b0790bc680a04 prepare: - how: install copr: packit/packit-dev diff --git a/python-specfile.spec b/python-specfile.spec index bbff586..db2c84b 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -7,15 +7,22 @@ Main focus is on modifying existing spec files, any change should result in a minimal diff.} +%global base_version 0.25.0 +#global prerelease rc2 + +%global package_version %{base_version}%{?prerelease:~%{prerelease}} +%global pypi_version %{base_version}%{?prerelease} + + Name: python-specfile -Version: 0.24.0 +Version: %{package_version} Release: 1%{?dist} Summary: A library for parsing and manipulating RPM spec files License: MIT URL: https://github.com/packit/specfile -Source0: %{pypi_source specfile} +Source0: %{pypi_source specfile %{pypi_version}} BuildArch: noarch @@ -39,7 +46,7 @@ Summary: %{summary} %prep -%autosetup -p1 -n specfile-%{version} +%autosetup -p1 -n specfile-%{pypi_version} # since we are building from PyPI source, we don't need git-archive # support in setuptools_scm @@ -70,6 +77,9 @@ sed -i 's/setuptools_scm\[toml\]>=7/setuptools_scm[toml]/' pyproject.toml %changelog +* Mon Nov 20 2023 Packit - 0.25.0-1 +- There is a new method, `Specfile.update_version()`, that allows updating spec file version even if it is a pre-release. (#317) + * Mon Nov 06 2023 Packit - 0.24.0-1 - Improved type annotations for `UserList` subclasses. (#299) - Macro definitions gained a new `commented_out` property indicating that a macro definition is commented out. Another new property, `comment_out_style`, determines if it is achieved by using a `%%dnl` (discard next line) directive (e.g. `%%dnl %%global prerelease beta2`) or by replacing the starting `%` with `#` (e.g. `#global prerelease beta2`). (#298) diff --git a/sources b/sources index da16e02..0e78caa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.24.0.tar.gz) = e5728f0b0bfa9c2bcf102d1e65d5182b94e34af2228ef655cc28c83d8f60fa4d08432c61bcf9f6c1c8c3d4aeea0bf1595bead542687d3c2690fe3ddaae34325f +SHA512 (specfile-0.25.0.tar.gz) = 9e3d2f3665ccd713c7e2c50f01656c2b9e157bab88c90be38053ac94e20feab2c3f8d5f1f7dbc0ae543e7ad101fc3db7c5bfbfed249537a999608d5bb737eaf9 From e4872542151c36f10bd4e70e24d162effcb2ac71 Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 19 Jan 2024 13:29:53 +0000 Subject: [PATCH 09/19] [packit] 0.27.0 upstream release Upstream tag: 0.27.0 Upstream commit: 1789f9c6 --- .packit.yaml | 4 ++-- README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- python-specfile.spec | 7 +++++-- sources | 2 +- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index 3b4d032..d0fdee9 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -5,8 +5,8 @@ upstream_project_url: https://github.com/packit/specfile issue_repository: https://github.com/packit/specfile # PEP440 -#prerelease_suffix_pattern: "([.\\-_]?)(a(lpha)?|b(eta)?|r?c|pre(view)?)([.\\-_]?\\d+)?" -#prerelease_suffix_macro: prerelease +prerelease_suffix_pattern: "([.\\-_]?)(a(lpha)?|b(eta)?|r?c|pre(view)?)([.\\-_]?\\d+)?" +prerelease_suffix_macro: prerelease copy_upstream_release_description: true diff --git a/README.packit b/README.packit index 2d6dd96..2a36d18 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.86.1.post1.dev5+g8b1868cd. +The file was generated using packit 0.88.0.post1.dev9+g9c8f50e3. diff --git a/plans/main.fmf b/plans/main.fmf index ad7f0bd..2e12632 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: 78f50b4a097245938a00e27e7b7165c8eb00ec3b + ref: 1789f9c67c37da87ffdc967ad9311c4881013077 execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index bba32ab..14f21ba 100644 --- a/plans/packit-integration.fmf +++ b/plans/packit-integration.fmf @@ -2,7 +2,7 @@ discover: how: fmf url: https://github.com/packit/packit filter: tier:0 | tier:1 - ref: 209847d1ff49e4bc4d1099e77b2b0790bc680a04 + ref: f3df29535cfdefd44febe79cb4a883627c085db0 prepare: - how: install copr: packit/packit-dev diff --git a/python-specfile.spec b/python-specfile.spec index db2c84b..a510823 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -7,8 +7,8 @@ Main focus is on modifying existing spec files, any change should result in a minimal diff.} -%global base_version 0.25.0 -#global prerelease rc2 +%global base_version 0.27.0 +#global prerelease rc1 %global package_version %{base_version}%{?prerelease:~%{prerelease}} %global pypi_version %{base_version}%{?prerelease} @@ -77,6 +77,9 @@ sed -i 's/setuptools_scm\[toml\]>=7/setuptools_scm[toml]/' pyproject.toml %changelog +* Fri Jan 19 2024 Packit - 0.27.0-1 +- Improved handling of commented-out macro definitions and fixed related logic in `Specfile.update_value()`. (#338) + * Mon Nov 20 2023 Packit - 0.25.0-1 - There is a new method, `Specfile.update_version()`, that allows updating spec file version even if it is a pre-release. (#317) diff --git a/sources b/sources index 0e78caa..b70f9d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.25.0.tar.gz) = 9e3d2f3665ccd713c7e2c50f01656c2b9e157bab88c90be38053ac94e20feab2c3f8d5f1f7dbc0ae543e7ad101fc3db7c5bfbfed249537a999608d5bb737eaf9 +SHA512 (specfile-0.27.0.tar.gz) = 8363e7e589ca1b130f0b27aaef08ae030d7c363cfbccb0e55373cc4f7d120ceadc9afa842eb51121674a0c14930c100b26640108bf60db449f89a1eeecde1785 From ad6f042da8b4e68fe8fd3c503d8aeb4c560869ad Mon Sep 17 00:00:00 2001 From: Packit Date: Sun, 17 Mar 2024 15:09:29 +0000 Subject: [PATCH 10/19] [packit] 0.28.0 upstream release Upstream tag: 0.28.0 Upstream commit: cdf06f20 --- README.packit | 2 +- plans/git_reference.py | 3 +++ plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- python-specfile.spec | 5 ++++- sources | 2 +- 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/README.packit b/README.packit index 2a36d18..38c0a99 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.88.0.post1.dev9+g9c8f50e3. +The file was generated using packit 0.93.0.post1.dev5+g0048024e. diff --git a/plans/git_reference.py b/plans/git_reference.py index 6517cfe..fe4e906 100644 --- a/plans/git_reference.py +++ b/plans/git_reference.py @@ -1,5 +1,8 @@ #!/usr/bin/python +# Copyright Contributors to the Packit project. +# SPDX-License-Identifier: MIT + import subprocess from pathlib import Path diff --git a/plans/main.fmf b/plans/main.fmf index 2e12632..1289312 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: 1789f9c67c37da87ffdc967ad9311c4881013077 + ref: cdf06f20715f661b1a5f478320eee2b48c2ba287 execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index 14f21ba..e0e9738 100644 --- a/plans/packit-integration.fmf +++ b/plans/packit-integration.fmf @@ -2,7 +2,7 @@ discover: how: fmf url: https://github.com/packit/packit filter: tier:0 | tier:1 - ref: f3df29535cfdefd44febe79cb4a883627c085db0 + ref: 0048024ec6564008a703140254c4394158b6ed67 prepare: - how: install copr: packit/packit-dev diff --git a/python-specfile.spec b/python-specfile.spec index a510823..919fa08 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -7,7 +7,7 @@ Main focus is on modifying existing spec files, any change should result in a minimal diff.} -%global base_version 0.27.0 +%global base_version 0.28.0 #global prerelease rc1 %global package_version %{base_version}%{?prerelease:~%{prerelease}} @@ -77,6 +77,9 @@ sed -i 's/setuptools_scm\[toml\]>=7/setuptools_scm[toml]/' pyproject.toml %changelog +* Sun Mar 17 2024 Packit - 0.28.0-1 +- A trailing newline is no longer added to spec files without one upon saving. (#353) + * Fri Jan 19 2024 Packit - 0.27.0-1 - Improved handling of commented-out macro definitions and fixed related logic in `Specfile.update_value()`. (#338) diff --git a/sources b/sources index b70f9d7..0025f98 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.27.0.tar.gz) = 8363e7e589ca1b130f0b27aaef08ae030d7c363cfbccb0e55373cc4f7d120ceadc9afa842eb51121674a0c14930c100b26640108bf60db449f89a1eeecde1785 +SHA512 (specfile-0.28.0.tar.gz) = 1f2ab8e5cf492aec1e9b11583d88ae3de1fc9d9512d5a5c289b5d83d54c69eeb6d410971997328d1de3f82cd411b7d10cf7982de44084ede9745b87db7c0d9b8 From 9cd47e49b2b7a35b29734c6172636211054aaf78 Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 26 Mar 2024 11:33:41 +0000 Subject: [PATCH 11/19] [packit] 0.28.1 upstream release Upstream tag: 0.28.1 Upstream commit: a14e6887 --- .packit.yaml | 1 + README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- plans/performance.fmf | 4 ++++ python-specfile.spec | 5 ++++- sources | 2 +- 7 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index d0fdee9..0512035 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -185,6 +185,7 @@ jobs: trigger: commit packages: [specfile] packit_instances: ["stg"] + allowed_builders: ["packit-stg", "packit"] dist_git_branches: - fedora-branched # rawhide updates are created automatically - epel-9 diff --git a/README.packit b/README.packit index 38c0a99..d3bd2a6 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.93.0.post1.dev5+g0048024e. +The file was generated using packit 0.94.0.post1.dev11+gfe946257. diff --git a/plans/main.fmf b/plans/main.fmf index 1289312..037980f 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: cdf06f20715f661b1a5f478320eee2b48c2ba287 + ref: a14e6887852b6e831e3a0c4f9c4230768f2afc4d execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index e0e9738..7a72ff3 100644 --- a/plans/packit-integration.fmf +++ b/plans/packit-integration.fmf @@ -2,7 +2,7 @@ discover: how: fmf url: https://github.com/packit/packit filter: tier:0 | tier:1 - ref: 0048024ec6564008a703140254c4394158b6ed67 + ref: fe9462574c5e15f02c10cf8f6049a3d6c1671040 prepare: - how: install copr: packit/packit-dev diff --git a/plans/performance.fmf b/plans/performance.fmf index bf8bf53..341d17e 100644 --- a/plans/performance.fmf +++ b/plans/performance.fmf @@ -9,3 +9,7 @@ prepare: script: pip3 install pytest-fail-slow - how: shell script: curl --output-dir /tmp -O https://src.fedoraproject.org/rpms/texlive/raw/rawhide/f/texlive.spec +adjust: + - when: "initiator != packit" + because: "skip this plan on dist-git pull requests" + enabled: false diff --git a/python-specfile.spec b/python-specfile.spec index 919fa08..d93db86 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -7,7 +7,7 @@ Main focus is on modifying existing spec files, any change should result in a minimal diff.} -%global base_version 0.28.0 +%global base_version 0.28.1 #global prerelease rc1 %global package_version %{base_version}%{?prerelease:~%{prerelease}} @@ -77,6 +77,9 @@ sed -i 's/setuptools_scm\[toml\]>=7/setuptools_scm[toml]/' pyproject.toml %changelog +* Tue Mar 26 2024 Packit - 0.28.1-1 +- We have fixed an issue in `%%prep` section processing. For instance, if the `%%patches` macro appeared there, it would have been converted to `%%patch es`, causing failure when executing `%%prep` later. (#356) + * Sun Mar 17 2024 Packit - 0.28.0-1 - A trailing newline is no longer added to spec files without one upon saving. (#353) diff --git a/sources b/sources index 0025f98..3383536 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.28.0.tar.gz) = 1f2ab8e5cf492aec1e9b11583d88ae3de1fc9d9512d5a5c289b5d83d54c69eeb6d410971997328d1de3f82cd411b7d10cf7982de44084ede9745b87db7c0d9b8 +SHA512 (specfile-0.28.1.tar.gz) = 2308ad3124f937fa168f925aaa2489998a0b5a572cd0c0fa7e949bd615ef4a01b272183d0eb5ac0ea45df52e57da35d428d816096e1eac29fea316a9e9043d27 From f2d2ef1a7d3e2d1e9dc90ee9cd24c2e8b9737e44 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 8 Apr 2024 13:58:53 +0000 Subject: [PATCH 12/19] Update to 0.28.2 upstream release - Resolves: rhbz#2271583 Upstream tag: 0.28.2 Upstream commit: 904cb3b5 Commit authored by Packit automation (https://packit.dev/) --- README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- python-specfile.spec | 6 +++++- sources | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/README.packit b/README.packit index d3bd2a6..67f09b6 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.94.0.post1.dev11+gfe946257. +The file was generated using packit 0.94.1.post1.dev6+g1c8e91f7. diff --git a/plans/main.fmf b/plans/main.fmf index 037980f..3f62775 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: a14e6887852b6e831e3a0c4f9c4230768f2afc4d + ref: 904cb3b5c7fa9a03ab442c81c14cd443bbe0c841 execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index 7a72ff3..204ff8b 100644 --- a/plans/packit-integration.fmf +++ b/plans/packit-integration.fmf @@ -2,7 +2,7 @@ discover: how: fmf url: https://github.com/packit/packit filter: tier:0 | tier:1 - ref: fe9462574c5e15f02c10cf8f6049a3d6c1671040 + ref: f760ddec7887881115001a79235034e0ad5496d1 prepare: - how: install copr: packit/packit-dev diff --git a/python-specfile.spec b/python-specfile.spec index d93db86..b07d45d 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -7,7 +7,7 @@ Main focus is on modifying existing spec files, any change should result in a minimal diff.} -%global base_version 0.28.1 +%global base_version 0.28.2 #global prerelease rc1 %global package_version %{base_version}%{?prerelease:~%{prerelease}} @@ -77,6 +77,10 @@ sed -i 's/setuptools_scm\[toml\]>=7/setuptools_scm[toml]/' pyproject.toml %changelog +* Mon Apr 08 2024 Packit - 0.28.2-1 +- Handling of trailing newlines in the macro defintions has been improved. (#361) +- Resolves: rhbz#2271583 + * Tue Mar 26 2024 Packit - 0.28.1-1 - We have fixed an issue in `%%prep` section processing. For instance, if the `%%patches` macro appeared there, it would have been converted to `%%patch es`, causing failure when executing `%%prep` later. (#356) diff --git a/sources b/sources index 3383536..8699b34 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.28.1.tar.gz) = 2308ad3124f937fa168f925aaa2489998a0b5a572cd0c0fa7e949bd615ef4a01b272183d0eb5ac0ea45df52e57da35d428d816096e1eac29fea316a9e9043d27 +SHA512 (specfile-0.28.2.tar.gz) = 3478cd95445cd4131cbb5f2f5673884f72d8cdc72543de8179875e3861796475f0d6fe74aa334185877a28f299eb385e3b970e72249cbec1fbff47316fe122e5 From b5fdf1b896fc0fe054207f6f232132edeeb2516a Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 23 May 2024 11:22:21 +0000 Subject: [PATCH 13/19] Update to 0.28.3 upstream release Upstream tag: 0.28.3 Upstream commit: 557c33bd Commit authored by Packit automation (https://packit.dev/) --- README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 4 ++-- python-specfile.spec | 6 +++++- sources | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/README.packit b/README.packit index 67f09b6..97de583 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.94.1.post1.dev6+g1c8e91f7. +The file was generated using packit 0.96.0.post1.dev4+gc5b1ea8e. diff --git a/plans/main.fmf b/plans/main.fmf index 3f62775..b2334f0 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: 904cb3b5c7fa9a03ab442c81c14cd443bbe0c841 + ref: 557c33bd44a115145f9c7593e0c0b42fc5b8c9b4 execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index 204ff8b..abf71ff 100644 --- a/plans/packit-integration.fmf +++ b/plans/packit-integration.fmf @@ -2,12 +2,12 @@ discover: how: fmf url: https://github.com/packit/packit filter: tier:0 | tier:1 - ref: f760ddec7887881115001a79235034e0ad5496d1 + ref: e009705539b8565841c3d7538292ef6392854013 prepare: - how: install copr: packit/packit-dev - how: shell - script: dnf -y config-manager --save --setopt="*:packit:packit-dev.priority=5" + script: sed -i -n '/^priority=/!p;$apriority=5' /etc/yum.repos.d/*:packit:packit-dev.repo adjust: - when: how == integration because: provide latest python-specfile rpm when running locally diff --git a/python-specfile.spec b/python-specfile.spec index b07d45d..e3ab3de 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -7,7 +7,7 @@ Main focus is on modifying existing spec files, any change should result in a minimal diff.} -%global base_version 0.28.2 +%global base_version 0.28.3 #global prerelease rc1 %global package_version %{base_version}%{?prerelease:~%{prerelease}} @@ -77,6 +77,10 @@ sed -i 's/setuptools_scm\[toml\]>=7/setuptools_scm[toml]/' pyproject.toml %changelog +* Thu May 23 2024 Packit - 0.28.3-1 +- Fixed several minor issues such as processing seemingly commented-out macro definitions (e.g. `#%%global prerel rc1`) and treating `SourceLicense` tag as a source. (#374, #376) +- Made `EVR`, `NEVR` and `NEVRA` objects comparable. (#379) + * Mon Apr 08 2024 Packit - 0.28.2-1 - Handling of trailing newlines in the macro defintions has been improved. (#361) - Resolves: rhbz#2271583 diff --git a/sources b/sources index 8699b34..b61a097 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.28.2.tar.gz) = 3478cd95445cd4131cbb5f2f5673884f72d8cdc72543de8179875e3861796475f0d6fe74aa334185877a28f299eb385e3b970e72249cbec1fbff47316fe122e5 +SHA512 (specfile-0.28.3.tar.gz) = 552de9dc819ce1f2eb78419511ad547c717acc4fb0aad4ec451cec986c30ee3aaec4fab5f2bf33d7558d67c04879afa35270768d0f52f87909909cb8d83773e2 From 1926c35895510590ca6822358599e85e734340ab Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 6 Jun 2024 13:55:01 +0000 Subject: [PATCH 14/19] Update to 0.29.0 upstream release Upstream tag: 0.29.0 Upstream commit: 0ba5f9ff Commit authored by Packit automation (https://packit.dev/) --- README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- python-specfile.spec | 5 ++++- sources | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/README.packit b/README.packit index 97de583..d2b528d 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.96.0.post1.dev4+gc5b1ea8e. +The file was generated using packit 0.97.1.post1.dev6+gc8c0314a. diff --git a/plans/main.fmf b/plans/main.fmf index b2334f0..0df98ae 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: 557c33bd44a115145f9c7593e0c0b42fc5b8c9b4 + ref: 0ba5f9ffec8b03d16ecf6741226e44731a450d45 execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index abf71ff..2d9bc6f 100644 --- a/plans/packit-integration.fmf +++ b/plans/packit-integration.fmf @@ -2,7 +2,7 @@ discover: how: fmf url: https://github.com/packit/packit filter: tier:0 | tier:1 - ref: e009705539b8565841c3d7538292ef6392854013 + ref: 9a08d7fc32ed39516af06e09204ad70fd2827f96 prepare: - how: install copr: packit/packit-dev diff --git a/python-specfile.spec b/python-specfile.spec index e3ab3de..dbe8699 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -7,7 +7,7 @@ Main focus is on modifying existing spec files, any change should result in a minimal diff.} -%global base_version 0.28.3 +%global base_version 0.29.0 #global prerelease rc1 %global package_version %{base_version}%{?prerelease:~%{prerelease}} @@ -77,6 +77,9 @@ sed -i 's/setuptools_scm\[toml\]>=7/setuptools_scm[toml]/' pyproject.toml %changelog +* Thu Jun 06 2024 Packit - 0.29.0-1 +- Improved compatibility with RPM 4.20 (alpha version is currently in Fedora Rawhide). (#380) + * Thu May 23 2024 Packit - 0.28.3-1 - Fixed several minor issues such as processing seemingly commented-out macro definitions (e.g. `#%%global prerel rc1`) and treating `SourceLicense` tag as a source. (#374, #376) - Made `EVR`, `NEVR` and `NEVRA` objects comparable. (#379) diff --git a/sources b/sources index b61a097..89d4c6f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.28.3.tar.gz) = 552de9dc819ce1f2eb78419511ad547c717acc4fb0aad4ec451cec986c30ee3aaec4fab5f2bf33d7558d67c04879afa35270768d0f52f87909909cb8d83773e2 +SHA512 (specfile-0.29.0.tar.gz) = 688992f55ea00e1993c87d3f0a13ff179c48cab8b458de1cc1fc1d44c276867f35bceaf1ee8740ead1d1b4a575956ad3299f45e3960f30109bfe08346c88f310 From 660d416f29f3efb501d0644828bc81a3fed5066f Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 26 Jun 2024 12:25:00 +0000 Subject: [PATCH 15/19] Update to 0.30.0 upstream release Upstream tag: 0.30.0 Upstream commit: 85a0b40d Commit authored by Packit automation (https://packit.dev/) --- .packit.yaml | 13 ++++++++++++- README.packit | 2 +- plans/full.fmf | 6 ++++++ plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- plans/smoke.fmf | 6 ++++++ python-specfile.spec | 5 ++++- sources | 2 +- 8 files changed, 32 insertions(+), 6 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index 0512035..c25a2ce 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -136,8 +136,19 @@ jobs: trigger: pull_request packages: [specfile-epel8] tmt_plan: "smoke|full" + use_internal_tf: true targets: - - epel-8 + epel-8: + distros: [RHEL-8] + # enable EPEL + tf_extra_params: + environments: + - kickstart: + post-install: | + %post --log=/dev/console + set -x + dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm + %end - job: tests trigger: pull_request diff --git a/README.packit b/README.packit index d2b528d..e273ea7 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.97.1.post1.dev6+gc8c0314a. +The file was generated using packit 0.97.3.post1.dev2+gffa76e3b. diff --git a/plans/full.fmf b/plans/full.fmf index 36b58ec..4ed1316 100644 --- a/plans/full.fmf +++ b/plans/full.fmf @@ -2,3 +2,9 @@ summary: Unit & integration tests discover+: filter: tier:1 +adjust: + - when: "distro == rhel-8" + because: "only platform-python is installed on RHEL 8 by default" + prepare+: + - how: install + package: python3 diff --git a/plans/main.fmf b/plans/main.fmf index 0df98ae..a9b7ad4 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: 0ba5f9ffec8b03d16ecf6741226e44731a450d45 + ref: 85a0b40d8c05817614cbc7a663d59f18db75484e execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index 2d9bc6f..11a1b0a 100644 --- a/plans/packit-integration.fmf +++ b/plans/packit-integration.fmf @@ -2,7 +2,7 @@ discover: how: fmf url: https://github.com/packit/packit filter: tier:0 | tier:1 - ref: 9a08d7fc32ed39516af06e09204ad70fd2827f96 + ref: 9f47528040e3ee9bfc68d51f030b74d38bb82207 prepare: - how: install copr: packit/packit-dev diff --git a/plans/smoke.fmf b/plans/smoke.fmf index 578e8ba..059ee80 100644 --- a/plans/smoke.fmf +++ b/plans/smoke.fmf @@ -2,3 +2,9 @@ summary: Basic smoke test discover+: filter: tier:0 +adjust: + - when: "distro == rhel-8" + because: "only platform-python is installed on RHEL 8 by default" + prepare+: + - how: install + package: python3 diff --git a/python-specfile.spec b/python-specfile.spec index dbe8699..f547361 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -7,7 +7,7 @@ Main focus is on modifying existing spec files, any change should result in a minimal diff.} -%global base_version 0.29.0 +%global base_version 0.30.0 #global prerelease rc1 %global package_version %{base_version}%{?prerelease:~%{prerelease}} @@ -77,6 +77,9 @@ sed -i 's/setuptools_scm\[toml\]>=7/setuptools_scm[toml]/' pyproject.toml %changelog +* Wed Jun 26 2024 Packit - 0.30.0-1 +- Fixed an exception that occured when accessing the `Specfile.has_autochangelog` property while having unparseable lines (e.g. lines ending with unescaped `%`) in `%%changelog`. (#387) + * Thu Jun 06 2024 Packit - 0.29.0-1 - Improved compatibility with RPM 4.20 (alpha version is currently in Fedora Rawhide). (#380) diff --git a/sources b/sources index 89d4c6f..eda9070 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.29.0.tar.gz) = 688992f55ea00e1993c87d3f0a13ff179c48cab8b458de1cc1fc1d44c276867f35bceaf1ee8740ead1d1b4a575956ad3299f45e3960f30109bfe08346c88f310 +SHA512 (specfile-0.30.0.tar.gz) = 47dd30fb45e4cbf5f1263fb79b8655c43be53de89f2c46eeb98d54a294bc3942f3eeec4fbedb531d6f9b1332e48958db0dc8bb467a1d451988d15c21760d4596 From e977d66193b2c45785f657c2964383d5f6664e20 Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 9 Jul 2024 10:24:26 +0000 Subject: [PATCH 16/19] Update to 0.31.0 upstream release - Resolves: rhbz#2294393 Upstream tag: 0.31.0 Upstream commit: 8aba712b Commit authored by Packit automation (https://packit.dev/) --- README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- python-specfile.spec | 7 ++++++- sources | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/README.packit b/README.packit index e273ea7..55892f1 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.97.3.post1.dev2+gffa76e3b. +The file was generated using packit 0.97.3.post1.dev14+g6ce83fcc. diff --git a/plans/main.fmf b/plans/main.fmf index a9b7ad4..4c133e5 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: 85a0b40d8c05817614cbc7a663d59f18db75484e + ref: 8aba712bb3d969ff96948b5f86d48e2d0d7d0dc7 execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index 11a1b0a..aef9790 100644 --- a/plans/packit-integration.fmf +++ b/plans/packit-integration.fmf @@ -2,7 +2,7 @@ discover: how: fmf url: https://github.com/packit/packit filter: tier:0 | tier:1 - ref: 9f47528040e3ee9bfc68d51f030b74d38bb82207 + ref: 6ce83fcc2b6efd24db9b30e6ca1ae3196bad3bdf prepare: - how: install copr: packit/packit-dev diff --git a/python-specfile.spec b/python-specfile.spec index f547361..8f6fa00 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -7,7 +7,7 @@ Main focus is on modifying existing spec files, any change should result in a minimal diff.} -%global base_version 0.30.0 +%global base_version 0.31.0 #global prerelease rc1 %global package_version %{base_version}%{?prerelease:~%{prerelease}} @@ -77,6 +77,11 @@ sed -i 's/setuptools_scm\[toml\]>=7/setuptools_scm[toml]/' pyproject.toml %changelog +* Tue Jul 09 2024 Packit - 0.31.0-1 +- Value of a `Tag` no longer includes trailing whitespace (if any). (#393) +- specfile now tries to expand macros before processing conditions to be able to resolve conditional expressions defined by macros, for example OpenSUSE Tumbleweed defines `%%ifpython3` macro as `%%if "%%{python_flavor}" == "python3"`. (#394) +- Resolves: rhbz#2294393 + * Wed Jun 26 2024 Packit - 0.30.0-1 - Fixed an exception that occured when accessing the `Specfile.has_autochangelog` property while having unparseable lines (e.g. lines ending with unescaped `%`) in `%%changelog`. (#387) diff --git a/sources b/sources index eda9070..35823b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.30.0.tar.gz) = 47dd30fb45e4cbf5f1263fb79b8655c43be53de89f2c46eeb98d54a294bc3942f3eeec4fbedb531d6f9b1332e48958db0dc8bb467a1d451988d15c21760d4596 +SHA512 (specfile-0.31.0.tar.gz) = 80e1ba19e300f5e6d7300041f4dfe8bc7a22459f0be4944e7a876a2ba91cf775b441104ee57a00d8716bbe535d1d54bc46875db77cc02910d9c30ecd2fc2116b From 44fc619f7bbfbf8b9de0d63e1ff8f72ef957fea8 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 22 Jul 2024 07:12:42 +0000 Subject: [PATCH 17/19] Update to 0.32.0 upstream release Upstream tag: 0.32.0 Upstream commit: 122eefa5 Commit authored by Packit automation (https://packit.dev/) --- README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- python-specfile.spec | 5 ++++- sources | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/README.packit b/README.packit index 55892f1..f49e745 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.97.3.post1.dev14+g6ce83fcc. +The file was generated using packit 0.99.0.post1.dev3+g7c61c94b. diff --git a/plans/main.fmf b/plans/main.fmf index 4c133e5..a8ae95e 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: 8aba712bb3d969ff96948b5f86d48e2d0d7d0dc7 + ref: 122eefa5f4690fd792d390bb15b41de6096399c8 execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index aef9790..d90b607 100644 --- a/plans/packit-integration.fmf +++ b/plans/packit-integration.fmf @@ -2,7 +2,7 @@ discover: how: fmf url: https://github.com/packit/packit filter: tier:0 | tier:1 - ref: 6ce83fcc2b6efd24db9b30e6ca1ae3196bad3bdf + ref: ae04e15025bad4a14f9169df0d6abb32386f86da prepare: - how: install copr: packit/packit-dev diff --git a/python-specfile.spec b/python-specfile.spec index 8f6fa00..9827cd5 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -7,7 +7,7 @@ Main focus is on modifying existing spec files, any change should result in a minimal diff.} -%global base_version 0.31.0 +%global base_version 0.32.0 #global prerelease rc1 %global package_version %{base_version}%{?prerelease:~%{prerelease}} @@ -77,6 +77,9 @@ sed -i 's/setuptools_scm\[toml\]>=7/setuptools_scm[toml]/' pyproject.toml %changelog +* Mon Jul 22 2024 Packit - 0.32.0-1 +- It is now possible to bump a release in a manner similar to `rpmdev-bumpspec` using `Specfile.bump_release()` method. (#399) + * Tue Jul 09 2024 Packit - 0.31.0-1 - Value of a `Tag` no longer includes trailing whitespace (if any). (#393) - specfile now tries to expand macros before processing conditions to be able to resolve conditional expressions defined by macros, for example OpenSUSE Tumbleweed defines `%%ifpython3` macro as `%%if "%%{python_flavor}" == "python3"`. (#394) diff --git a/sources b/sources index 35823b8..2e94e7e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.31.0.tar.gz) = 80e1ba19e300f5e6d7300041f4dfe8bc7a22459f0be4944e7a876a2ba91cf775b441104ee57a00d8716bbe535d1d54bc46875db77cc02910d9c30ecd2fc2116b +SHA512 (specfile-0.32.0.tar.gz) = bca8ad1c032ee81de9c3cc11c89d8243409b47d1bc3eb16c69f0b0f6ee82c240fbeecc40220b978b26f1555ab2a6d9b3687dcc0d9ae295c65b55eac4ea110404 From bd441be526344e917b2b3cba66017eefcc08af00 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 29 Jul 2024 15:27:07 +0000 Subject: [PATCH 18/19] Update to 0.32.1 upstream release Upstream tag: 0.32.1 Upstream commit: 8aac26db Commit authored by Packit automation (https://packit.dev/) --- .packit.yaml | 13 ++++++++++--- README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- python-specfile.spec | 5 ++++- sources | 2 +- 6 files changed, 18 insertions(+), 8 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index c25a2ce..f8b3fc0 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -187,17 +187,24 @@ jobs: packages: [specfile] packit_instances: ["stg"] allowed_pr_authors: ["packit-stg", "packit"] + sidetag_group: packit-specfile-ogr-releases + dependents: + - packit dist_git_branches: - fedora-all - epel-9 + - job: koji_build + trigger: commit + packages: [specfile-epel8] + packit_instances: ["stg"] + allowed_pr_authors: ["packit-stg", "packit"] + dist_git_branches: - epel-8 - job: bodhi_update trigger: commit - packages: [specfile] + packages: [specfile-epel8] packit_instances: ["stg"] allowed_builders: ["packit-stg", "packit"] dist_git_branches: - - fedora-branched # rawhide updates are created automatically - - epel-9 - epel-8 diff --git a/README.packit b/README.packit index f49e745..aeaae38 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.99.0.post1.dev3+g7c61c94b. +The file was generated using packit 0.99.0.post1.dev29+g2e75e6ff. diff --git a/plans/main.fmf b/plans/main.fmf index a8ae95e..2d99239 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: 122eefa5f4690fd792d390bb15b41de6096399c8 + ref: 8aac26db8e7c955bf73b066c8a80b15161a90008 execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index d90b607..b59a04e 100644 --- a/plans/packit-integration.fmf +++ b/plans/packit-integration.fmf @@ -2,7 +2,7 @@ discover: how: fmf url: https://github.com/packit/packit filter: tier:0 | tier:1 - ref: ae04e15025bad4a14f9169df0d6abb32386f86da + ref: 639df09d605626877c9ffe0b7bc8acec381a2816 prepare: - how: install copr: packit/packit-dev diff --git a/python-specfile.spec b/python-specfile.spec index 9827cd5..5e12c96 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -7,7 +7,7 @@ Main focus is on modifying existing spec files, any change should result in a minimal diff.} -%global base_version 0.32.0 +%global base_version 0.32.1 #global prerelease rc1 %global package_version %{base_version}%{?prerelease:~%{prerelease}} @@ -77,6 +77,9 @@ sed -i 's/setuptools_scm\[toml\]>=7/setuptools_scm[toml]/' pyproject.toml %changelog +* Mon Jul 29 2024 Packit - 0.32.1-1 +- Fixed two issues related to condition parsing. (#405) + * Mon Jul 22 2024 Packit - 0.32.0-1 - It is now possible to bump a release in a manner similar to `rpmdev-bumpspec` using `Specfile.bump_release()` method. (#399) diff --git a/sources b/sources index 2e94e7e..a3efceb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.32.0.tar.gz) = bca8ad1c032ee81de9c3cc11c89d8243409b47d1bc3eb16c69f0b0f6ee82c240fbeecc40220b978b26f1555ab2a6d9b3687dcc0d9ae295c65b55eac4ea110404 +SHA512 (specfile-0.32.1.tar.gz) = 236f45286c3eb2253847b9ed4a132c0cac226a968c24f0699b50102f19e331c5e445fd3f8055b71a7df0a3100043730ca343b8872c8117293c84736ff647e6f6 From beb1fdcc264fc8c3509828673f1e26e45f37c504 Mon Sep 17 00:00:00 2001 From: Packit Date: Sun, 15 Sep 2024 20:56:03 +0000 Subject: [PATCH 19/19] Update to 0.32.2 upstream release Upstream tag: 0.32.2 Upstream commit: 514fbded Commit authored by Packit automation (https://packit.dev/) --- README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 4 ++-- python-specfile.spec | 5 ++++- sources | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/README.packit b/README.packit index aeaae38..a034733 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.99.0.post1.dev29+g2e75e6ff. +The file was generated using packit 0.101.0.post1.dev2+g30f91eab. diff --git a/plans/main.fmf b/plans/main.fmf index 2d99239..c40df35 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: 8aac26db8e7c955bf73b066c8a80b15161a90008 + ref: 514fbded1f45a665c4a674367719e8811da87659 execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index b59a04e..b427e6f 100644 --- a/plans/packit-integration.fmf +++ b/plans/packit-integration.fmf @@ -2,7 +2,7 @@ discover: how: fmf url: https://github.com/packit/packit filter: tier:0 | tier:1 - ref: 639df09d605626877c9ffe0b7bc8acec381a2816 + ref: 8d2ad651fc392fe20a3306210e6278dc3db02e9c prepare: - how: install copr: packit/packit-dev @@ -21,7 +21,7 @@ adjust: - how: install package: python3-pip - how: shell - script: pip3 install build deepdiff + script: pip3 install build 'deepdiff < 8.0.0' - when: distro == rhel-8 or distro == centos-8 or distro == centos-stream-8 because: packit doesn't support EL 8 enabled: false diff --git a/python-specfile.spec b/python-specfile.spec index 5e12c96..d363c30 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -7,7 +7,7 @@ Main focus is on modifying existing spec files, any change should result in a minimal diff.} -%global base_version 0.32.1 +%global base_version 0.32.2 #global prerelease rc1 %global package_version %{base_version}%{?prerelease:~%{prerelease}} @@ -77,6 +77,9 @@ sed -i 's/setuptools_scm\[toml\]>=7/setuptools_scm[toml]/' pyproject.toml %changelog +* Sun Sep 15 2024 Packit - 0.32.2-1 +- Explicitly invalidate the global parse hash when a SpecParser instance is created to prevent this issue. (#409) + * Mon Jul 29 2024 Packit - 0.32.1-1 - Fixed two issues related to condition parsing. (#405) diff --git a/sources b/sources index a3efceb..28f0009 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.32.1.tar.gz) = 236f45286c3eb2253847b9ed4a132c0cac226a968c24f0699b50102f19e331c5e445fd3f8055b71a7df0a3100043730ca343b8872c8117293c84736ff647e6f6 +SHA512 (specfile-0.32.2.tar.gz) = 7e3777f6019e0927114a4f5ebeb3c3142b973f663cc4a60caa4a25191c1c5aa21de6ec91eb5d47077a2f63b67476168ab6bf34dda125e97c3b65d4b662e6ed51