From 921cff8bf6740aff30ae3cfd6ce80c15d0d28656 Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 1 Apr 2022 07:44:17 +0000 Subject: [PATCH 01/36] [packit] 0.2.0 upstream release Upstream tag: 0.2.0 Upstream commit: a15b0918 Signed-off-by: Packit --- .gitignore | 1 + .packit.yaml | 113 +++++++++++++++++++++++++++++++++++++++++++ README.packit | 3 ++ python-specfile.spec | 70 +++++++++++++++++++++++++++ sources | 1 + 5 files changed, 188 insertions(+) create mode 100644 .gitignore create mode 100644 .packit.yaml create mode 100644 README.packit create mode 100644 python-specfile.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3d08bcc --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/specfile-0.2.0.tar.gz diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..836a928 --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,113 @@ +--- +specfile_path: fedora/python-specfile.spec + +# add or remove files that should be synced +files_to_sync: + - fedora/python-specfile.spec + - .packit.yaml + +# name in upstream package repository or registry (e.g. in PyPI) +upstream_package_name: specfile +# downstream (Fedora) RPM package name +downstream_package_name: python-specfile + +copy_upstream_release_description: true + +actions: + # we need this b/c `git archive` doesn't put all the metadata in the tarball: + # LookupError: setuptools-scm was unable to detect version for '/builddir/build/BUILD/ogr-0.11.1'. + # Make sure you're either building from a fully intact git repository or PyPI tarballs. + create-archive: + - python3 setup.py sdist --dist-dir ./fedora/ + - bash -c "ls -1t ./fedora/*.tar.gz | head -n 1" + get-current-version: python3 setup.py --version + +srpm_build_deps: + - python3-pip # "python3 setup.py --version" needs it + - python3-setuptools_scm + +jobs: + - job: propose_downstream + trigger: release + metadata: + dist_git_branches: + - fedora-all + - job: propose_downstream + trigger: release + specfile_path: epel/python-specfile.spec + files_to_sync: + - epel/python-specfile.spec + - .packit.yaml + metadata: + dist_git_branches: + - epel-8 + + - job: copr_build + trigger: pull_request + identifier: fedora + metadata: + targets: + - fedora-all + - &copr_build_pr_epel + job: copr_build + trigger: pull_request + specfile_path: epel/python-specfile.spec + identifier: epel + actions: + create-archive: + - python3 setup.py sdist --dist-dir ./epel/ + - bash -c "ls -1t ./epel/*.tar.gz | head -n 1" + get-current-version: python3 setup.py --version + metadata: + targets: + - epel-8 + + - job: copr_build + trigger: commit + metadata: + branch: main + targets: + - fedora-all + project: packit-dev + list_on_homepage: True + preserve_project: True + - <<: *copr_build_pr_epel + trigger: commit + metadata: + branch: main + targets: + - epel-8 + project: packit-dev + list_on_homepage: True + preserve_project: True + + - job: copr_build + trigger: release + metadata: + targets: + - fedora-all + project: packit-releases + list_on_homepage: True + preserve_project: True + - <<: *copr_build_pr_epel + trigger: release + metadata: + targets: + - epel-8 + project: packit-releases + list_on_homepage: True + preserve_project: True + + # downstream automation: + - job: koji_build + trigger: commit + metadata: + dist_git_branches: + - fedora-all + - epel-8 + - job: bodhi_update + trigger: commit + metadata: + dist_git_branches: + - fedora-stable # rawhide updates are created automatically + - epel-8 diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..03c2af0 --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 0.47.2.dev19+g37f70b1. diff --git a/python-specfile.spec b/python-specfile.spec new file mode 100644 index 0000000..7f2c7f5 --- /dev/null +++ b/python-specfile.spec @@ -0,0 +1,70 @@ +%global desc %{expand: +Python library for parsing and manipulating RPM spec files. +Main focus is on modifying existing spec files, any change should result +in a minimal diff.} + + +Name: python-specfile +Version: 0.2.0 +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} + +BuildArch: noarch + +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: %{py3_dist setuptools setuptools-scm setuptools-scm-git-archive} +BuildRequires: %{py3_dist arrow importlib-metadata rpm typing-extensions} +BuildRequires: %{py3_dist flexmock pytest} + + +%description +%{desc} + + +%package -n python%{python3_pkgversion}-specfile +Summary: %{summary} + + +%description -n python%{python3_pkgversion}-specfile +%{desc} + + +%prep +%autosetup -p1 -n specfile-%{version} +# Remove bundled egg-info +rm -rf specfile.egg-info + + +%build +%py3_build + + +%install +%py3_install + + +%check +%pytest + + +%files -n python%{python3_pkgversion}-specfile +%license LICENSE +%doc README.md +%{python3_sitelib}/specfile +%{python3_sitelib}/specfile-%{version}-py%{python3_version}.egg-info + + +%changelog +* Wed Mar 30 2022 Nikola Forró - 0.2.0-1 +- New upstream release 0.2.0 + +* Mon Feb 21 2022 Nikola Forró - 0.1.1-1 +- New upstream release 0.1.1 + +* Tue Feb 08 2022 Nikola Forró - 0.1.0-1 +- Initial package diff --git a/sources b/sources new file mode 100644 index 0000000..49e3947 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (specfile-0.2.0.tar.gz) = cd524bb89fdd5a5e18ac42e575cd09140ed3a0fcf73de8939798fbd430e888c7817ebca4eeb44ba4e54d52de42e0bb115e4fd4ef58c146d93cabddddafe66332 From 0ba51c0f420befcd8fe76742fa3f2bd0e24b3740 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 16 May 2022 12:15:07 +0000 Subject: [PATCH 02/36] [packit] 0.3.0 upstream release Upstream tag: 0.3.0 Upstream commit: df62e212 Signed-off-by: Packit --- .gitignore | 1 + .packit.yaml | 12 +++++++++++- README.packit | 2 +- python-specfile.spec | 14 +++++++++++++- sources | 2 +- 5 files changed, 27 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3d08bcc..f1d16dc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /specfile-0.2.0.tar.gz +/specfile-0.3.0.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 836a928..8149965 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -1,4 +1,9 @@ --- +# We want to use both instances for all upstream jobs including the `propose-downstream` one. +# For downstream, we need to pick just one instance (`stg` in our case) +# and redefine it for the `koji_build` and `bodhi_update` jobs. +packit_instances: ["prod", "stg"] + specfile_path: fedora/python-specfile.spec # add or remove files that should be synced @@ -13,6 +18,9 @@ downstream_package_name: python-specfile copy_upstream_release_description: true +upstream_project_url: https://github.com/packit/specfile +issue_repository: https://github.com/packit/specfile + actions: # we need this b/c `git archive` doesn't put all the metadata in the tarball: # LookupError: setuptools-scm was unable to detect version for '/builddir/build/BUILD/ogr-0.11.1'. @@ -101,13 +109,15 @@ jobs: # downstream automation: - job: koji_build trigger: commit + packit_instances: ["stg"] metadata: dist_git_branches: - fedora-all - epel-8 - job: bodhi_update trigger: commit + packit_instances: ["stg"] metadata: dist_git_branches: - - fedora-stable # rawhide updates are created automatically + - fedora-branched # rawhide updates are created automatically - epel-8 diff --git a/README.packit b/README.packit index 03c2af0..10e5ec5 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.47.2.dev19+g37f70b1. +The file was generated using packit 0.51.1.dev2+g213c789. diff --git a/python-specfile.spec b/python-specfile.spec index 7f2c7f5..be0d930 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -5,7 +5,7 @@ in a minimal diff.} Name: python-specfile -Version: 0.2.0 +Version: 0.3.0 Release: 1%{?dist} Summary: A library for parsing and manipulating RPM spec files @@ -60,6 +60,18 @@ rm -rf specfile.egg-info %changelog +* Mon May 16 2022 Packit - 0.3.0-1 +- Made `Sources` a `MutableSequence` (#36) +- Started using consistent terminology for source numbers and added the option to insert a source with a specific number (#47) +- Added support for implicit source numbering (#48) +- Documented sources and `%prep` macros in README (#49) +- Implemented high-level manipulation of version and release (#54) +- Added support for `* Mon May 16 2022 John Doe - 0.3.0-1.fc35 +- local build` (#56) +- Added `remote` property to sources and enabled addition of `Sources` (#59) +- Implemented mid-level manipulation of `%prep` section, including modification of `%prep` macros (#37, #52) + + * Wed Mar 30 2022 Nikola Forró - 0.2.0-1 - New upstream release 0.2.0 diff --git a/sources b/sources index 49e3947..9529ea1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.2.0.tar.gz) = cd524bb89fdd5a5e18ac42e575cd09140ed3a0fcf73de8939798fbd430e888c7817ebca4eeb44ba4e54d52de42e0bb115e4fd4ef58c146d93cabddddafe66332 +SHA512 (specfile-0.3.0.tar.gz) = 21cff0c575fd9f6c9f13b6e3e4002de68d41ab8248f2cf2873ac0e747371b258da62f90244fbd4f516d2491a5215cbce572c894ae45e12165c068c40d88ea5c8 From 686c1782a405a79a1bc68a8c2bf8b86491e38323 Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 21 Jun 2022 13:32:17 +0000 Subject: [PATCH 03/36] [packit] 0.4.0 upstream release Upstream tag: 0.4.0 Upstream commit: d3b97670 Signed-off-by: Packit --- .gitignore | 1 + README.packit | 2 +- python-specfile.spec | 9 ++++++++- sources | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f1d16dc..475689b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /specfile-0.2.0.tar.gz /specfile-0.3.0.tar.gz +/specfile-0.4.0.tar.gz diff --git a/README.packit b/README.packit index 10e5ec5..547d708 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.51.1.dev2+g213c789. +The file was generated using packit 0.52.2.dev4+g63407fe. diff --git a/python-specfile.spec b/python-specfile.spec index be0d930..e4940bf 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -5,7 +5,7 @@ in a minimal diff.} Name: python-specfile -Version: 0.3.0 +Version: 0.4.0 Release: 1%{?dist} Summary: A library for parsing and manipulating RPM spec files @@ -60,6 +60,13 @@ rm -rf specfile.egg-info %changelog +* Tue Jun 21 2022 Packit - 0.4.0-1 +- Added convenience properties for most used tags (#63) +- Hardened linting by ignoring only specific mypy errors (#64) +- Fixed list of valid tag names and ensured newly added tags are not part of a condition block (#66) +- Initial patch number and its default number of digits are now honored (#66) +- Fixed a bug in `%prep` macro stringification (#67) + * Mon May 16 2022 Packit - 0.3.0-1 - Made `Sources` a `MutableSequence` (#36) - Started using consistent terminology for source numbers and added the option to insert a source with a specific number (#47) diff --git a/sources b/sources index 9529ea1..e9c1f0b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.3.0.tar.gz) = 21cff0c575fd9f6c9f13b6e3e4002de68d41ab8248f2cf2873ac0e747371b258da62f90244fbd4f516d2491a5215cbce572c894ae45e12165c068c40d88ea5c8 +SHA512 (specfile-0.4.0.tar.gz) = 21e68fd6a104dd4d652573a8661a0f6c10e19883374e5a87a16c9925c4ffb7d5758a4b14cf059ed14a0825fb25771898e8c95375e6d015ee22e38d0598af4773 From 6da75bfee8d40b1b343759967196b633f76b896d Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 22 Jul 2022 08:03:58 +0000 Subject: [PATCH 04/36] [packit] 0.5.0 upstream release Upstream tag: 0.5.0 Upstream commit: e4f80e56 Signed-off-by: Packit --- .gitignore | 1 + README.packit | 2 +- python-specfile.spec | 11 ++++++++++- sources | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 475689b..39646ac 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /specfile-0.2.0.tar.gz /specfile-0.3.0.tar.gz /specfile-0.4.0.tar.gz +/specfile-0.5.0.tar.gz diff --git a/README.packit b/README.packit index 547d708..30a712f 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.52.2.dev4+g63407fe. +The file was generated using packit 0.55.1.dev8+g432e38d. diff --git a/python-specfile.spec b/python-specfile.spec index e4940bf..e1cef19 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -5,7 +5,7 @@ in a minimal diff.} Name: python-specfile -Version: 0.4.0 +Version: 0.5.0 Release: 1%{?dist} Summary: A library for parsing and manipulating RPM spec files @@ -60,6 +60,15 @@ rm -rf specfile.egg-info %changelog +* Fri Jul 22 2022 Packit - 0.5.0-1 +- Strict optional typing is now enforced (#68) +- Fixed deduplication of tag names (#69) +- Sources and patches can now be removed by number (#69) +- Number of digits in a source number is now expressed the same way as packit does it (#69) +- Empty lines are now compressed when deleting tags (#69) +- Added convenience property for getting texts of tag comments (#69) +- Added convenience method for adding a patch (#69) + * Tue Jun 21 2022 Packit - 0.4.0-1 - Added convenience properties for most used tags (#63) - Hardened linting by ignoring only specific mypy errors (#64) diff --git a/sources b/sources index e9c1f0b..8d9da2f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.4.0.tar.gz) = 21e68fd6a104dd4d652573a8661a0f6c10e19883374e5a87a16c9925c4ffb7d5758a4b14cf059ed14a0825fb25771898e8c95375e6d015ee22e38d0598af4773 +SHA512 (specfile-0.5.0.tar.gz) = e5472d1bfffc76acd781ee32fb79b4f2be9b46d3576fc5bf2d52e2edff3a2aa47563237bad1563c4c0f305a4aa1bbc59a515fa2153e6e37b01f1c7b216ad58e0 From 1918ea1c7017d083d40e3618b8d03e1127fae0c8 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 10 Aug 2022 14:44:30 +0000 Subject: [PATCH 05/36] [packit] 0.5.1 upstream release Upstream tag: 0.5.1 Upstream commit: a03b8972 Signed-off-by: Packit --- .gitignore | 1 + .packit.yaml | 99 ++++++++++++++++++++++++-------------------- README.packit | 2 +- python-specfile.spec | 7 +++- sources | 2 +- 5 files changed, 62 insertions(+), 49 deletions(-) diff --git a/.gitignore b/.gitignore index 39646ac..365d88a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /specfile-0.3.0.tar.gz /specfile-0.4.0.tar.gz /specfile-0.5.0.tar.gz +/specfile-0.5.1.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 8149965..08dca7a 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -37,25 +37,22 @@ srpm_build_deps: jobs: - job: propose_downstream trigger: release - metadata: - dist_git_branches: - - fedora-all + dist_git_branches: + - fedora-all - job: propose_downstream trigger: release specfile_path: epel/python-specfile.spec files_to_sync: - epel/python-specfile.spec - .packit.yaml - metadata: - dist_git_branches: - - epel-8 + dist_git_branches: + - epel-8 - job: copr_build trigger: pull_request identifier: fedora - metadata: - targets: - - fedora-all + targets: + - fedora-all - &copr_build_pr_epel job: copr_build trigger: pull_request @@ -66,58 +63,68 @@ jobs: - python3 setup.py sdist --dist-dir ./epel/ - bash -c "ls -1t ./epel/*.tar.gz | head -n 1" get-current-version: python3 setup.py --version - metadata: - targets: - - epel-8 + targets: + - epel-8 - job: copr_build trigger: commit - metadata: - branch: main - targets: - - fedora-all - project: packit-dev - list_on_homepage: True - preserve_project: True + branch: main + targets: + - fedora-all + project: packit-dev + list_on_homepage: True + preserve_project: True - <<: *copr_build_pr_epel trigger: commit - metadata: - branch: main - targets: - - epel-8 - project: packit-dev - list_on_homepage: True - preserve_project: True + branch: main + targets: + - epel-8 + project: packit-dev + list_on_homepage: True + preserve_project: True + + - job: copr_build + trigger: commit + branch: stable + targets: + - fedora-stable + project: packit-stable + list_on_homepage: True + preserve_project: True + - <<: *copr_build_pr_epel + trigger: commit + branch: stable + targets: + - epel-8 + project: packit-stable + list_on_homepage: True + preserve_project: True - job: copr_build trigger: release - metadata: - targets: - - fedora-all - project: packit-releases - list_on_homepage: True - preserve_project: True + targets: + - fedora-all + project: packit-releases + list_on_homepage: True + preserve_project: True - <<: *copr_build_pr_epel trigger: release - metadata: - targets: - - epel-8 - project: packit-releases - list_on_homepage: True - preserve_project: True + targets: + - epel-8 + project: packit-releases + list_on_homepage: True + preserve_project: True # downstream automation: - job: koji_build trigger: commit packit_instances: ["stg"] - metadata: - dist_git_branches: - - fedora-all - - epel-8 + dist_git_branches: + - fedora-all + - epel-8 - job: bodhi_update trigger: commit packit_instances: ["stg"] - metadata: - dist_git_branches: - - fedora-branched # rawhide updates are created automatically - - epel-8 + dist_git_branches: + - fedora-branched # rawhide updates are created automatically + - epel-8 diff --git a/README.packit b/README.packit index 30a712f..f7968c5 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.55.1.dev8+g432e38d. +The file was generated using packit 0.57.1.dev2+g0f9759f. diff --git a/python-specfile.spec b/python-specfile.spec index e1cef19..87e7ea0 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -5,7 +5,7 @@ in a minimal diff.} Name: python-specfile -Version: 0.5.0 +Version: 0.5.1 Release: 1%{?dist} Summary: A library for parsing and manipulating RPM spec files @@ -60,6 +60,11 @@ rm -rf specfile.egg-info %changelog +* Wed Aug 10 2022 Packit - 0.5.1-1 +- Added new `%conf` section (#74) +- Switched to rpm-py-installer (#75) +- Fixed detecting extended timestamp format in `%changelog` (#77, #81) + * Fri Jul 22 2022 Packit - 0.5.0-1 - Strict optional typing is now enforced (#68) - Fixed deduplication of tag names (#69) diff --git a/sources b/sources index 8d9da2f..1c6dd1d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.5.0.tar.gz) = e5472d1bfffc76acd781ee32fb79b4f2be9b46d3576fc5bf2d52e2edff3a2aa47563237bad1563c4c0f305a4aa1bbc59a515fa2153e6e37b01f1c7b216ad58e0 +SHA512 (specfile-0.5.1.tar.gz) = b5f2775e42be33afcd82911f427ff39d4fe305675becca5a4a489afb8dd119c029cb61cbce71203523b7f26d89e44fcff958031b713ce7fc18aab25ffa1755cf From ab94cc7d9a402f174ddae27f84fd98b335aa901a Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 25 Aug 2022 13:16:39 +0000 Subject: [PATCH 06/36] [packit] 0.6.0 upstream release Upstream tag: 0.6.0 Upstream commit: 8b0a6cc4 Signed-off-by: Packit --- .gitignore | 1 + .packit.yaml | 2 +- README.packit | 2 +- python-specfile.spec | 14 ++++++++++---- sources | 2 +- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 365d88a..eef0aeb 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /specfile-0.4.0.tar.gz /specfile-0.5.0.tar.gz /specfile-0.5.1.tar.gz +/specfile-0.6.0.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 08dca7a..84b1258 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -126,5 +126,5 @@ jobs: trigger: commit packit_instances: ["stg"] dist_git_branches: - - fedora-branched # rawhide updates are created automatically + - fedora-stable # rawhide and branched updates are created automatically - epel-8 diff --git a/README.packit b/README.packit index f7968c5..a131695 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.57.1.dev2+g0f9759f. +The file was generated using packit 0.58.1.dev6+gfae3705. diff --git a/python-specfile.spec b/python-specfile.spec index 87e7ea0..e41a8bf 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -5,7 +5,7 @@ in a minimal diff.} Name: python-specfile -Version: 0.5.1 +Version: 0.6.0 Release: 1%{?dist} Summary: A library for parsing and manipulating RPM spec files @@ -18,7 +18,7 @@ BuildArch: noarch BuildRequires: python%{python3_pkgversion}-devel BuildRequires: %{py3_dist setuptools setuptools-scm setuptools-scm-git-archive} -BuildRequires: %{py3_dist arrow importlib-metadata rpm typing-extensions} +BuildRequires: %{py3_dist importlib-metadata rpm typing-extensions} BuildRequires: %{py3_dist flexmock pytest} @@ -36,6 +36,8 @@ Summary: %{summary} %prep %autosetup -p1 -n specfile-%{version} +# Use packaged RPM python bindings downstream +sed -i 's/rpm-py-installer/rpm/' setup.cfg # Remove bundled egg-info rm -rf specfile.egg-info @@ -60,9 +62,13 @@ rm -rf specfile.egg-info %changelog +* Thu Aug 25 2022 Packit - 0.6.0-1 +- Switched to our own implementation of working with `%changelog` timestamps and removed dependency on arrow (#88) +- Fixed requires of EPEL 8 rpm (#86) + * Wed Aug 10 2022 Packit - 0.5.1-1 -- Added new `%conf` section (#74) -- Switched to rpm-py-installer (#75) +- Added new `%conf` section (#74) +- Switched to rpm-py-installer (#75) - Fixed detecting extended timestamp format in `%changelog` (#77, #81) * Fri Jul 22 2022 Packit - 0.5.0-1 diff --git a/sources b/sources index 1c6dd1d..4bbf891 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.5.1.tar.gz) = b5f2775e42be33afcd82911f427ff39d4fe305675becca5a4a489afb8dd119c029cb61cbce71203523b7f26d89e44fcff958031b713ce7fc18aab25ffa1755cf +SHA512 (specfile-0.6.0.tar.gz) = 8115bce63d8a2ab695f6a3db213f3e3d448581ed92c95f7f37dc671caf4760c03aa7b81e0031b8db8fc9b21984b4e2712c85d63951908bb112b4f6ec121d48bc From 83e96e1562ea54578c43634e5b94e54c793e4ce4 Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 7 Oct 2022 14:33:43 +0000 Subject: [PATCH 07/36] [packit] 0.7.0 upstream release Upstream tag: 0.7.0 Upstream commit: e121363b Signed-off-by: Packit --- .fmf/version | 1 + .gitignore | 1 + .packit.yaml | 46 +++++++++++++++++++++++++++++++----------- README.packit | 2 +- plans/full.fmf | 12 +++++++++++ plans/git_reference.py | 14 +++++++++++++ plans/main.fmf | 6 ++++++ plans/smoke.fmf | 4 ++++ python-specfile.spec | 8 ++++++-- sources | 2 +- 10 files changed, 80 insertions(+), 16 deletions(-) create mode 100644 .fmf/version create mode 100644 plans/full.fmf create mode 100644 plans/git_reference.py create mode 100644 plans/main.fmf create mode 100644 plans/smoke.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.gitignore b/.gitignore index eef0aeb..3a9163a 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /specfile-0.5.0.tar.gz /specfile-0.5.1.tar.gz /specfile-0.6.0.tar.gz +/specfile-0.7.0.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 84b1258..023784b 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -10,6 +10,10 @@ specfile_path: fedora/python-specfile.spec files_to_sync: - fedora/python-specfile.spec - .packit.yaml + - src: plans/ + dest: plans/ + - src: .fmf/ + dest: .fmf/ # name in upstream package repository or registry (e.g. in PyPI) upstream_package_name: specfile @@ -29,6 +33,9 @@ actions: - python3 setup.py sdist --dist-dir ./fedora/ - bash -c "ls -1t ./fedora/*.tar.gz | head -n 1" get-current-version: python3 setup.py --version + pre-sync: + # FMF has to be installed on system where you are calling this tool. + - python3 plans/git_reference.py srpm_build_deps: - python3-pip # "python3 setup.py --version" needs it @@ -39,30 +46,39 @@ jobs: trigger: release dist_git_branches: - fedora-all + - epel-9 - job: propose_downstream trigger: release - specfile_path: epel/python-specfile.spec + specfile_path: epel8/python-specfile.spec files_to_sync: - - epel/python-specfile.spec + - epel8/python-specfile.spec - .packit.yaml + - src: plans/ + dest: plans/ + - src: .fmf/ + dest: .fmf/ dist_git_branches: - epel-8 - job: copr_build trigger: pull_request - identifier: fedora + identifier: fedora-and-epel targets: - fedora-all - - &copr_build_pr_epel + - epel-9 + - &copr_build_pr_epel8 job: copr_build trigger: pull_request - specfile_path: epel/python-specfile.spec - identifier: epel + specfile_path: epel8/python-specfile.spec + identifier: epel8 actions: create-archive: - - python3 setup.py sdist --dist-dir ./epel/ - - bash -c "ls -1t ./epel/*.tar.gz | head -n 1" + - python3 setup.py sdist --dist-dir ./epel8/ + - bash -c "ls -1t ./epel8/*.tar.gz | head -n 1" get-current-version: python3 setup.py --version + pre-sync: + # FMF has to be installed on system where you are calling this tool. + - python3 plans/git_reference.py targets: - epel-8 @@ -71,10 +87,11 @@ jobs: branch: main targets: - fedora-all + - epel-9 project: packit-dev list_on_homepage: True preserve_project: True - - <<: *copr_build_pr_epel + - <<: *copr_build_pr_epel8 trigger: commit branch: main targets: @@ -88,10 +105,11 @@ jobs: branch: stable targets: - fedora-stable + - epel-9 project: packit-stable list_on_homepage: True preserve_project: True - - <<: *copr_build_pr_epel + - <<: *copr_build_pr_epel8 trigger: commit branch: stable targets: @@ -104,10 +122,11 @@ jobs: trigger: release targets: - fedora-all + - epel-9 project: packit-releases list_on_homepage: True preserve_project: True - - <<: *copr_build_pr_epel + - <<: *copr_build_pr_epel8 trigger: release targets: - epel-8 @@ -119,12 +138,15 @@ jobs: - job: koji_build trigger: commit packit_instances: ["stg"] + allowed_pr_authors: ["packit-stg", "packit"] dist_git_branches: - fedora-all + - epel-9 - epel-8 - job: bodhi_update trigger: commit packit_instances: ["stg"] dist_git_branches: - - fedora-stable # rawhide and branched updates are created automatically + - fedora-branched # rawhide updates are created automatically + - epel-9 - epel-8 diff --git a/README.packit b/README.packit index a131695..a723bcb 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.58.1.dev6+gfae3705. +The file was generated using packit 0.59.2.dev19+gc1f0788. diff --git a/plans/full.fmf b/plans/full.fmf new file mode 100644 index 0000000..0b0a12f --- /dev/null +++ b/plans/full.fmf @@ -0,0 +1,12 @@ +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/git_reference.py b/plans/git_reference.py new file mode 100644 index 0000000..29b8721 --- /dev/null +++ b/plans/git_reference.py @@ -0,0 +1,14 @@ +#!/usr/bin/python + +import subprocess +from pathlib import Path + +import fmf + +tree_root = Path.cwd().absolute() +node = fmf.Tree(tree_root).find("/plans") +with node as data: + data["discover"]["url"] = "https://github.com/packit/specfile.git" + data["discover"]["ref"] = ( + subprocess.check_output(["git", "rev-parse", "HEAD"]).decode().strip() + ) diff --git a/plans/main.fmf b/plans/main.fmf new file mode 100644 index 0000000..d2feac5 --- /dev/null +++ b/plans/main.fmf @@ -0,0 +1,6 @@ +discover: + how: fmf + url: https://github.com/packit/specfile.git + ref: e121363bba69e8fcc49eac8df4d6ef60ef1acf69 +execute: + how: tmt diff --git a/plans/smoke.fmf b/plans/smoke.fmf new file mode 100644 index 0000000..578e8ba --- /dev/null +++ b/plans/smoke.fmf @@ -0,0 +1,4 @@ +summary: + Basic smoke test +discover+: + filter: tier:0 diff --git a/python-specfile.spec b/python-specfile.spec index e41a8bf..f7187eb 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -5,7 +5,7 @@ in a minimal diff.} Name: python-specfile -Version: 0.6.0 +Version: 0.7.0 Release: 1%{?dist} Summary: A library for parsing and manipulating RPM spec files @@ -62,8 +62,12 @@ rm -rf specfile.egg-info %changelog +* Fri Oct 07 2022 Packit - 0.7.0-1 +- It is now possible to filter changelog entries by specifying lower bound EVR, upper bound EVR or both. (#104) +- Added support for filenames specified in source URL fragments, for example: `https://example.com/foo/1.0/download.cgi#/%{name}-%{version}.tar.gz` (#100) + * Thu Aug 25 2022 Packit - 0.6.0-1 -- Switched to our own implementation of working with `%changelog` timestamps and removed dependency on arrow (#88) +- Switched to our own implementation of working with `%changelog` timestamps and removed dependency on arrow (#88) - Fixed requires of EPEL 8 rpm (#86) * Wed Aug 10 2022 Packit - 0.5.1-1 diff --git a/sources b/sources index 4bbf891..3f9e35d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.6.0.tar.gz) = 8115bce63d8a2ab695f6a3db213f3e3d448581ed92c95f7f37dc671caf4760c03aa7b81e0031b8db8fc9b21984b4e2712c85d63951908bb112b4f6ec121d48bc +SHA512 (specfile-0.7.0.tar.gz) = f07a99ea5f999cfd6b6f88c454381de1c0934a10c88c3359c53a85ea84ede235f1c1ce82ba0c8283354e59905bafbe96032a5fdf16aafceed081f94747a469d6 From 28abf74e052642c73755ef90e6067f922944e9c9 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 31 Jul 2023 13:17:33 +0000 Subject: [PATCH 08/36] [packit] 0.20.2 upstream release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream tag: 0.20.2 Upstream commit: 4486a88c 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/rpms/python-specfile.git refs/heads/*:refs/remotes/packit/* git checkout packit/0.20.2-epel8-update-propose_downstream ``` --- .gitignore | 1 + .packit.yaml | 157 ++++++++++++++++++++--------------- README.packit | 2 +- plans/git_reference.py | 19 ++++- plans/main.fmf | 2 +- plans/packit-integration.fmf | 27 ++++++ python-specfile.spec | 10 ++- sources | 2 +- 8 files changed, 145 insertions(+), 75 deletions(-) create mode 100644 plans/packit-integration.fmf diff --git a/.gitignore b/.gitignore index 3a9163a..508d2d4 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /specfile-0.5.1.tar.gz /specfile-0.6.0.tar.gz /specfile-0.7.0.tar.gz +/specfile-0.20.2.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 023784b..3ae2f09 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -1,99 +1,82 @@ --- -# We want to use both instances for all upstream jobs including the `propose-downstream` one. -# For downstream, we need to pick just one instance (`stg` in our case) -# and redefine it for the `koji_build` and `bodhi_update` jobs. packit_instances: ["prod", "stg"] -specfile_path: fedora/python-specfile.spec - -# add or remove files that should be synced -files_to_sync: - - fedora/python-specfile.spec - - .packit.yaml - - src: plans/ - dest: plans/ - - src: .fmf/ - dest: .fmf/ - -# name in upstream package repository or registry (e.g. in PyPI) -upstream_package_name: specfile -# downstream (Fedora) RPM package name -downstream_package_name: python-specfile - -copy_upstream_release_description: true - upstream_project_url: https://github.com/packit/specfile issue_repository: https://github.com/packit/specfile -actions: - # we need this b/c `git archive` doesn't put all the metadata in the tarball: - # LookupError: setuptools-scm was unable to detect version for '/builddir/build/BUILD/ogr-0.11.1'. - # Make sure you're either building from a fully intact git repository or PyPI tarballs. - create-archive: - - python3 setup.py sdist --dist-dir ./fedora/ - - bash -c "ls -1t ./fedora/*.tar.gz | head -n 1" - get-current-version: python3 setup.py --version - pre-sync: - # FMF has to be installed on system where you are calling this tool. - - python3 plans/git_reference.py +copy_upstream_release_description: true -srpm_build_deps: - - python3-pip # "python3 setup.py --version" needs it - - python3-setuptools_scm - -jobs: - - job: propose_downstream - trigger: release - dist_git_branches: - - fedora-all - - epel-9 - - job: propose_downstream - trigger: release - specfile_path: epel8/python-specfile.spec +packages: + specfile: + upstream_package_name: specfile + downstream_package_name: python-specfile + specfile_path: &specfile_path fedora/python-specfile.spec files_to_sync: - - epel8/python-specfile.spec + - *specfile_path - .packit.yaml - src: plans/ dest: plans/ - src: .fmf/ dest: .fmf/ - dist_git_branches: - - epel-8 - - - job: copr_build - trigger: pull_request - identifier: fedora-and-epel - targets: - - fedora-all - - epel-9 - - &copr_build_pr_epel8 - job: copr_build - trigger: pull_request - specfile_path: epel8/python-specfile.spec - identifier: epel8 + srpm_build_deps: + - python3-build + - python3-setuptools_scm actions: + pre-sync: + - python3 plans/git_reference.py + create-archive: + - python3 -m build --sdist --outdir ./fedora/ + - bash -c "ls -1t ./fedora/*.tar.gz | head -n 1" + get-current-version: python3 -m setuptools_scm + + specfile-epel8: + upstream_package_name: specfile + downstream_package_name: python-specfile + specfile_path: &specfile_path_epel8 epel8/python-specfile.spec + files_to_sync: + - *specfile_path_epel8 + - .packit.yaml + - src: plans/ + dest: plans/ + - src: .fmf/ + dest: .fmf/ + srpm_build_deps: + - python3-setuptools_scm + actions: + pre-sync: + - python3 plans/git_reference.py create-archive: - python3 setup.py sdist --dist-dir ./epel8/ - bash -c "ls -1t ./epel8/*.tar.gz | head -n 1" get-current-version: python3 setup.py --version - pre-sync: - # FMF has to be installed on system where you are calling this tool. - - python3 plans/git_reference.py + +jobs: + - job: copr_build + trigger: pull_request + packages: [specfile] + targets: + - fedora-all + - epel-9 + - job: copr_build + trigger: pull_request + packages: [specfile-epel8] targets: - epel-8 - job: copr_build trigger: commit branch: main + packages: [specfile] targets: - fedora-all - epel-9 project: packit-dev list_on_homepage: True preserve_project: True - - <<: *copr_build_pr_epel8 + - job: copr_build trigger: commit branch: main + packages: [specfile-epel8] targets: - epel-8 project: packit-dev @@ -103,15 +86,17 @@ jobs: - job: copr_build trigger: commit branch: stable + packages: [specfile] targets: - fedora-stable - epel-9 project: packit-stable list_on_homepage: True preserve_project: True - - <<: *copr_build_pr_epel8 + - job: copr_build trigger: commit branch: stable + packages: [specfile-epel8] targets: - epel-8 project: packit-stable @@ -120,21 +105,58 @@ jobs: - job: copr_build trigger: release + packages: [specfile] targets: - fedora-all - epel-9 project: packit-releases list_on_homepage: True preserve_project: True - - <<: *copr_build_pr_epel8 + - job: copr_build trigger: release + packages: [specfile-epel8] targets: - epel-8 project: packit-releases list_on_homepage: True preserve_project: True - # downstream automation: + - job: tests + trigger: pull_request + packages: [specfile] + targets: + - fedora-all + - epel-9 + - job: tests + trigger: pull_request + packages: [specfile-epel8] + targets: + - epel-8 + + - job: propose_downstream + trigger: release + packages: [specfile] + dist_git_branches: + - fedora-all + - epel-9 + - job: propose_downstream + trigger: release + packages: [specfile-epel8] + dist_git_branches: + - epel-8 + + - job: pull_from_upstream + trigger: release + packages: [specfile] + dist_git_branches: + - fedora-all + - epel-9 + - job: pull_from_upstream + trigger: release + packages: [specfile-epel8] + dist_git_branches: + - epel-8 + - job: koji_build trigger: commit packit_instances: ["stg"] @@ -143,6 +165,7 @@ jobs: - fedora-all - epel-9 - epel-8 + - job: bodhi_update trigger: commit packit_instances: ["stg"] diff --git a/README.packit b/README.packit index a723bcb..9d6cbbc 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.59.2.dev19+gc1f0788. +The file was generated using packit 0.78.1. diff --git a/plans/git_reference.py b/plans/git_reference.py index 29b8721..6517cfe 100644 --- a/plans/git_reference.py +++ b/plans/git_reference.py @@ -5,10 +5,25 @@ from pathlib import Path import fmf +# Set discover of specfile tests to a fixed commit tree_root = Path.cwd().absolute() -node = fmf.Tree(tree_root).find("/plans") -with node as data: +tree = fmf.Tree(tree_root) +main_node = tree.find("/plans") +with main_node as data: data["discover"]["url"] = "https://github.com/packit/specfile.git" data["discover"]["ref"] = ( subprocess.check_output(["git", "rev-parse", "HEAD"]).decode().strip() ) + + +# Set discover of packit integration tests to the current main +packit_node = tree.find("/plans/packit-integration") +with packit_node as data: + data["discover"]["ref"] = ( + subprocess.check_output( + ["git", "ls-remote", "https://github.com/packit/packit", "main"] + ) + .decode() + .strip() + .split()[0] + ) diff --git a/plans/main.fmf b/plans/main.fmf index d2feac5..7686ac7 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: e121363bba69e8fcc49eac8df4d6ef60ef1acf69 + ref: 4486a88c56fdfdea0c8b1e16f32a76056e9faba3 execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf new file mode 100644 index 0000000..48ba7dd --- /dev/null +++ b/plans/packit-integration.fmf @@ -0,0 +1,27 @@ +discover: + how: fmf + url: https://github.com/packit/packit + filter: tier:0 | tier:1 + ref: 4b998555d18e3e7abfb7a521b3b65a34de02dc76 +prepare: + - how: install + copr: packit/packit-dev + - how: shell + script: dnf -y config-manager --save --setopt="*:packit:packit-dev.priority=5" +adjust: + - when: how == integration + because: provide latest python-specfile rpm when running locally + prepare+: + - name: python3-specfile rpm + 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' + prepare+: + - how: install + package: python3-pip + - how: shell + script: pip3 install flexmock 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 f7187eb..8380848 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -5,7 +5,7 @@ in a minimal diff.} Name: python-specfile -Version: 0.7.0 +Version: 0.20.2 Release: 1%{?dist} Summary: A library for parsing and manipulating RPM spec files @@ -18,8 +18,9 @@ BuildArch: noarch BuildRequires: python%{python3_pkgversion}-devel BuildRequires: %{py3_dist setuptools setuptools-scm setuptools-scm-git-archive} -BuildRequires: %{py3_dist importlib-metadata rpm typing-extensions} +BuildRequires: %{py3_dist importlib-metadata dataclasses rpm typing-extensions} BuildRequires: %{py3_dist flexmock pytest} +BuildRequires: git-core %description @@ -62,8 +63,11 @@ rm -rf specfile.egg-info %changelog +* Mon Jul 31 2023 Packit - 0.20.2-1 +- Fixed Packit config to work properly with `propose-downstream` and `pull-from-upstream` jobs. (#261) + * Fri Oct 07 2022 Packit - 0.7.0-1 -- It is now possible to filter changelog entries by specifying lower bound EVR, upper bound EVR or both. (#104) +- It is now possible to filter changelog entries by specifying lower bound EVR, upper bound EVR or both. (#104) - Added support for filenames specified in source URL fragments, for example: `https://example.com/foo/1.0/download.cgi#/%{name}-%{version}.tar.gz` (#100) * Thu Aug 25 2022 Packit - 0.6.0-1 diff --git a/sources b/sources index 3f9e35d..636f4d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.7.0.tar.gz) = f07a99ea5f999cfd6b6f88c454381de1c0934a10c88c3359c53a85ea84ede235f1c1ce82ba0c8283354e59905bafbe96032a5fdf16aafceed081f94747a469d6 +SHA512 (specfile-0.20.2.tar.gz) = 754a9108589822a17dce79f022c3c2edd5ae86fc3894b874afe6761f18275f7b567af8f953adc474cfe24e67672cae61df26429a5d8a087d6aff8b396f891183 From fb84ce5e6c79c39e11bee718dd826174d963e776 Mon Sep 17 00:00:00 2001 From: Matej Focko Date: Fri, 11 Aug 2023 14:26:00 +0200 Subject: [PATCH 09/36] 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 2fccea07ffc16c74c35ef1bcc074e973876d21e7 Mon Sep 17 00:00:00 2001 From: Matej Focko Date: Fri, 11 Aug 2023 14:44:30 +0200 Subject: [PATCH 10/36] 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 ef25d82ff9829c40c2921e27670400926990c64b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Fri, 11 Aug 2023 15:29:34 +0200 Subject: [PATCH 11/36] [packit] 0.21.0 upstream release Upstream tag: 0.21.0 Upstream commit: 56360c0a --- .gitignore | 1 + .packit.yaml | 6 ++---- README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- python-specfile.spec | 6 +++++- sources | 2 +- 7 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 508d2d4..73f6a60 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /specfile-0.6.0.tar.gz /specfile-0.7.0.tar.gz /specfile-0.20.2.tar.gz +/specfile-0.21.0.tar.gz 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 8380848..a5f6c2d 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -5,7 +5,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 @@ -63,6 +63,10 @@ rm -rf specfile.egg-info %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 ea0fc83faf150bc6fce61e4b66489fbcc1655464 Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 6 Oct 2023 13:10:16 +0000 Subject: [PATCH 12/36] [packit] 0.22.1 upstream release Upstream tag: 0.22.1 Upstream commit: 0af08c92 --- .gitignore | 1 + .packit.yaml | 10 ++++++++++ README.packit | 2 +- plans/full.fmf | 8 -------- plans/main.fmf | 2 +- plans/packit-integration.fmf | 6 +++--- plans/performance.fmf | 11 +++++++++++ python-specfile.spec | 11 ++++++----- sources | 2 +- 9 files changed, 34 insertions(+), 19 deletions(-) create mode 100644 plans/performance.fmf diff --git a/.gitignore b/.gitignore index 73f6a60..cb2aca8 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /specfile-0.7.0.tar.gz /specfile-0.20.2.tar.gz /specfile-0.21.0.tar.gz +/specfile-0.22.1.tar.gz 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..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.69.0.post78+g1d260fb.d20230418. +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 87402eb..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: 56360c0a80b102065e71ccee587b155dfc83317e + ref: 0af08c92db46a042cff83d7e4647be398dba843e execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index f901d66..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: 804c96beeb46dbb0ef209e545bd46735809628a0 + 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 + 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/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 a5f6c2d..259d73e 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -5,7 +5,7 @@ in a minimal diff.} Name: python-specfile -Version: 0.21.0 +Version: 0.22.1 Release: 1%{?dist} Summary: A library for parsing and manipulating RPM spec files @@ -17,7 +17,7 @@ Source0: %{pypi_source specfile} BuildArch: noarch BuildRequires: python%{python3_pkgversion}-devel -BuildRequires: %{py3_dist setuptools setuptools-scm setuptools-scm-git-archive} +BuildRequires: %{py3_dist setuptools setuptools-scm} BuildRequires: %{py3_dist importlib-metadata dataclasses rpm typing-extensions} BuildRequires: %{py3_dist flexmock pytest} BuildRequires: git-core @@ -37,8 +37,6 @@ Summary: %{summary} %prep %autosetup -p1 -n specfile-%{version} -# Use packaged RPM python bindings downstream -sed -i 's/rpm-py-installer/rpm/' setup.cfg # Remove bundled egg-info rm -rf specfile.egg-info @@ -52,7 +50,7 @@ rm -rf specfile.egg-info %check -%pytest +%pytest --verbose tests/unit tests/integration %files -n python%{python3_pkgversion}-specfile @@ -63,6 +61,9 @@ rm -rf specfile.egg-info %changelog +* Fri Oct 06 2023 Packit - 0.22.1-1 +- Removed dependency on setuptools-scm-git-archive. (#290) + * 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..9b9a431 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.21.0.tar.gz) = 9860109203c69a586ce3759c983c550ae150aaed9744cf7db740c9bce2e11e5192b0153f923f584d8f8b526d61dca08b308519913c7aa5587e7a09e92487426a +SHA512 (specfile-0.22.1.tar.gz) = 5ca758b923e121ce37003967b538d97e72fca607e63e500a4126da960d210e1ebd897faa0cd446f7f346caab6eca4d899c6190e5c20322047374ca677e925458 From 19f7f156e37ffbfa174eb0312b0fcc2b21963224 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 30 Oct 2023 09:16:20 +0000 Subject: [PATCH 13/36] [packit] 0.23.0 upstream release Upstream tag: 0.23.0 Upstream commit: 0e110df4 --- .gitignore | 1 + README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- python-specfile.spec | 5 ++++- sources | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index cb2aca8..1bddf23 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /specfile-0.20.2.tar.gz /specfile-0.21.0.tar.gz /specfile-0.22.1.tar.gz +/specfile-0.23.0.tar.gz 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 259d73e..6ab7a44 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -5,7 +5,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 @@ -61,6 +61,9 @@ rm -rf specfile.egg-info %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 f4001f1694f7c99a34b31820b61c545a2c4b7e3d Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 6 Nov 2023 17:20:30 +0000 Subject: [PATCH 14/36] [packit] 0.24.0 upstream release Upstream tag: 0.24.0 Upstream commit: 2efbd9ce --- .gitignore | 1 + README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- python-specfile.spec | 6 +++++- sources | 2 +- 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 1bddf23..28fdeb8 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /specfile-0.21.0.tar.gz /specfile-0.22.1.tar.gz /specfile-0.23.0.tar.gz +/specfile-0.24.0.tar.gz 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 6ab7a44..20f1e4d 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -5,7 +5,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 @@ -61,6 +61,10 @@ rm -rf specfile.egg-info %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 e39cf146f072b7b379b716e587eb5c7c2b8d74a0 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 20 Nov 2023 14:58:35 +0000 Subject: [PATCH 15/36] [packit] 0.25.0 upstream release Upstream tag: 0.25.0 Upstream commit: 78f50b4a --- .gitignore | 1 + .packit.yaml | 4 ++++ README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- python-specfile.spec | 16 +++++++++++++--- sources | 2 +- 7 files changed, 22 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 28fdeb8..0372ffe 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /specfile-0.22.1.tar.gz /specfile-0.23.0.tar.gz /specfile-0.24.0.tar.gz +/specfile-0.25.0.tar.gz 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 20f1e4d..814cd8c 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -4,15 +4,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 @@ -36,7 +43,7 @@ Summary: %{summary} %prep -%autosetup -p1 -n specfile-%{version} +%autosetup -p1 -n specfile-%{pypi_version} # Remove bundled egg-info rm -rf specfile.egg-info @@ -61,6 +68,9 @@ rm -rf specfile.egg-info %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 cb0e0cd234d44c476f14a7b437b1d55ac287eb54 Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 19 Jan 2024 13:28:11 +0000 Subject: [PATCH 16/36] [packit] 0.27.0 upstream release Upstream tag: 0.27.0 Upstream commit: 1789f9c6 --- .gitignore | 1 + .packit.yaml | 4 ++-- README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- python-specfile.spec | 7 +++++-- sources | 2 +- 7 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 0372ffe..08e6375 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /specfile-0.23.0.tar.gz /specfile-0.24.0.tar.gz /specfile-0.25.0.tar.gz +/specfile-0.27.0.tar.gz 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 814cd8c..c0609e0 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -4,8 +4,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} @@ -68,6 +68,9 @@ rm -rf specfile.egg-info %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 d6d6aa1ca1b44fb12bc6b512b65396aeeec61801 Mon Sep 17 00:00:00 2001 From: Packit Date: Sun, 17 Mar 2024 15:11:13 +0000 Subject: [PATCH 17/36] [packit] 0.28.0 upstream release Upstream tag: 0.28.0 Upstream commit: cdf06f20 --- .gitignore | 1 + README.packit | 2 +- plans/git_reference.py | 3 +++ plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- python-specfile.spec | 5 ++++- sources | 2 +- 7 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 08e6375..ab93e9c 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /specfile-0.24.0.tar.gz /specfile-0.25.0.tar.gz /specfile-0.27.0.tar.gz +/specfile-0.28.0.tar.gz 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 c0609e0..3408d05 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -4,7 +4,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}} @@ -68,6 +68,9 @@ rm -rf specfile.egg-info %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 9220d7b4a3c78670d816d8e02dc270b333826d2c Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 23 May 2024 11:20:19 +0000 Subject: [PATCH 18/36] Update to 0.28.3 upstream release Upstream tag: 0.28.3 Upstream commit: 557c33bd Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 1 + README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 4 ++-- plans/performance.fmf | 4 ++++ python-specfile.spec | 6 +++++- sources | 2 +- 8 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index ab93e9c..7e8df23 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /specfile-0.25.0.tar.gz /specfile-0.27.0.tar.gz /specfile-0.28.0.tar.gz +/specfile-0.28.3.tar.gz 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..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.93.0.post1.dev5+g0048024e. +The file was generated using packit 0.96.0.post1.dev4+gc5b1ea8e. diff --git a/plans/main.fmf b/plans/main.fmf index 1289312..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: cdf06f20715f661b1a5f478320eee2b48c2ba287 + ref: 557c33bd44a115145f9c7593e0c0b42fc5b8c9b4 execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index e0e9738..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: 0048024ec6564008a703140254c4394158b6ed67 + 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/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 3408d05..af26eac 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -4,7 +4,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.3 #global prerelease rc1 %global package_version %{base_version}%{?prerelease:~%{prerelease}} @@ -68,6 +68,10 @@ rm -rf specfile.egg-info %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) + * 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..b61a097 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.28.0.tar.gz) = 1f2ab8e5cf492aec1e9b11583d88ae3de1fc9d9512d5a5c289b5d83d54c69eeb6d410971997328d1de3f82cd411b7d10cf7982de44084ede9745b87db7c0d9b8 +SHA512 (specfile-0.28.3.tar.gz) = 552de9dc819ce1f2eb78419511ad547c717acc4fb0aad4ec451cec986c30ee3aaec4fab5f2bf33d7558d67c04879afa35270768d0f52f87909909cb8d83773e2 From 29e5998725ae2bafe19696a4a40014ba8cd42a9b Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 6 Jun 2024 13:57:24 +0000 Subject: [PATCH 19/36] Update to 0.29.0 upstream release Upstream tag: 0.29.0 Upstream commit: 0ba5f9ff Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- python-specfile.spec | 5 ++++- sources | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 7e8df23..24fe25c 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /specfile-0.27.0.tar.gz /specfile-0.28.0.tar.gz /specfile-0.28.3.tar.gz +/specfile-0.29.0.tar.gz 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 af26eac..7eb0226 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -4,7 +4,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}} @@ -68,6 +68,9 @@ rm -rf specfile.egg-info %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 0784e702fe7b0555c4ae4ae94ad180ea9b6c53a4 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 26 Jun 2024 12:23:26 +0000 Subject: [PATCH 20/36] Update to 0.30.0 upstream release Upstream tag: 0.30.0 Upstream commit: 85a0b40d Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .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 +- 9 files changed, 33 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 24fe25c..123a166 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /specfile-0.28.0.tar.gz /specfile-0.28.3.tar.gz /specfile-0.29.0.tar.gz +/specfile-0.30.0.tar.gz 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 7eb0226..1781807 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -4,7 +4,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}} @@ -68,6 +68,9 @@ rm -rf specfile.egg-info %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 f265b34054334d41a21913dc7e5900c5952aa913 Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 9 Jul 2024 10:26:28 +0000 Subject: [PATCH 21/36] 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/) --- .gitignore | 1 + README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- python-specfile.spec | 7 ++++++- sources | 2 +- 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 123a166..e8ed3ab 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /specfile-0.28.3.tar.gz /specfile-0.29.0.tar.gz /specfile-0.30.0.tar.gz +/specfile-0.31.0.tar.gz 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 1781807..b2b5a2f 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -4,7 +4,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}} @@ -68,6 +68,11 @@ rm -rf specfile.egg-info %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 d297978483f66b0ec11f9604f77093d08d466ec7 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 22 Jul 2024 07:12:44 +0000 Subject: [PATCH 22/36] Update to 0.32.0 upstream release Upstream tag: 0.32.0 Upstream commit: 122eefa5 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- python-specfile.spec | 5 ++++- sources | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e8ed3ab..2e54358 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /specfile-0.29.0.tar.gz /specfile-0.30.0.tar.gz /specfile-0.31.0.tar.gz +/specfile-0.32.0.tar.gz 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 b2b5a2f..9be5583 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -4,7 +4,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}} @@ -68,6 +68,9 @@ rm -rf specfile.egg-info %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 e7dfbaab7ca1c1bd7d8602a9ea509e981740bf48 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 29 Jul 2024 15:25:45 +0000 Subject: [PATCH 23/36] Update to 0.32.1 upstream release Upstream tag: 0.32.1 Upstream commit: 8aac26db Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 13 ++++++++++--- README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- python-specfile.spec | 5 ++++- sources | 2 +- 7 files changed, 19 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 2e54358..bae6f1d 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /specfile-0.30.0.tar.gz /specfile-0.31.0.tar.gz /specfile-0.32.0.tar.gz +/specfile-0.32.1.tar.gz 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 9be5583..c98d7a2 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -4,7 +4,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}} @@ -68,6 +68,9 @@ rm -rf specfile.egg-info %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 658fc921d06847f116e2e5a8ff0b79a3e27465da Mon Sep 17 00:00:00 2001 From: Packit Date: Sun, 15 Sep 2024 20:57:49 +0000 Subject: [PATCH 24/36] Update to 0.32.2 upstream release Upstream tag: 0.32.2 Upstream commit: 514fbded Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 4 ++-- python-specfile.spec | 5 ++++- sources | 2 +- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index bae6f1d..3fbc5e3 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /specfile-0.31.0.tar.gz /specfile-0.32.0.tar.gz /specfile-0.32.1.tar.gz +/specfile-0.32.2.tar.gz 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 c98d7a2..d52d62d 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -4,7 +4,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}} @@ -68,6 +68,9 @@ rm -rf specfile.egg-info %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 From 15f58357847e5f86c6ad6bcaf3b3df97873386e7 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 30 Sep 2024 09:52:29 +0000 Subject: [PATCH 25/36] Update to 0.32.3 upstream release - Resolves: rhbz#2299289 Upstream tag: 0.32.3 Upstream commit: c2be0297 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 12 ++++++++---- README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- python-specfile.spec | 6 +++++- sources | 2 +- 7 files changed, 18 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 3fbc5e3..e1db487 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /specfile-0.32.0.tar.gz /specfile-0.32.1.tar.gz /specfile-0.32.2.tar.gz +/specfile-0.32.3.tar.gz diff --git a/.packit.yaml b/.packit.yaml index f8b3fc0..837931a 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -162,8 +162,10 @@ jobs: trigger: release packages: [specfile] dist_git_branches: - - fedora-all - - epel-9 + rawhide: + fast_forward_merge_into: + - fedora-branched + epel-9: {} - job: propose_downstream trigger: release packages: [specfile-epel8] @@ -174,8 +176,10 @@ jobs: trigger: release packages: [specfile] dist_git_branches: - - fedora-all - - epel-9 + rawhide: + fast_forward_merge_into: + - fedora-branched + epel-9: {} - job: pull_from_upstream trigger: release packages: [specfile-epel8] diff --git a/README.packit b/README.packit index a034733..766e300 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.101.0.post1.dev2+g30f91eab. +The file was generated using packit 0.101.1.post1.dev8+ge78e9e3b. diff --git a/plans/main.fmf b/plans/main.fmf index c40df35..18a1875 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: 514fbded1f45a665c4a674367719e8811da87659 + ref: c2be0297846663b32c7e2852d28b1f0a51828ed4 execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index b427e6f..39b5234 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: 8d2ad651fc392fe20a3306210e6278dc3db02e9c + ref: e78e9e3b33fb65157c4884deccf42de22dfc4783 prepare: - how: install copr: packit/packit-dev diff --git a/python-specfile.spec b/python-specfile.spec index d52d62d..24779ca 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -4,7 +4,7 @@ Main focus is on modifying existing spec files, any change should result in a minimal diff.} -%global base_version 0.32.2 +%global base_version 0.32.3 #global prerelease rc1 %global package_version %{base_version}%{?prerelease:~%{prerelease}} @@ -68,6 +68,10 @@ rm -rf specfile.egg-info %changelog +* Mon Sep 30 2024 Packit - 0.32.3-1 +- specfile can now handle multi-line tag values (enclosed in a macro body, e.g. `%%shrink`). (#412) +- Resolves: rhbz#2299289 + * 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) diff --git a/sources b/sources index 28f0009..dee7711 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.32.2.tar.gz) = 7e3777f6019e0927114a4f5ebeb3c3142b973f663cc4a60caa4a25191c1c5aa21de6ec91eb5d47077a2f63b67476168ab6bf34dda125e97c3b65d4b662e6ed51 +SHA512 (specfile-0.32.3.tar.gz) = fe5ef1e9d55e52483e26f844d851d86a0879ff04b37cffe9ad7b0945a2d9798b1d77c05055db78bd008b73eba9c572ecfd367937428a9181ebce8b962b0dbacc From 2cbf320d4515330a7369db5ee472d6b7b56b6937 Mon Sep 17 00:00:00 2001 From: Packit Date: Sat, 26 Oct 2024 21:34:10 +0000 Subject: [PATCH 26/36] Update to 0.32.5 upstream release Upstream tag: 0.32.5 Upstream commit: c38cfaad Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- python-specfile.spec | 5 ++++- sources | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e1db487..729b20b 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /specfile-0.32.1.tar.gz /specfile-0.32.2.tar.gz /specfile-0.32.3.tar.gz +/specfile-0.32.5.tar.gz diff --git a/README.packit b/README.packit index 766e300..2bd3f40 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.101.1.post1.dev8+ge78e9e3b. +The file was generated using packit 0.102.1.post1.dev6+g64f7460b. diff --git a/plans/main.fmf b/plans/main.fmf index 18a1875..1e33fb1 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: c2be0297846663b32c7e2852d28b1f0a51828ed4 + ref: c38cfaad3a78fb216fb13d7703c23966510d86be execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index 39b5234..183cad5 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: e78e9e3b33fb65157c4884deccf42de22dfc4783 + ref: bdca14cbde9fef88ccbd67f96b53a0d7073e66df prepare: - how: install copr: packit/packit-dev diff --git a/python-specfile.spec b/python-specfile.spec index 24779ca..83725a9 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -4,7 +4,7 @@ Main focus is on modifying existing spec files, any change should result in a minimal diff.} -%global base_version 0.32.3 +%global base_version 0.32.5 #global prerelease rc1 %global package_version %{base_version}%{?prerelease:~%{prerelease}} @@ -68,6 +68,9 @@ rm -rf specfile.egg-info %changelog +* Sat Oct 26 2024 Packit - 0.32.5-1 +- We have fixed our parser to take in account the deprecations introduced in Python 3.8 (#420) + * Mon Sep 30 2024 Packit - 0.32.3-1 - specfile can now handle multi-line tag values (enclosed in a macro body, e.g. `%%shrink`). (#412) - Resolves: rhbz#2299289 diff --git a/sources b/sources index dee7711..8fff571 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.32.3.tar.gz) = fe5ef1e9d55e52483e26f844d851d86a0879ff04b37cffe9ad7b0945a2d9798b1d77c05055db78bd008b73eba9c572ecfd367937428a9181ebce8b962b0dbacc +SHA512 (specfile-0.32.5.tar.gz) = de642952d093034f10ef8d2f9aed0486c6f057a1c182961017de127f6d9ff18e7d1d090b7f5ade844fc1419a1c0d7bc46fdcf038b6a1b5e206751fbb34a7b359 From 2a5b426ef46cafac4c0d73b17ba3552052ec1a5b Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 14 Nov 2024 12:16:54 +0000 Subject: [PATCH 27/36] Update to 0.32.6 upstream release - Resolves: rhbz#2318011 Upstream tag: 0.32.6 Upstream commit: 442e2a97 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- python-specfile.spec | 6 +++++- sources | 2 +- 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 729b20b..4bf5a2c 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /specfile-0.32.2.tar.gz /specfile-0.32.3.tar.gz /specfile-0.32.5.tar.gz +/specfile-0.32.6.tar.gz diff --git a/README.packit b/README.packit index 2bd3f40..c18262a 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.102.1.post1.dev6+g64f7460b. +The file was generated using packit 0.103.0. diff --git a/plans/main.fmf b/plans/main.fmf index 1e33fb1..b18cd78 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: c38cfaad3a78fb216fb13d7703c23966510d86be + ref: 442e2a976fc608a33e6e4a970e3420ce9aafc8ac execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index 183cad5..a6b2670 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: bdca14cbde9fef88ccbd67f96b53a0d7073e66df + ref: 30e2fb5839ded7dd901fd2852d32e7b02e416270 prepare: - how: install copr: packit/packit-dev diff --git a/python-specfile.spec b/python-specfile.spec index 83725a9..af1fc45 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -4,7 +4,7 @@ Main focus is on modifying existing spec files, any change should result in a minimal diff.} -%global base_version 0.32.5 +%global base_version 0.32.6 #global prerelease rc1 %global package_version %{base_version}%{?prerelease:~%{prerelease}} @@ -68,6 +68,10 @@ rm -rf specfile.egg-info %changelog +* Thu Nov 14 2024 Packit - 0.32.6-1 +- New minor release for testing in CBS Koji +- Resolves: rhbz#2318011 + * Sat Oct 26 2024 Packit - 0.32.5-1 - We have fixed our parser to take in account the deprecations introduced in Python 3.8 (#420) diff --git a/sources b/sources index 8fff571..a94b119 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.32.5.tar.gz) = de642952d093034f10ef8d2f9aed0486c6f057a1c182961017de127f6d9ff18e7d1d090b7f5ade844fc1419a1c0d7bc46fdcf038b6a1b5e206751fbb34a7b359 +SHA512 (specfile-0.32.6.tar.gz) = 1ea328772f2779854f9b0099a106322fa08a8f6fd2b6e9e55fe5d9c9724bcb3dc102f43291a0cdcdc3cc7e973d928c5d47fe47836d364da5cd2a5276d2e1baba From 9f3db48171a5c8a147ea00af4fe1aecea275557f Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 16 Dec 2024 08:23:04 +0000 Subject: [PATCH 28/36] Update to 0.33.0 upstream release - Resolves: rhbz#2332288 Upstream tag: 0.33.0 Upstream commit: c0a98a85 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 48 ++++++++++++++++++++++++++++++++++++ README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- python-specfile.spec | 14 ++++++++++- sources | 2 +- 7 files changed, 66 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 4bf5a2c..0aa76d9 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /specfile-0.32.3.tar.gz /specfile-0.32.5.tar.gz /specfile-0.32.6.tar.gz +/specfile-0.33.0.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 837931a..f0e2f41 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -33,6 +33,33 @@ packages: - bash -c "ls -1t ./fedora/*.tar.gz | head -n 1" get-current-version: python3 -m setuptools_scm + # docs: https://gitlab.com/CentOS/Integration/packit-cbs/docs + specfile-centos-integration-sig: + upstream_package_name: specfile + downstream_package_name: python-specfile + specfile_path: &specfile_path_centos centos-integration-sig/python-specfile.spec + files_to_sync: + - *specfile_path_centos + - .packit.yaml + - src: plans/ + dest: plans/ + - src: .fmf/ + dest: .fmf/ + srpm_build_deps: + - python3-build + - python3-setuptools_scm + actions: + pre-sync: + - python3 plans/git_reference.py + create-archive: + - python3 -m build --sdist --outdir ./fedora/ + - bash -c "ls -1t ./centos-integration-sig/*.tar.gz | head -n 1" + get-current-version: python3 -m setuptools_scm + dist_git_base_url: https://gitlab.com # this is not taken into account by centpkg-sig yet! + dist_git_namespace: CentOS/Integration/packit-cbs/rpms # this is not taken into account by centpkg-sig yet! + #sig: Integration/packit-cbs # this is not taken into account by centpkg-sig yet! + pkg_tool: centpkg-sig + specfile-epel8: upstream_package_name: specfile downstream_package_name: python-specfile @@ -60,6 +87,7 @@ jobs: packages: [specfile] targets: - fedora-all + - fedora-all-aarch64 - epel-9 - job: copr_build trigger: pull_request @@ -73,6 +101,7 @@ jobs: packages: [specfile] targets: - fedora-all + - fedora-all-aarch64 - epel-9 project: packit-dev list_on_homepage: True @@ -93,6 +122,7 @@ jobs: packages: [specfile] targets: - fedora-stable + - fedora-stable-aarch64 - epel-9 project: packit-stable list_on_homepage: True @@ -112,6 +142,7 @@ jobs: packages: [specfile] targets: - fedora-all + - fedora-all-aarch64 - epel-9 project: packit-releases list_on_homepage: True @@ -171,6 +202,11 @@ jobs: packages: [specfile-epel8] dist_git_branches: - epel-8 + - job: propose_downstream + trigger: release + packages: [specfile-centos-integration-sig] + dist_git_branches: + - c9-sig-integration - job: pull_from_upstream trigger: release @@ -185,6 +221,11 @@ jobs: packages: [specfile-epel8] dist_git_branches: - epel-8 + - job: pull_from_upstream + trigger: release + packages: [specfile-centos-integration-sig] + dist_git_branches: + - c9-sig-integration - job: koji_build trigger: commit @@ -204,6 +245,13 @@ jobs: allowed_pr_authors: ["packit-stg", "packit"] dist_git_branches: - epel-8 + - job: koji_build + trigger: commit + packages: [specfile-centos-integration-sig] + packit_instances: ["stg"] + allowed_pr_authors: ["packit-stg", "packit"] + dist_git_branches: + - c9-sig-integration - job: bodhi_update trigger: commit diff --git a/README.packit b/README.packit index c18262a..1da7848 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.103.0. +The file was generated using packit 0.105.0.post1.dev12+gf83936a0. diff --git a/plans/main.fmf b/plans/main.fmf index b18cd78..97b940c 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: 442e2a976fc608a33e6e4a970e3420ce9aafc8ac + ref: c0a98a85d9e43f59447248bb7f5258c2406ce9f1 execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index a6b2670..eaaa775 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: 30e2fb5839ded7dd901fd2852d32e7b02e416270 + ref: e5b3d8c94ec79aa9cc5e1fa8dd7d0aabc1dcfbf4 prepare: - how: install copr: packit/packit-dev diff --git a/python-specfile.spec b/python-specfile.spec index af1fc45..edf1109 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -4,7 +4,7 @@ Main focus is on modifying existing spec files, any change should result in a minimal diff.} -%global base_version 0.32.6 +%global base_version 0.33.0 #global prerelease rc1 %global package_version %{base_version}%{?prerelease:~%{prerelease}} @@ -68,6 +68,18 @@ rm -rf specfile.egg-info %changelog +* Mon Dec 16 2024 Packit - 0.33.0-1 +- There is a new convenience method `Sections.get_or_create()` that allows you to manipulate a section + without checking if it exists first. If a section doesn't exist, it will be appended to the end. (#441) + For example, this will work properly even on spec files without `%%changelog`: + + ``` + with spec.sections() as sections: + changelog = sections.get_or_create("changelog") + changelog[:] = ["%%autochangelog"] + ``` +- Resolves: rhbz#2332288 + * Thu Nov 14 2024 Packit - 0.32.6-1 - New minor release for testing in CBS Koji - Resolves: rhbz#2318011 diff --git a/sources b/sources index a94b119..f861749 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.32.6.tar.gz) = 1ea328772f2779854f9b0099a106322fa08a8f6fd2b6e9e55fe5d9c9724bcb3dc102f43291a0cdcdc3cc7e973d928c5d47fe47836d364da5cd2a5276d2e1baba +SHA512 (specfile-0.33.0.tar.gz) = 0df6eb5b464997f073950126333c71c1d501c066b4349fc3b556d5da5722f450548fbdc94b610c3990c8c66ba80b356e1594ecd5c823a8b0c4945d1e55c11cb6 From a14e4fb7dced912e7d95b1c3bd84d714f4d93f4f Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 27 Jan 2025 10:43:49 +0000 Subject: [PATCH 29/36] Update to 0.34.0 upstream release - Resolves: rhbz#2342178 Upstream tag: 0.34.0 Upstream commit: 84d6f3b4 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 6 +- ...90a69ab0bc7f119a9a9c8a21a03601c48ea2.patch | 160 ++++++++++++++++++ README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- python-specfile.spec | 9 +- sources | 2 +- 8 files changed, 176 insertions(+), 8 deletions(-) create mode 100644 6d1890a69ab0bc7f119a9a9c8a21a03601c48ea2.patch diff --git a/.gitignore b/.gitignore index 0aa76d9..101480f 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /specfile-0.32.5.tar.gz /specfile-0.32.6.tar.gz /specfile-0.33.0.tar.gz +/specfile-0.34.0.tar.gz diff --git a/.packit.yaml b/.packit.yaml index f0e2f41..a4c3316 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -55,9 +55,9 @@ packages: - python3 -m build --sdist --outdir ./fedora/ - bash -c "ls -1t ./centos-integration-sig/*.tar.gz | head -n 1" get-current-version: python3 -m setuptools_scm - dist_git_base_url: https://gitlab.com # this is not taken into account by centpkg-sig yet! - dist_git_namespace: CentOS/Integration/packit-cbs/rpms # this is not taken into account by centpkg-sig yet! - #sig: Integration/packit-cbs # this is not taken into account by centpkg-sig yet! + dist_git_base_url: https://gitlab.com + dist_git_namespace: CentOS/Integration/packit-cbs/rpms + sig: Integration/packit-cbs pkg_tool: centpkg-sig specfile-epel8: diff --git a/6d1890a69ab0bc7f119a9a9c8a21a03601c48ea2.patch b/6d1890a69ab0bc7f119a9a9c8a21a03601c48ea2.patch new file mode 100644 index 0000000..7a8ee75 --- /dev/null +++ b/6d1890a69ab0bc7f119a9a9c8a21a03601c48ea2.patch @@ -0,0 +1,160 @@ +From 29574b3e7d1a314e0242e3e160a0b1b7c7e6287e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Nikola=20Forr=C3=B3?= +Date: Tue, 28 Jan 2025 15:19:39 +0100 +Subject: [PATCH] Remove the walrus operator for Python 3.6 compatibility +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Nikola Forró +--- + tests/unit/test_changelog.py | 94 ++++++++++++++++++++---------------- + 1 file changed, 52 insertions(+), 42 deletions(-) + +diff --git a/tests/unit/test_changelog.py b/tests/unit/test_changelog.py +index 6691381..ba74dc4 100644 +--- a/tests/unit/test_changelog.py ++++ b/tests/unit/test_changelog.py +@@ -257,47 +257,35 @@ def test_suse_style_changelog_parse(): + "changelog", + data=[ + "-------------------------------------------------------------------", +- ( +- hdr1 := "Tue Dec 17 14:21:37 UTC 2024 - " +- + (dc := "Dan Čermák ") +- ), ++ "Tue Dec 17 14:21:37 UTC 2024 - Dan Čermák ", + "", +- (content1 := "- First version"), ++ "- First version", + "", + "-------------------------------------------------------------------", +- (hdr2 := f"Mon Nov 4 17:47:23 UTC 2024 - {dc}"), ++ "Mon Nov 4 17:47:23 UTC 2024 - Dan Čermák ", + "", +- (content2 := "- # [0.9.37] - September 4th, 2024"), ++ "- # [0.9.37] - September 4th, 2024", + "", + "-------------------------------------------------------------------", +- ( +- hdr3 := "Fri May 17 09:14:20 UTC 2024 - " +- + "Dominique Leuenberger " +- ), ++ "Fri May 17 09:14:20 UTC 2024 - Dominique Leuenberger ", + "", +- (content3 := "- Use %patch -P N instead of deprecated %patchN syntax."), ++ "- Use %patch -P N instead of deprecated %patchN syntax.", + "", + "-------------------------------------------------------------------", +- ( +- hdr4 := "Mon Oct 10 13:27:24 UTC 2022 - Stephan Kulow " +- ), ++ "Mon Oct 10 13:27:24 UTC 2022 - Stephan Kulow ", + "", +- (content4_1 := "updated to version 0.9.28"), +- (content4_2 := " see installed CHANGELOG.md"), ++ "updated to version 0.9.28", ++ " see installed CHANGELOG.md", + "", + "", + "-------------------------------------------------------------------", +- ( +- hdr5 := "Fri Jun 25 07:31:34 UTC 2021 - Dan Čermák " +- ), ++ "Fri Jun 25 07:31:34 UTC 2021 - Dan Čermák ", + "", +- (content5_1 := "- New upstream release 0.9.26"), ++ "- New upstream release 0.9.26", + "", +- (content5_2 := " - Add support for Ruby 3.0 and fix tests"), +- ( +- content5_3 := " - Fix support for `frozen_string_literal: false`" +- + " magic comments (#1363)" +- ), ++ " - Add support for Ruby 3.0 and fix tests", ++ " - Fix support for `frozen_string_literal: false`" ++ " magic comments (#1363)", + "", + "", + ], +@@ -309,14 +297,28 @@ def test_suse_style_changelog_parse(): + + for changelog_entry, hdr, content in zip( + changelog, +- reversed((hdr1, hdr2, hdr3, hdr4, hdr5)), + reversed( + ( +- [content1], +- [content2], +- [content3], +- [content4_1, content4_2], +- [content5_1, "", content5_2, content5_3], ++ "Tue Dec 17 14:21:37 UTC 2024 - Dan Čermák ", ++ "Mon Nov 4 17:47:23 UTC 2024 - Dan Čermák ", ++ "Fri May 17 09:14:20 UTC 2024 - Dominique Leuenberger ", ++ "Mon Oct 10 13:27:24 UTC 2022 - Stephan Kulow ", ++ "Fri Jun 25 07:31:34 UTC 2021 - Dan Čermák ", ++ ) ++ ), ++ reversed( ++ ( ++ ["- First version"], ++ ["- # [0.9.37] - September 4th, 2024"], ++ ["- Use %patch -P N instead of deprecated %patchN syntax."], ++ ["updated to version 0.9.28", " see installed CHANGELOG.md"], ++ [ ++ "- New upstream release 0.9.26", ++ "", ++ " - Add support for Ruby 3.0 and fix tests", ++ " - Fix support for `frozen_string_literal: false`" ++ " magic comments (#1363)", ++ ], + ) + ), + ): +@@ -336,27 +338,35 @@ def test_suse_style_changelog_parse(): + ( + datetime.datetime(2021, 6, 25, 7, 31, 34), + "Dan Čermák ", +- content_1 := ["", "New upstream release 0.9.26"], ++ ["", "New upstream release 0.9.26"], + ChangelogEntry( +- header=_OPENSUSE_CHANGELOG_SEPARATOR +- + "\n" +- + "Fri Jun 25 07:31:34 UTC 2021 - Dan Čermák ", +- content=content_1, ++ header=( ++ _OPENSUSE_CHANGELOG_SEPARATOR ++ + "\n" ++ + "Fri Jun 25 07:31:34 UTC 2021 - Dan Čermák " ++ ), ++ content=["", "New upstream release 0.9.26"], + ), + ), + ( + datetime.date(2021, 6, 25), + "Dan Čermák ", +- content_2 := [ ++ [ + "", + "New upstream release 0.26", + "Fixed a major regression in Foo", + ], + ChangelogEntry( +- header=_OPENSUSE_CHANGELOG_SEPARATOR +- + "\n" +- + "Fri Jun 25 12:00:00 UTC 2021 - Dan Čermák ", +- content=content_2, ++ header=( ++ _OPENSUSE_CHANGELOG_SEPARATOR ++ + "\n" ++ + "Fri Jun 25 12:00:00 UTC 2021 - Dan Čermák " ++ ), ++ content=[ ++ "", ++ "New upstream release 0.26", ++ "Fixed a major regression in Foo", ++ ], + ), + ), + ] diff --git a/README.packit b/README.packit index 1da7848..cb66358 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.105.0.post1.dev12+gf83936a0. +The file was generated using packit 1.0.0.post1.dev4+g9467df56. diff --git a/plans/main.fmf b/plans/main.fmf index 97b940c..a704dc2 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: c0a98a85d9e43f59447248bb7f5258c2406ce9f1 + ref: 84d6f3b4883a296d2498edae8c7680717913d606 execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index eaaa775..2cf50c3 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: e5b3d8c94ec79aa9cc5e1fa8dd7d0aabc1dcfbf4 + ref: 809a89b439f8772db18da1697ffa3ee40fe41c15 prepare: - how: install copr: packit/packit-dev diff --git a/python-specfile.spec b/python-specfile.spec index edf1109..eb6f635 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -4,7 +4,7 @@ Main focus is on modifying existing spec files, any change should result in a minimal diff.} -%global base_version 0.33.0 +%global base_version 0.34.0 #global prerelease rc1 %global package_version %{base_version}%{?prerelease:~%{prerelease}} @@ -21,6 +21,9 @@ URL: https://github.com/packit/specfile Source0: %{pypi_source specfile %{pypi_version}} +# https://github.com/packit/specfile/pull/450 +Patch: https://github.com/packit/specfile/commit/6d1890a69ab0bc7f119a9a9c8a21a03601c48ea2.patch + BuildArch: noarch BuildRequires: python%{python3_pkgversion}-devel @@ -68,6 +71,10 @@ rm -rf specfile.egg-info %changelog +* Mon Jan 27 2025 Packit - 0.34.0-1 +- Added support for detached (open)SUSE style changelogs (#444) +- Resolves: rhbz#2342178 + * Mon Dec 16 2024 Packit - 0.33.0-1 - There is a new convenience method `Sections.get_or_create()` that allows you to manipulate a section without checking if it exists first. If a section doesn't exist, it will be appended to the end. (#441) diff --git a/sources b/sources index f861749..cb8b3f9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.33.0.tar.gz) = 0df6eb5b464997f073950126333c71c1d501c066b4349fc3b556d5da5722f450548fbdc94b610c3990c8c66ba80b356e1594ecd5c823a8b0c4945d1e55c11cb6 +SHA512 (specfile-0.34.0.tar.gz) = fa2661507b72695c58da97686879167712f02f3df9a8940acba1e11b924da68171ed0eeddf73a03f472e2319f0402dca13eb5ee0126f8b1b992d17de507297c3 From b470d55f1d5becc66d9b137e194da2b968c72916 Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 7 Feb 2025 14:33:54 +0000 Subject: [PATCH 30/36] Update to 0.34.1 upstream release Upstream tag: 0.34.1 Upstream commit: 192a081a Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- python-specfile.spec | 8 ++++---- sources | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 101480f..7c84f0c 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /specfile-0.32.6.tar.gz /specfile-0.33.0.tar.gz /specfile-0.34.0.tar.gz +/specfile-0.34.1.tar.gz diff --git a/README.packit b/README.packit index cb66358..6d5cfa5 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 1.0.0.post1.dev4+g9467df56. +The file was generated using packit 1.0.1.post1.dev3+g97cfea82. diff --git a/plans/main.fmf b/plans/main.fmf index a704dc2..129091b 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: 84d6f3b4883a296d2498edae8c7680717913d606 + ref: 192a081abc71fe4f8af377bf15350088508a3558 execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index 2cf50c3..bb3785e 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: 809a89b439f8772db18da1697ffa3ee40fe41c15 + ref: b038051a619fdbffcb40441b97b972f014e240c1 prepare: - how: install copr: packit/packit-dev diff --git a/python-specfile.spec b/python-specfile.spec index eb6f635..ce9422a 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -4,7 +4,7 @@ Main focus is on modifying existing spec files, any change should result in a minimal diff.} -%global base_version 0.34.0 +%global base_version 0.34.1 #global prerelease rc1 %global package_version %{base_version}%{?prerelease:~%{prerelease}} @@ -21,9 +21,6 @@ URL: https://github.com/packit/specfile Source0: %{pypi_source specfile %{pypi_version}} -# https://github.com/packit/specfile/pull/450 -Patch: https://github.com/packit/specfile/commit/6d1890a69ab0bc7f119a9a9c8a21a03601c48ea2.patch - BuildArch: noarch BuildRequires: python%{python3_pkgversion}-devel @@ -71,6 +68,9 @@ rm -rf specfile.egg-info %changelog +* Fri Feb 07 2025 Packit - 0.34.1-1 +- Removed the usage of a walrus operator for Python 3.6 compatibility. (#450) + * Mon Jan 27 2025 Packit - 0.34.0-1 - Added support for detached (open)SUSE style changelogs (#444) - Resolves: rhbz#2342178 diff --git a/sources b/sources index cb8b3f9..8a11795 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.34.0.tar.gz) = fa2661507b72695c58da97686879167712f02f3df9a8940acba1e11b924da68171ed0eeddf73a03f472e2319f0402dca13eb5ee0126f8b1b992d17de507297c3 +SHA512 (specfile-0.34.1.tar.gz) = 86e58692247b5d58077eba3a1118bc09528531e7193c8cda21b0ac5461ab9874d965d00f1c394ec482d74e6d919b13074b2dbf002c8304792b107c4ec51bcef7 From 9d32543db9216313fb451c48295190c8b3a158df Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 18 Mar 2025 07:27:04 +0000 Subject: [PATCH 31/36] Update to 0.34.2 upstream release Upstream tag: 0.34.2 Upstream commit: 875f03ed Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 233 +++++++++++++++++++---------------- README.packit | 2 +- plans/full.fmf | 8 ++ plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- python-specfile.spec | 5 +- sources | 2 +- 8 files changed, 145 insertions(+), 110 deletions(-) diff --git a/.gitignore b/.gitignore index 7c84f0c..f3e1ff3 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /specfile-0.33.0.tar.gz /specfile-0.34.0.tar.gz /specfile-0.34.1.tar.gz +/specfile-0.34.2.tar.gz diff --git a/.packit.yaml b/.packit.yaml index a4c3316..231ee63 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -11,7 +11,7 @@ prerelease_suffix_macro: prerelease copy_upstream_release_description: true packages: - specfile: + specfile: &specfile upstream_package_name: specfile downstream_package_name: python-specfile specfile_path: &specfile_path fedora/python-specfile.spec @@ -25,7 +25,7 @@ packages: srpm_build_deps: - python3-build - python3-setuptools_scm - actions: + actions: &actions pre-sync: - python3 plans/git_reference.py create-archive: @@ -33,36 +33,8 @@ packages: - bash -c "ls -1t ./fedora/*.tar.gz | head -n 1" get-current-version: python3 -m setuptools_scm - # docs: https://gitlab.com/CentOS/Integration/packit-cbs/docs - specfile-centos-integration-sig: - upstream_package_name: specfile - downstream_package_name: python-specfile - specfile_path: &specfile_path_centos centos-integration-sig/python-specfile.spec - files_to_sync: - - *specfile_path_centos - - .packit.yaml - - src: plans/ - dest: plans/ - - src: .fmf/ - dest: .fmf/ - srpm_build_deps: - - python3-build - - python3-setuptools_scm - actions: - pre-sync: - - python3 plans/git_reference.py - create-archive: - - python3 -m build --sdist --outdir ./fedora/ - - bash -c "ls -1t ./centos-integration-sig/*.tar.gz | head -n 1" - get-current-version: python3 -m setuptools_scm - dist_git_base_url: https://gitlab.com - dist_git_namespace: CentOS/Integration/packit-cbs/rpms - sig: Integration/packit-cbs - pkg_tool: centpkg-sig - specfile-epel8: - upstream_package_name: specfile - downstream_package_name: python-specfile + <<: *specfile specfile_path: &specfile_path_epel8 epel8/python-specfile.spec files_to_sync: - *specfile_path_epel8 @@ -71,31 +43,69 @@ packages: dest: plans/ - src: .fmf/ dest: .fmf/ - srpm_build_deps: - - python3-setuptools_scm actions: - pre-sync: - - python3 plans/git_reference.py + <<: *actions create-archive: - python3 setup.py sdist --dist-dir ./epel8/ - bash -c "ls -1t ./epel8/*.tar.gz | head -n 1" - get-current-version: python3 setup.py --version + + specfile-epel10: + <<: *specfile + specfile_path: &specfile_path_epel10 epel10/python-specfile.spec + files_to_sync: + - *specfile_path_epel10 + - .packit.yaml + - src: plans/ + dest: plans/ + - src: .fmf/ + dest: .fmf/ + actions: + <<: *actions + create-archive: + - python3 setup.py sdist --dist-dir ./epel10/ + - bash -c "ls -1t ./epel10/*.tar.gz | head -n 1" + + # docs: https://gitlab.com/CentOS/Integration/packit-cbs/docs + specfile-centos-integration-sig: + <<: *specfile + specfile_path: &specfile_path_centos_sig centos-integration-sig/python-specfile.spec + files_to_sync: + - *specfile_path_centos_sig + - .packit.yaml + - src: plans/ + dest: plans/ + - src: .fmf/ + dest: .fmf/ + actions: + <<: *actions + create-archive: + - python3 -m build --sdist --outdir ./centos-integration-sig/ + - bash -c "ls -1t ./centos-integration-sig/*.tar.gz | head -n 1" + dist_git_base_url: https://gitlab.com + dist_git_namespace: CentOS/Integration/packit-cbs/rpms + sig: Integration/packit-cbs + pkg_tool: centpkg-sig jobs: - - job: copr_build + - &copr_build_pr + job: copr_build trigger: pull_request packages: [specfile] targets: - fedora-all - fedora-all-aarch64 - epel-9 - - job: copr_build - trigger: pull_request + - <<: *copr_build_pr packages: [specfile-epel8] targets: - epel-8 + - <<: *copr_build_pr + packages: [specfile-epel10] + targets: + - epel-10-all - - job: copr_build + - &copr_build_commit_main + job: copr_build trigger: commit branch: main packages: [specfile] @@ -106,38 +116,29 @@ jobs: project: packit-dev list_on_homepage: True preserve_project: True - - job: copr_build - trigger: commit - branch: main + - <<: *copr_build_commit_main packages: [specfile-epel8] targets: - epel-8 - project: packit-dev - list_on_homepage: True - preserve_project: True + - <<: *copr_build_commit_main + packages: [specfile-epel10] + targets: + - epel-10-all - - job: copr_build + - &copr_build_commit_stable + job: copr_build trigger: commit branch: stable packages: [specfile] targets: - - fedora-stable - - fedora-stable-aarch64 - - epel-9 - project: packit-stable - list_on_homepage: True - preserve_project: True - - job: copr_build - trigger: commit - branch: stable - packages: [specfile-epel8] - targets: - - epel-8 + - fedora-latest-stable + - fedora-latest-stable-aarch64 project: packit-stable list_on_homepage: True preserve_project: True - - job: copr_build + - &copr_build_release + job: copr_build trigger: release packages: [specfile] targets: @@ -147,30 +148,35 @@ jobs: project: packit-releases list_on_homepage: True preserve_project: True - - job: copr_build - trigger: release + - <<: *copr_build_release packages: [specfile-epel8] targets: - epel-8 - project: packit-releases - list_on_homepage: True - preserve_project: True + - <<: *copr_build_release + packages: [specfile-epel10] + targets: + - epel-10-all - - job: tests + - &tests + job: tests trigger: pull_request packages: [specfile] tmt_plan: "smoke|full|packit-integration" targets: - fedora-all - epel-9 - - job: tests - trigger: pull_request + - <<: *tests + identifier: performance + tmt_plan: performance + targets: + - fedora-rawhide + - <<: *tests packages: [specfile-epel8] tmt_plan: "smoke|full" use_internal_tf: true targets: - epel-8: - distros: [RHEL-8] + epel-8-x86_64: + distros: [RHEL-8.10.0-Nightly] # enable EPEL tf_extra_params: environments: @@ -180,16 +186,14 @@ jobs: set -x dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm %end - - - job: tests - trigger: pull_request - packages: [specfile] - identifier: performance - tmt_plan: performance + - <<: *tests + packages: [specfile-epel10] + tmt_plan: "smoke|full" targets: - - fedora-rawhide + - epel-10-all - - job: propose_downstream + - &propose_downstream + job: propose_downstream trigger: release packages: [specfile] dist_git_branches: @@ -197,18 +201,23 @@ jobs: fast_forward_merge_into: - fedora-branched epel-9: {} - - job: propose_downstream - trigger: release + - <<: *propose_downstream packages: [specfile-epel8] dist_git_branches: - epel-8 - - job: propose_downstream - trigger: release + - <<: *propose_downstream + packages: [specfile-epel10] + dist_git_branches: + epel-10: + fast_forward_merge_into: + - epel-10-branched + - <<: *propose_downstream packages: [specfile-centos-integration-sig] dist_git_branches: - c9-sig-integration - - job: pull_from_upstream + - &pull_from_upstream + job: pull_from_upstream trigger: release packages: [specfile] dist_git_branches: @@ -216,47 +225,61 @@ jobs: fast_forward_merge_into: - fedora-branched epel-9: {} - - job: pull_from_upstream - trigger: release + - <<: *pull_from_upstream packages: [specfile-epel8] dist_git_branches: - epel-8 - - job: pull_from_upstream - trigger: release + - <<: *pull_from_upstream + packages: [specfile-epel10] + dist_git_branches: + epel-10: + fast_forward_merge_into: + - epel-10-branched + - <<: *pull_from_upstream packages: [specfile-centos-integration-sig] dist_git_branches: - c9-sig-integration - - job: koji_build + - &koji_build + job: koji_build trigger: commit packages: [specfile] packit_instances: ["stg"] allowed_pr_authors: ["packit-stg", "packit"] + dist_git_branches: + - epel-9 + - <<: *koji_build + packages: [specfile-epel8] + dist_git_branches: + - epel-8 + - <<: *koji_build + packages: [specfile-epel10] + dist_git_branches: + - epel-10-all + - <<: *koji_build + packages: [specfile-centos-integration-sig] + dist_git_branches: + - c9-sig-integration + - <<: *koji_build 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: koji_build - trigger: commit - packages: [specfile-centos-integration-sig] - packit_instances: ["stg"] - allowed_pr_authors: ["packit-stg", "packit"] - dist_git_branches: - - c9-sig-integration - - job: bodhi_update + - &bodhi_update + job: bodhi_update trigger: commit - packages: [specfile-epel8] + packages: [specfile] packit_instances: ["stg"] allowed_builders: ["packit-stg", "packit"] + dist_git_branches: + - epel-9 + - <<: *bodhi_update + packages: [specfile-epel8] dist_git_branches: - epel-8 + - <<: *bodhi_update + packages: [specfile-epel10] + dist_git_branches: + - epel-10-all diff --git a/README.packit b/README.packit index 6d5cfa5..33d5f21 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 1.0.1.post1.dev3+g97cfea82. +The file was generated using packit 1.2.0.post1.dev19+g772be563. diff --git a/plans/full.fmf b/plans/full.fmf index 4ed1316..dc00841 100644 --- a/plans/full.fmf +++ b/plans/full.fmf @@ -8,3 +8,11 @@ adjust: prepare+: - how: install package: python3 + + - when: "distro == rhel-10 or distro == centos-10 or distro == centos-stream-10" + because: "flexmock is not in EPEL 10: https://bugzilla.redhat.com/show_bug.cgi?id=2351835" + prepare+: + - how: install + package: python3-pip + - how: shell + script: pip3 install flexmock diff --git a/plans/main.fmf b/plans/main.fmf index 129091b..013282a 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: 192a081abc71fe4f8af377bf15350088508a3558 + ref: 875f03eda8abb51e7211bd1de5c11bdb038cf03d execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index bb3785e..2feebab 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: b038051a619fdbffcb40441b97b972f014e240c1 + ref: 772be56330806396e8153ae1cbd246a49a9ef2c1 prepare: - how: install copr: packit/packit-dev diff --git a/python-specfile.spec b/python-specfile.spec index ce9422a..8db376e 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -4,7 +4,7 @@ Main focus is on modifying existing spec files, any change should result in a minimal diff.} -%global base_version 0.34.1 +%global base_version 0.34.2 #global prerelease rc1 %global package_version %{base_version}%{?prerelease:~%{prerelease}} @@ -68,6 +68,9 @@ rm -rf specfile.egg-info %changelog +* Tue Mar 18 2025 Packit - 0.34.2-1 +- context_management: add a type stub override to fix typing. Type checkers like mypy and pyright can now correctly determine the types for `.sources()`, `.sections()`, and the other `Specfile` methods that return context managers. (#457) + * Fri Feb 07 2025 Packit - 0.34.1-1 - Removed the usage of a walrus operator for Python 3.6 compatibility. (#450) diff --git a/sources b/sources index 8a11795..e767268 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.34.1.tar.gz) = 86e58692247b5d58077eba3a1118bc09528531e7193c8cda21b0ac5461ab9874d965d00f1c394ec482d74e6d919b13074b2dbf002c8304792b107c4ec51bcef7 +SHA512 (specfile-0.34.2.tar.gz) = b70f410ee6d6f493e96beff0d013b4830410ea3876c5c87b157c4481a1b65a804c6d7975c9e7c3d0d82dd4af522768cc393cee2eb2dd72ec2a0d694787eeee3d From 9cf6dcd35e41225f945e215732cb0ec2e45502b8 Mon Sep 17 00:00:00 2001 From: Packit Date: Sun, 13 Apr 2025 19:46:18 +0000 Subject: [PATCH 32/36] Update to 0.35.0 upstream release Upstream tag: 0.35.0 Upstream commit: e059c302 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 4 ++-- python-specfile.spec | 6 +++++- sources | 2 +- 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index f3e1ff3..8f84562 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /specfile-0.34.0.tar.gz /specfile-0.34.1.tar.gz /specfile-0.34.2.tar.gz +/specfile-0.35.0.tar.gz diff --git a/README.packit b/README.packit index 33d5f21..807ffc6 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 1.2.0.post1.dev19+g772be563. +The file was generated using packit 1.6.0.post1.dev2+gd5a7662a. diff --git a/plans/main.fmf b/plans/main.fmf index 013282a..c12c916 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: 875f03eda8abb51e7211bd1de5c11bdb038cf03d + ref: e059c30230d6611823a7af8020f703f07e136568 execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index 2feebab..e9a0088 100644 --- a/plans/packit-integration.fmf +++ b/plans/packit-integration.fmf @@ -1,8 +1,8 @@ discover: how: fmf url: https://github.com/packit/packit - filter: tier:0 | tier:1 - ref: 772be56330806396e8153ae1cbd246a49a9ef2c1 + filter: tag:full + ref: 641502d2567dbd85518076ce1c201b88097a8246 prepare: - how: install copr: packit/packit-dev diff --git a/python-specfile.spec b/python-specfile.spec index 8db376e..86225d6 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -4,7 +4,7 @@ Main focus is on modifying existing spec files, any change should result in a minimal diff.} -%global base_version 0.34.2 +%global base_version 0.35.0 #global prerelease rc1 %global package_version %{base_version}%{?prerelease:~%{prerelease}} @@ -68,6 +68,10 @@ rm -rf specfile.egg-info %changelog +* Sun Apr 13 2025 Packit - 0.35.0-1 +- Added support for creating Specfile instances from file objects and strings. (#458) +- The `context_management` type stubs now use `ParamSpec` from `typing_extensions` to support Python < 3.10. (#466) + * Tue Mar 18 2025 Packit - 0.34.2-1 - context_management: add a type stub override to fix typing. Type checkers like mypy and pyright can now correctly determine the types for `.sources()`, `.sections()`, and the other `Specfile` methods that return context managers. (#457) diff --git a/sources b/sources index e767268..35da9c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.34.2.tar.gz) = b70f410ee6d6f493e96beff0d013b4830410ea3876c5c87b157c4481a1b65a804c6d7975c9e7c3d0d82dd4af522768cc393cee2eb2dd72ec2a0d694787eeee3d +SHA512 (specfile-0.35.0.tar.gz) = db1fa9775955884777b80a218d1c95e3016e6ccc452273f22beb3fb7118a0f085d997823ecdc6c4d8b5c57e400946eaff00ed436d15d3eb54c298f86fc50d496 From 02e4a45c28847317c15177a8fcfa31781ac3a25c Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 30 May 2025 13:11:41 +0000 Subject: [PATCH 33/36] Update to 0.36.0 upstream release Upstream tag: 0.36.0 Upstream commit: 24206539 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 4 ++-- README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 5 +++-- python-specfile.spec | 5 ++++- sources | 2 +- 7 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 8f84562..f6d555b 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /specfile-0.34.1.tar.gz /specfile-0.34.2.tar.gz /specfile-0.35.0.tar.gz +/specfile-0.36.0.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 231ee63..0c8b732 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -131,8 +131,8 @@ jobs: branch: stable packages: [specfile] targets: - - fedora-latest-stable - - fedora-latest-stable-aarch64 + - fedora-stable + - fedora-stable-aarch64 project: packit-stable list_on_homepage: True preserve_project: True diff --git a/README.packit b/README.packit index 807ffc6..ed627e6 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 1.6.0.post1.dev2+gd5a7662a. +The file was generated using packit 1.8.0.post1.dev25+g477eb5ab. diff --git a/plans/main.fmf b/plans/main.fmf index c12c916..acfc624 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: e059c30230d6611823a7af8020f703f07e136568 + ref: 242065398724d191ecfa234d1e612886e647d4e4 execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index e9a0088..c0158cf 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: tag:full - ref: 641502d2567dbd85518076ce1c201b88097a8246 + ref: 90965a14e3c5d3f2fc4a971ba824e179aa8f01b5 prepare: - how: install copr: packit/packit-dev @@ -22,6 +22,7 @@ adjust: package: python3-pip - how: shell script: pip3 install build 'deepdiff < 8.0.0' - - when: distro == rhel-8 or distro == centos-8 or distro == centos-stream-8 + - when: | + distro == rhel-8 or distro == centos-8 or distro == centos-stream-8 or distro == rhel-9 or distro == centos-9 or distro == centos-stream-9 because: packit doesn't support EL 8 enabled: false diff --git a/python-specfile.spec b/python-specfile.spec index 86225d6..5568ab1 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -4,7 +4,7 @@ Main focus is on modifying existing spec files, any change should result in a minimal diff.} -%global base_version 0.35.0 +%global base_version 0.36.0 #global prerelease rc1 %global package_version %{base_version}%{?prerelease:~%{prerelease}} @@ -68,6 +68,9 @@ rm -rf specfile.egg-info %changelog +* Fri May 30 2025 Packit - 0.36.0-1 +- We have fixed a bug that caused specfile to traceback when section names with conditional macro expansions containing spaces were present in the spec file. (#476) + * Sun Apr 13 2025 Packit - 0.35.0-1 - Added support for creating Specfile instances from file objects and strings. (#458) - The `context_management` type stubs now use `ParamSpec` from `typing_extensions` to support Python < 3.10. (#466) diff --git a/sources b/sources index 35da9c6..37263f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.35.0.tar.gz) = db1fa9775955884777b80a218d1c95e3016e6ccc452273f22beb3fb7118a0f085d997823ecdc6c4d8b5c57e400946eaff00ed436d15d3eb54c298f86fc50d496 +SHA512 (specfile-0.36.0.tar.gz) = 64fc4e1b03beb0fe4559af4ae590568d5a718f7098e4305ddb93fc1905923abcdf8e169f99297e154ff68cccc1eaa85b3139630ad08a0eeffd9caffa448d8992 From eea0fd26e670c5786fdcfb5f62dbb276b574e4ae Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 5 Sep 2025 11:38:01 +0000 Subject: [PATCH 34/36] Update to 0.37.0 upstream release Upstream tag: 0.37.0 Upstream commit: aafca33c Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 5 +++-- python-specfile.spec | 5 ++++- sources | 2 +- 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index f6d555b..4ca3d0f 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /specfile-0.34.2.tar.gz /specfile-0.35.0.tar.gz /specfile-0.36.0.tar.gz +/specfile-0.37.0.tar.gz diff --git a/README.packit b/README.packit index ed627e6..fb341a1 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 1.8.0.post1.dev25+g477eb5ab. +The file was generated using packit 1.11.0.post1.dev7+gfdcdf3a32. diff --git a/plans/main.fmf b/plans/main.fmf index acfc624..c7b7781 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: 242065398724d191ecfa234d1e612886e647d4e4 + ref: aafca33cbd5fec74a044b9c436dcac91215af36c execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index c0158cf..59e575a 100644 --- a/plans/packit-integration.fmf +++ b/plans/packit-integration.fmf @@ -2,12 +2,13 @@ discover: how: fmf url: https://github.com/packit/packit filter: tag:full - ref: 90965a14e3c5d3f2fc4a971ba824e179aa8f01b5 + ref: fdcdf3a322d8fd1a76ec13da16f5b90dc45089ed prepare: - how: install copr: packit/packit-dev - how: shell - script: sed -i -n '/^priority=/!p;$apriority=5' /etc/yum.repos.d/*:packit:packit-dev.repo + 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 5568ab1..af5fb2a 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -4,7 +4,7 @@ Main focus is on modifying existing spec files, any change should result in a minimal diff.} -%global base_version 0.36.0 +%global base_version 0.37.0 #global prerelease rc1 %global package_version %{base_version}%{?prerelease:~%{prerelease}} @@ -68,6 +68,9 @@ rm -rf specfile.egg-info %changelog +* Fri Sep 05 2025 Packit - 0.37.0-1 +- Added support for Elbrus E2K CPU architectures. (#484) + * Fri May 30 2025 Packit - 0.36.0-1 - We have fixed a bug that caused specfile to traceback when section names with conditional macro expansions containing spaces were present in the spec file. (#476) diff --git a/sources b/sources index 37263f2..069d110 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.36.0.tar.gz) = 64fc4e1b03beb0fe4559af4ae590568d5a718f7098e4305ddb93fc1905923abcdf8e169f99297e154ff68cccc1eaa85b3139630ad08a0eeffd9caffa448d8992 +SHA512 (specfile-0.37.0.tar.gz) = 552f8a6e3717d1465da0358cc3669af07363c99d5b48da51760d80e2930516cf2f523b238940094dec40255c13fb1bcb38361f95d9192d86cad3ddbee2570b78 From 62f2ad8d8a96e8e75da3388253abfd21f959afa0 Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 3 Oct 2025 12:55:04 +0000 Subject: [PATCH 35/36] Update to 0.37.1 upstream release Upstream tag: 0.37.1 Upstream commit: 21a45baa Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- python-specfile.spec | 5 ++++- sources | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 4ca3d0f..c608e2b 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ /specfile-0.35.0.tar.gz /specfile-0.36.0.tar.gz /specfile-0.37.0.tar.gz +/specfile-0.37.1.tar.gz diff --git a/plans/main.fmf b/plans/main.fmf index c7b7781..94e3a90 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: aafca33cbd5fec74a044b9c436dcac91215af36c + ref: 21a45baa7c1ca166485b48e98069baad7ca1b99e execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index 59e575a..ea56a89 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: tag:full - ref: fdcdf3a322d8fd1a76ec13da16f5b90dc45089ed + ref: dbe235f913d74de4e1fb8175a14ca0e0f17a15e4 prepare: - how: install copr: packit/packit-dev diff --git a/python-specfile.spec b/python-specfile.spec index af5fb2a..807ce28 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -4,7 +4,7 @@ Main focus is on modifying existing spec files, any change should result in a minimal diff.} -%global base_version 0.37.0 +%global base_version 0.37.1 #global prerelease rc1 %global package_version %{base_version}%{?prerelease:~%{prerelease}} @@ -68,6 +68,9 @@ rm -rf specfile.egg-info %changelog +* Fri Oct 03 2025 Packit - 0.37.1-1 +- We have solved a FutureWarning in our codebase. (#485) + * Fri Sep 05 2025 Packit - 0.37.0-1 - Added support for Elbrus E2K CPU architectures. (#484) diff --git a/sources b/sources index 069d110..dbdd35e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.37.0.tar.gz) = 552f8a6e3717d1465da0358cc3669af07363c99d5b48da51760d80e2930516cf2f523b238940094dec40255c13fb1bcb38361f95d9192d86cad3ddbee2570b78 +SHA512 (specfile-0.37.1.tar.gz) = cd77cac206fc9cafc111c0f9c409dbbc8c250481e638b7bc1937c6d8bca5d03f0ccf711cbbb34bfde1f7912d417cb0381fe8aeef19c28d94afe068484ef2884d From 6efa30bf3ba2814077c9baac2cbd864e24d22cf5 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 8 Jan 2026 13:48:33 +0000 Subject: [PATCH 36/36] Update to 0.38.0 upstream release Upstream tag: 0.38.0 Upstream commit: a07560dd Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 2 ++ README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- python-specfile.spec | 6 +++++- sources | 2 +- 7 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index c608e2b..faf7e5b 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ /specfile-0.36.0.tar.gz /specfile-0.37.0.tar.gz /specfile-0.37.1.tar.gz +/specfile-0.38.0.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 0c8b732..c326264 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -200,6 +200,7 @@ jobs: rawhide: fast_forward_merge_into: - fedora-branched + - eln epel-9: {} - <<: *propose_downstream packages: [specfile-epel8] @@ -224,6 +225,7 @@ jobs: rawhide: fast_forward_merge_into: - fedora-branched + - eln epel-9: {} - <<: *pull_from_upstream packages: [specfile-epel8] diff --git a/README.packit b/README.packit index fb341a1..9bb65f0 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 1.11.0.post1.dev7+gfdcdf3a32. +The file was generated using packit 1.13.0.post1.dev2+g84134016c. diff --git a/plans/main.fmf b/plans/main.fmf index 94e3a90..299f169 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: 21a45baa7c1ca166485b48e98069baad7ca1b99e + ref: a07560dd2609cf23add5deeadc103033611b7b22 execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index ea56a89..2d0af65 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: tag:full - ref: dbe235f913d74de4e1fb8175a14ca0e0f17a15e4 + ref: 87042fcac49435dd55a1b989ed0c6ead290e703d prepare: - how: install copr: packit/packit-dev diff --git a/python-specfile.spec b/python-specfile.spec index 807ce28..6d98331 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -4,7 +4,7 @@ Main focus is on modifying existing spec files, any change should result in a minimal diff.} -%global base_version 0.37.1 +%global base_version 0.38.0 #global prerelease rc1 %global package_version %{base_version}%{?prerelease:~%{prerelease}} @@ -68,6 +68,10 @@ rm -rf specfile.egg-info %changelog +* Thu Jan 08 2026 Packit - 0.38.0-1 +- A bug leading to incorrect EVR expansion has been fixed. (#492) +- Prevented side-effects during condition evaluation that could occur when expanding macros that manipulate other macros, leading to misinterpreted validity of condition branches. (#499) + * Fri Oct 03 2025 Packit - 0.37.1-1 - We have solved a FutureWarning in our codebase. (#485) diff --git a/sources b/sources index dbdd35e..46cc24d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.37.1.tar.gz) = cd77cac206fc9cafc111c0f9c409dbbc8c250481e638b7bc1937c6d8bca5d03f0ccf711cbbb34bfde1f7912d417cb0381fe8aeef19c28d94afe068484ef2884d +SHA512 (specfile-0.38.0.tar.gz) = bfd60434b868fd191fb68d5b2fa319db45df80397b6c1000a63d9fe947e998a8a86fcf6a76c0ae9b6ef3321d2b04d4dd9bc565a610bfb117faa64180342fda4d