From bdd90c0e32a93a32d7672d7d35320c3b88f801d1 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 31 Mar 2022 10:07:47 +0000 Subject: [PATCH 01/21] [packit] 0.2.0 upstream release Upstream tag: 0.2.0 Upstream commit: a15b0918 Signed-off-by: Packit --- .packit.yaml | 113 +++++++++++++++++++++++++++++++++++++++++++ README.packit | 3 ++ python-specfile.spec | 17 ++++++- sources | 2 +- 4 files changed, 132 insertions(+), 3 deletions(-) create mode 100644 .packit.yaml create mode 100644 README.packit 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 index 4a9660b..735a52f 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -5,14 +5,14 @@ in a minimal diff.} Name: python-specfile -Version: 0.1.1 +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: https://github.com/packit/specfile/archive/%{version}/specfile-%{version}.tar.gz +Source0: %{pypi_source specfile} BuildArch: noarch @@ -57,6 +57,19 @@ Summary: %{summary} %changelog +* Thu Mar 31 2022 Packit - 0.2.0-1 +- Enabled Zuul CI (#8) +- Switched from git:// to https:// for rebase hook (#22) +- Updated pre-commit configuration and adapted to type changes brought by new version of mypy (#24) +- Non-lowercase section names are now supported (#26) +- Added `Sections.get()` convenience method (#29) +- Added packit configuration and enabled packit (#25) +- Fixed infinite recursion when deep-copying instances of `Sections` and `Tags` (#30) +- Updated Fedora and EPEL spec files (#32) +- Fixed issues caused by older versions of dependencies on EPEL 8 (#33) +- Implemented high-level manipulation of sources and patches (#20, #36) +- It is now possible to parse spec files with missing local sources (#23) + * Mon Feb 21 2022 Nikola Forró - 0.1.1-1 - New upstream release 0.1.1 diff --git a/sources b/sources index 070fb37..49e3947 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.1.1.tar.gz) = c4714e7170ea27cb309d0137b831e067361d00d384646dd2e07876221256de3f4b32b06addfe78924f17046b96d63f53f33e4fe6f22ca20561e154629c49fbed +SHA512 (specfile-0.2.0.tar.gz) = cd524bb89fdd5a5e18ac42e575cd09140ed3a0fcf73de8939798fbd430e888c7817ebca4eeb44ba4e54d52de42e0bb115e4fd4ef58c146d93cabddddafe66332 From f7967f73f44403167e39d1d4cf66d77d5715a19c Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 16 May 2022 12:14:04 +0000 Subject: [PATCH 02/21] [packit] 0.3.0 upstream release Upstream tag: 0.3.0 Upstream commit: df62e212 Signed-off-by: Packit --- .packit.yaml | 12 +++++++++++- README.packit | 2 +- python-specfile.spec | 14 +++++++++++++- sources | 2 +- 4 files changed, 26 insertions(+), 4 deletions(-) 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 735a52f..28f2fd4 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 @@ -57,6 +57,18 @@ Summary: %{summary} %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) + + * Thu Mar 31 2022 Packit - 0.2.0-1 - Enabled Zuul CI (#8) - Switched from git:// to https:// for rebase hook (#22) 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 303e08c6676eb0889c770656e7fb574ef5ef74c6 Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 21 Jun 2022 13:32:34 +0000 Subject: [PATCH 03/21] [packit] 0.4.0 upstream release Upstream tag: 0.4.0 Upstream commit: d3b97670 Signed-off-by: Packit --- README.packit | 2 +- python-specfile.spec | 9 ++++++++- sources | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) 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 28f2fd4..54b8759 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 @@ -57,6 +57,13 @@ Summary: %{summary} %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 44a3b5b4f58c6c0bc8a2e2c1642a246e2fbead66 Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 22 Jul 2022 08:04:50 +0000 Subject: [PATCH 04/21] [packit] 0.5.0 upstream release Upstream tag: 0.5.0 Upstream commit: e4f80e56 Signed-off-by: Packit --- README.packit | 2 +- python-specfile.spec | 11 ++++++++++- sources | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) 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 54b8759..5fd994b 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 @@ -57,6 +57,15 @@ Summary: %{summary} %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 92ebe96d7faeb2f684466dfc2286fc115bc51aac Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 10 Aug 2022 09:54:07 +0000 Subject: [PATCH 05/21] [packit] 0.5.1 upstream release Upstream tag: 0.5.1 Upstream commit: a03b8972 Signed-off-by: Packit --- .packit.yaml | 99 ++++++++++++++++++++++++-------------------- README.packit | 2 +- python-specfile.spec | 17 +++++--- sources | 2 +- 4 files changed, 67 insertions(+), 53 deletions(-) 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 5fd994b..e8680ec 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 @@ -31,12 +31,14 @@ Summary: %{summary} %{desc} -%generate_buildrequires -%pyproject_buildrequires -x testing - - %prep %autosetup -p1 -n specfile-%{version} +# Use packaged RPM python bindings downstream +sed -i 's/rpm-py-installer/rpm/' setup.cfg + + +%generate_buildrequires +%pyproject_buildrequires -x testing %build @@ -57,6 +59,11 @@ Summary: %{summary} %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 fae6c20bb6305a937408e203c7f17627cc2fcca2 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 25 Aug 2022 13:15:42 +0000 Subject: [PATCH 06/21] [packit] 0.6.0 upstream release Upstream tag: 0.6.0 Upstream commit: 8b0a6cc4 Signed-off-by: Packit --- .packit.yaml | 2 +- README.packit | 2 +- python-specfile.spec | 10 +++++++--- sources | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) 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 e8680ec..3a41c5c 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 @@ -59,9 +59,13 @@ sed -i 's/rpm-py-installer/rpm/' setup.cfg %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 81bf767dbe6daed6a9b9ede4b4a31933c828248d Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 7 Oct 2022 14:31:54 +0000 Subject: [PATCH 07/21] [packit] 0.7.0 upstream release Upstream tag: 0.7.0 Upstream commit: e121363b Signed-off-by: Packit --- .fmf/version | 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 | 20 +++++++++++++++--- sources | 2 +- 9 files changed, 90 insertions(+), 17 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/.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 3a41c5c..2cfda5c 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -1,3 +1,11 @@ +%if 0%{?rhel} == 9 +# RHEL 9 is missing python-flexmock +%bcond_with tests +%else +%bcond_without tests +%endif + + %global desc %{expand: Python library for parsing and manipulating RPM spec files. Main focus is on modifying existing spec files, any change should result @@ -5,7 +13,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 @@ -38,7 +46,7 @@ sed -i 's/rpm-py-installer/rpm/' setup.cfg %generate_buildrequires -%pyproject_buildrequires -x testing +%pyproject_buildrequires %{?with_tests: -x testing} %build @@ -50,8 +58,10 @@ sed -i 's/rpm-py-installer/rpm/' setup.cfg %pyproject_save_files specfile +%if 0%{?with_tests} %check %pytest +%endif %files -n python%{python3_pkgversion}-specfile -f %{pyproject_files} @@ -59,8 +69,12 @@ sed -i 's/rpm-py-installer/rpm/' setup.cfg %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 dcb55c492e8a162a9d0f1d408f4104e702c02346 Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 14 Oct 2022 11:36:32 +0000 Subject: [PATCH 08/21] [packit] 0.8.0 upstream release Upstream tag: 0.8.0 Upstream commit: a3262621 Signed-off-by: Packit --- .packit.yaml | 53 -------------------------------------------- README.packit | 2 +- plans/main.fmf | 2 +- python-specfile.spec | 7 ++++-- sources | 2 +- 5 files changed, 8 insertions(+), 58 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index 023784b..a28de94 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -47,40 +47,12 @@ jobs: dist_git_branches: - fedora-all - epel-9 - - job: propose_downstream - trigger: release - specfile_path: epel8/python-specfile.spec - files_to_sync: - - 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-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 - 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 - pre-sync: - # FMF has to be installed on system where you are calling this tool. - - python3 plans/git_reference.py - targets: - - epel-8 - job: copr_build trigger: commit @@ -91,14 +63,6 @@ jobs: project: packit-dev list_on_homepage: True preserve_project: True - - <<: *copr_build_pr_epel8 - trigger: commit - branch: main - targets: - - epel-8 - project: packit-dev - list_on_homepage: True - preserve_project: True - job: copr_build trigger: commit @@ -109,14 +73,6 @@ jobs: project: packit-stable list_on_homepage: True preserve_project: True - - <<: *copr_build_pr_epel8 - trigger: commit - branch: stable - targets: - - epel-8 - project: packit-stable - list_on_homepage: True - preserve_project: True - job: copr_build trigger: release @@ -126,13 +82,6 @@ jobs: project: packit-releases list_on_homepage: True preserve_project: True - - <<: *copr_build_pr_epel8 - trigger: release - targets: - - epel-8 - project: packit-releases - list_on_homepage: True - preserve_project: True # downstream automation: - job: koji_build @@ -142,11 +91,9 @@ jobs: dist_git_branches: - fedora-all - epel-9 - - epel-8 - job: bodhi_update trigger: commit packit_instances: ["stg"] dist_git_branches: - fedora-branched # rawhide updates are created automatically - epel-9 - - epel-8 diff --git a/README.packit b/README.packit index a723bcb..e8857c6 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.60.1.dev6+g9c9b2a8. diff --git a/plans/main.fmf b/plans/main.fmf index d2feac5..18e7b2e 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: a3262621665ba191f982a91add4718a533d06c5d execute: how: tmt diff --git a/python-specfile.spec b/python-specfile.spec index 2cfda5c..c090039 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -13,7 +13,7 @@ in a minimal diff.} Name: python-specfile -Version: 0.7.0 +Version: 0.8.0 Release: 1%{?dist} Summary: A library for parsing and manipulating RPM spec files @@ -69,8 +69,11 @@ sed -i 's/rpm-py-installer/rpm/' setup.cfg %changelog +* Fri Oct 14 2022 Packit - 0.8.0-1 +- Added `Specfile.update_tag()` method that allows updating tag values while trying to preserve macro expansions. You can watch a demo on [YouTube](https://youtu.be/yzMfBPdFXZY). (#101) + * 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..0dfc85e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.7.0.tar.gz) = f07a99ea5f999cfd6b6f88c454381de1c0934a10c88c3359c53a85ea84ede235f1c1ce82ba0c8283354e59905bafbe96032a5fdf16aafceed081f94747a469d6 +SHA512 (specfile-0.8.0.tar.gz) = b974294c5f057e80f2aa87a9571bfc0f9d05b944efff1862e463c30ccaa281e2c22eefafd898b90bfe2e6e9b235b68e3870d19016bf63e42fa7f09a385514d1f From 8a36560b563813beac00445a6176d07441b77a0b Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 25 Oct 2022 17:30:40 +0000 Subject: [PATCH 09/21] [packit] 0.9.0 upstream release Upstream tag: 0.9.0 Upstream commit: 6b6cbeae Signed-off-by: Packit --- .packit.yaml | 6 ++++++ README.packit | 2 +- plans/main.fmf | 2 +- python-specfile.spec | 6 +++++- sources | 2 +- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index a28de94..45490dc 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -54,6 +54,12 @@ jobs: - fedora-all - epel-9 + - job: tests + trigger: pull_request + targets: + - fedora-all + - epel-9 + - job: copr_build trigger: commit branch: main diff --git a/README.packit b/README.packit index e8857c6..578bbfe 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.60.1.dev6+g9c9b2a8. +The file was generated using packit 0.60.1.dev11+g1b5611c. diff --git a/plans/main.fmf b/plans/main.fmf index 18e7b2e..ba8a594 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: a3262621665ba191f982a91add4718a533d06c5d + ref: 6b6cbeae4b12458bb7518f889a19371a6d0d7d97 execute: how: tmt diff --git a/python-specfile.spec b/python-specfile.spec index c090039..840e40d 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -13,7 +13,7 @@ in a minimal diff.} Name: python-specfile -Version: 0.8.0 +Version: 0.9.0 Release: 1%{?dist} Summary: A library for parsing and manipulating RPM spec files @@ -69,6 +69,10 @@ sed -i 's/rpm-py-installer/rpm/' setup.cfg %changelog +* Tue Oct 25 2022 Packit - 0.9.0-1 +- Added utility classes for working with (N)EVR. (#113) +- Fixed an issue with multiple instances of `Specfile` not expanding macros in the right context. (#117) + * Fri Oct 14 2022 Packit - 0.8.0-1 - Added `Specfile.update_tag()` method that allows updating tag values while trying to preserve macro expansions. You can watch a demo on [YouTube](https://youtu.be/yzMfBPdFXZY). (#101) diff --git a/sources b/sources index 0dfc85e..cfd04b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.8.0.tar.gz) = b974294c5f057e80f2aa87a9571bfc0f9d05b944efff1862e463c30ccaa281e2c22eefafd898b90bfe2e6e9b235b68e3870d19016bf63e42fa7f09a385514d1f +SHA512 (specfile-0.9.0.tar.gz) = 58cab116a4a385fbf0ba7d131f89f2cdacf1c0a0e01db48dc06b7d9fd8fd1342667ca0121f2efa3a31dd49938483ece3f41d34ab7202294638fd00929e288032 From 634ea94c65495637be9bceef1f9e3ba23da9f878 Mon Sep 17 00:00:00 2001 From: Packit Date: Sat, 12 Nov 2022 14:38:02 +0000 Subject: [PATCH 10/21] [packit] 0.9.1 upstream release Upstream tag: 0.9.1 Upstream commit: 11b91ccc Signed-off-by: Packit --- README.packit | 2 +- plans/main.fmf | 2 +- python-specfile.spec | 8 ++++++-- sources | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/README.packit b/README.packit index 578bbfe..8979edb 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.60.1.dev11+g1b5611c. +The file was generated using packit 0.63.1.dev12+gb534d99. diff --git a/plans/main.fmf b/plans/main.fmf index ba8a594..76caf53 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: 6b6cbeae4b12458bb7518f889a19371a6d0d7d97 + ref: 11b91ccce19780d1d99426ec234715150ce00659 execute: how: tmt diff --git a/python-specfile.spec b/python-specfile.spec index 840e40d..df5cc46 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -13,7 +13,7 @@ in a minimal diff.} Name: python-specfile -Version: 0.9.0 +Version: 0.9.1 Release: 1%{?dist} Summary: A library for parsing and manipulating RPM spec files @@ -69,8 +69,12 @@ sed -i 's/rpm-py-installer/rpm/' setup.cfg %changelog +* Sat Nov 12 2022 Packit - 0.9.1-1 +- `specfile` now supports localized tags (e.g. `Summary(fr)`) and tags with qualifiers (e.g. `Requires(post)`). + It also follows more closely rpm parsing logic and doesn't fail on invalid section names. (#132) + * Tue Oct 25 2022 Packit - 0.9.0-1 -- Added utility classes for working with (N)EVR. (#113) +- Added utility classes for working with (N)EVR. (#113) - Fixed an issue with multiple instances of `Specfile` not expanding macros in the right context. (#117) * Fri Oct 14 2022 Packit - 0.8.0-1 diff --git a/sources b/sources index cfd04b0..0e69208 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.9.0.tar.gz) = 58cab116a4a385fbf0ba7d131f89f2cdacf1c0a0e01db48dc06b7d9fd8fd1342667ca0121f2efa3a31dd49938483ece3f41d34ab7202294638fd00929e288032 +SHA512 (specfile-0.9.1.tar.gz) = d6a5689211816cb97218081e94bf8755f7b53a37d1c05a429e1d523c460e680c71c40d79a5ccb238c67ad58c8e81b7a083367b80830fd96c5d81e52e741b2906 From 0193c2747955d4d83a0524928e1bc523cd67b686 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 30 Nov 2022 11:33:42 +0000 Subject: [PATCH 11/21] [packit] 0.10.0 upstream release Upstream tag: 0.10.0 Upstream commit: daf36bc3 Signed-off-by: Packit --- README.packit | 2 +- plans/main.fmf | 2 +- python-specfile.spec | 10 +++++++--- sources | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/README.packit b/README.packit index 8979edb..d879225 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.63.1.dev12+gb534d99. +The file was generated using packit 0.63.2.dev18+ge80845e. diff --git a/plans/main.fmf b/plans/main.fmf index 76caf53..f88a335 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: 11b91ccce19780d1d99426ec234715150ce00659 + ref: daf36bc3d45ad5f6092ad1bc698c42f3d58247c5 execute: how: tmt diff --git a/python-specfile.spec b/python-specfile.spec index df5cc46..657c6ee 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -13,7 +13,7 @@ in a minimal diff.} Name: python-specfile -Version: 0.9.1 +Version: 0.10.0 Release: 1%{?dist} Summary: A library for parsing and manipulating RPM spec files @@ -58,7 +58,7 @@ sed -i 's/rpm-py-installer/rpm/' setup.cfg %pyproject_save_files specfile -%if 0%{?with_tests} +%if %{with tests} %check %pytest %endif @@ -69,8 +69,12 @@ sed -i 's/rpm-py-installer/rpm/' setup.cfg %changelog +* Wed Nov 30 2022 Packit - 0.10.0-1 +- Fixed an issue that caused empty lines originally inside changelog entries to appear at the end. (#140) +- Renamed the `ignore_missing_includes` option to a more general `force_parse`. If specified, it allows to attempt to parse the spec file even if one or more sources required to be present at parsing time are not available. Such sources include sources referenced from shell expansions in tag values and sources included using the `%include` directive. (#137) + * Sat Nov 12 2022 Packit - 0.9.1-1 -- `specfile` now supports localized tags (e.g. `Summary(fr)`) and tags with qualifiers (e.g. `Requires(post)`). +- `specfile` now supports localized tags (e.g. `Summary(fr)`) and tags with qualifiers (e.g. `Requires(post)`). It also follows more closely rpm parsing logic and doesn't fail on invalid section names. (#132) * Tue Oct 25 2022 Packit - 0.9.0-1 diff --git a/sources b/sources index 0e69208..c4b5dfb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.9.1.tar.gz) = d6a5689211816cb97218081e94bf8755f7b53a37d1c05a429e1d523c460e680c71c40d79a5ccb238c67ad58c8e81b7a083367b80830fd96c5d81e52e741b2906 +SHA512 (specfile-0.10.0.tar.gz) = a44b18bac80825ebcc7e3e3d0b2b4ae97134e9b59ce9c68c35d96feea20a71c75f15f8ea355e345f24fcd02dccfb7a12ab9f20f4cc41cf545d9e33e42f836d8b From 5c59e175875ecbc72b4a67da5c41b264ba6e853a Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 9 Dec 2022 14:21:55 +0000 Subject: [PATCH 12/21] [packit] 0.11.0 upstream release Upstream tag: 0.11.0 Upstream commit: ad039af9 Signed-off-by: Packit --- .packit.yaml | 6 ++++++ README.packit | 2 +- plans/main.fmf | 2 +- python-specfile.spec | 7 +++++-- sources | 2 +- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index 45490dc..9c36337 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -89,6 +89,12 @@ jobs: list_on_homepage: True preserve_project: True + - job: pull_from_upstream + trigger: release + dist_git_branches: + - fedora-all + - epel-9 + # downstream automation: - job: koji_build trigger: commit diff --git a/README.packit b/README.packit index d879225..a26b3a1 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.63.2.dev18+ge80845e. +The file was generated using packit 0.65.0. diff --git a/plans/main.fmf b/plans/main.fmf index f88a335..c9c404d 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: daf36bc3d45ad5f6092ad1bc698c42f3d58247c5 + ref: ad039af925cd104ba3921ee427230c87db567080 execute: how: tmt diff --git a/python-specfile.spec b/python-specfile.spec index 657c6ee..cfa7503 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -13,7 +13,7 @@ in a minimal diff.} Name: python-specfile -Version: 0.10.0 +Version: 0.11.0 Release: 1%{?dist} Summary: A library for parsing and manipulating RPM spec files @@ -69,8 +69,11 @@ sed -i 's/rpm-py-installer/rpm/' setup.cfg %changelog +* Fri Dec 09 2022 Packit - 0.11.0-1 +- Context managers (`Specfile.sections()`, `Specfile.tags()` etc.) can now be nested and combined together (with one exception - `Specfile.macro_definitions()`), and it is also possible to use tag properties (e.g. `Specfile.version`, `Specfile.license`) inside them. It is also possible to access the data directly, avoiding the `with` statement, by using the `content` property (e.g. `Specfile.tags().content`), but be aware that no modifications done to such data will be preserved. You must use `with` to make changes. (#153) + * Wed Nov 30 2022 Packit - 0.10.0-1 -- Fixed an issue that caused empty lines originally inside changelog entries to appear at the end. (#140) +- Fixed an issue that caused empty lines originally inside changelog entries to appear at the end. (#140) - Renamed the `ignore_missing_includes` option to a more general `force_parse`. If specified, it allows to attempt to parse the spec file even if one or more sources required to be present at parsing time are not available. Such sources include sources referenced from shell expansions in tag values and sources included using the `%include` directive. (#137) * Sat Nov 12 2022 Packit - 0.9.1-1 diff --git a/sources b/sources index c4b5dfb..9ce89fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.10.0.tar.gz) = a44b18bac80825ebcc7e3e3d0b2b4ae97134e9b59ce9c68c35d96feea20a71c75f15f8ea355e345f24fcd02dccfb7a12ab9f20f4cc41cf545d9e33e42f836d8b +SHA512 (specfile-0.11.0.tar.gz) = 39976c2d935b1f7d6b6f041ba57fb5ab72106f377b70e2e8d42b29dd829f0c8254aab0aa6b7ba8c92a58396b96ee8ac5360c13a9328390d468c5ebf125010843 From 88b4b5dda4e76a05e32bc1d71636e3318e6a176f Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 14 Dec 2022 16:41:55 +0000 Subject: [PATCH 13/21] [packit] 0.11.1 upstream release Upstream tag: 0.11.1 Upstream commit: 3581c3cd Signed-off-by: Packit --- plans/main.fmf | 2 +- python-specfile.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/plans/main.fmf b/plans/main.fmf index c9c404d..78407e2 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: ad039af925cd104ba3921ee427230c87db567080 + ref: 3581c3cdf539a528eda246383e3e26f101ecb156 execute: how: tmt diff --git a/python-specfile.spec b/python-specfile.spec index cfa7503..82a5066 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -13,7 +13,7 @@ in a minimal diff.} Name: python-specfile -Version: 0.11.0 +Version: 0.11.1 Release: 1%{?dist} Summary: A library for parsing and manipulating RPM spec files @@ -69,6 +69,10 @@ sed -i 's/rpm-py-installer/rpm/' setup.cfg %changelog +* Wed Dec 14 2022 Packit - 0.11.1-1 +- Tags enclosed in conditional macro expansions are not ignored anymore. (#156) +- Fixed context managers being shared between Specfile instances. (#157) + * Fri Dec 09 2022 Packit - 0.11.0-1 - Context managers (`Specfile.sections()`, `Specfile.tags()` etc.) can now be nested and combined together (with one exception - `Specfile.macro_definitions()`), and it is also possible to use tag properties (e.g. `Specfile.version`, `Specfile.license`) inside them. It is also possible to access the data directly, avoiding the `with` statement, by using the `content` property (e.g. `Specfile.tags().content`), but be aware that no modifications done to such data will be preserved. You must use `with` to make changes. (#153) diff --git a/sources b/sources index 9ce89fb..0366f12 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.11.0.tar.gz) = 39976c2d935b1f7d6b6f041ba57fb5ab72106f377b70e2e8d42b29dd829f0c8254aab0aa6b7ba8c92a58396b96ee8ac5360c13a9328390d468c5ebf125010843 +SHA512 (specfile-0.11.1.tar.gz) = 9f9e066f39c4178741f97e0b2b3295c38a19f386a8627d1ef058b6668010f7a41d8d0f1c2d8473674175ca8aa397ddd3d0b9af8120c961b5eb840309a110f5d5 From 3453cd5ad031f81ef2dcfc7eaee59aa67deb2ea2 Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 6 Jan 2023 13:52:38 +0000 Subject: [PATCH 14/21] [packit] 0.12.0 upstream release Upstream tag: 0.12.0 Upstream commit: 1f184858 Signed-off-by: Packit --- .packit.yaml | 6 +++--- README.packit | 2 +- plans/git_reference.py | 19 +++++++++++++++++-- plans/main.fmf | 2 +- plans/packit-integration.fmf | 19 +++++++++++++++++++ python-specfile.spec | 9 +++++++-- sources | 2 +- 7 files changed, 49 insertions(+), 10 deletions(-) create mode 100644 plans/packit-integration.fmf diff --git a/.packit.yaml b/.packit.yaml index 9c36337..e3a0e15 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -30,15 +30,15 @@ actions: # 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/ + - python3 -m build --sdist --outdir ./fedora/ - bash -c "ls -1t ./fedora/*.tar.gz | head -n 1" - get-current-version: python3 setup.py --version + get-current-version: python3 -m setuptools_scm 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 + - python3-build - python3-setuptools_scm jobs: diff --git a/README.packit b/README.packit index a26b3a1..c85c662 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.65.0. +The file was generated using packit 0.65.2. 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 78407e2..6834c92 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: 3581c3cdf539a528eda246383e3e26f101ecb156 + ref: 1f184858eb3a05e2b8d6a5d538e04acd96d377f8 execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf new file mode 100644 index 0000000..32cd2e4 --- /dev/null +++ b/plans/packit-integration.fmf @@ -0,0 +1,19 @@ +discover: + how: fmf + url: https://github.com/packit/packit + filter: tier:0 | tier:1 + ref: 2a071f16c039feeec25d26c68650bdda1787ae32 +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 diff --git a/python-specfile.spec b/python-specfile.spec index 82a5066..5e66a29 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -13,7 +13,7 @@ in a minimal diff.} Name: python-specfile -Version: 0.11.1 +Version: 0.12.0 Release: 1%{?dist} Summary: A library for parsing and manipulating RPM spec files @@ -69,8 +69,13 @@ sed -i 's/rpm-py-installer/rpm/' setup.cfg %changelog +* Fri Jan 06 2023 Packit - 0.12.0-1 +- All classes including `Specfile` itself can now be copied using the standard `copy()` and `deepcopy()` functions from `copy` module. (#176) +- `Section.name` attribute has been renamed to a more fitting `Section.id`. (#167) +- `setup.cfg` now uses `license_files` instead of deprecated `license_file`. (#162) + * Wed Dec 14 2022 Packit - 0.11.1-1 -- Tags enclosed in conditional macro expansions are not ignored anymore. (#156) +- Tags enclosed in conditional macro expansions are not ignored anymore. (#156) - Fixed context managers being shared between Specfile instances. (#157) * Fri Dec 09 2022 Packit - 0.11.0-1 diff --git a/sources b/sources index 0366f12..a30615b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.11.1.tar.gz) = 9f9e066f39c4178741f97e0b2b3295c38a19f386a8627d1ef058b6668010f7a41d8d0f1c2d8473674175ca8aa397ddd3d0b9af8120c961b5eb840309a110f5d5 +SHA512 (specfile-0.12.0.tar.gz) = af2e1cf639e06f50587696dce01723bbdbfcd20f78633e67ab9532831af5ec2530f5af2a5a5c6908fa802216b7a15430c1817851f014b5557f73ddd2ba165fdb From 67a63d0b5f2a2a7a08c8b38545614f1765446f21 Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 20 Jan 2023 15:24:29 +0000 Subject: [PATCH 15/21] [packit] 0.13.0 upstream release Upstream tag: 0.13.0 Upstream commit: 032a6e24 Signed-off-by: Packit --- README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- python-specfile.spec | 11 ++++++++--- sources | 2 +- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/README.packit b/README.packit index c85c662..df1d760 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.65.2. +The file was generated using packit 0.65.2.post26+ga788f71. diff --git a/plans/main.fmf b/plans/main.fmf index 6834c92..007082f 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: 1f184858eb3a05e2b8d6a5d538e04acd96d377f8 + ref: 032a6e2464699788d904e74a6aa92baec989dbbb execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index 32cd2e4..7a9c2e5 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: 2a071f16c039feeec25d26c68650bdda1787ae32 + ref: a4b3c4f91d339a3e52d5583e2bf8488fb55b0e51 adjust: - when: how == integration because: provide latest python-specfile rpm when running locally diff --git a/python-specfile.spec b/python-specfile.spec index 5e66a29..ddae226 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -13,7 +13,7 @@ in a minimal diff.} Name: python-specfile -Version: 0.12.0 +Version: 0.13.0 Release: 1%{?dist} Summary: A library for parsing and manipulating RPM spec files @@ -69,9 +69,14 @@ sed -i 's/rpm-py-installer/rpm/' setup.cfg %changelog +* Fri Jan 20 2023 Packit - 0.13.0-1 +- Added `Section.options` attribute for convenient manipulation of section options. (#183) +- specfile now supports single-line sections where section content is represented by a macro starting with a newline. (#182) +- Added `evr` argument to `Specfile.add_changelog_entry()`. This allows adding a changelog entry with an EVR value that's different from the current specfile's value. This makes it easier to reconstruct a specfile's `%changelog` based on another source using the higher level interface. (#181) + * Fri Jan 06 2023 Packit - 0.12.0-1 -- All classes including `Specfile` itself can now be copied using the standard `copy()` and `deepcopy()` functions from `copy` module. (#176) -- `Section.name` attribute has been renamed to a more fitting `Section.id`. (#167) +- All classes including `Specfile` itself can now be copied using the standard `copy()` and `deepcopy()` functions from `copy` module. (#176) +- `Section.name` attribute has been renamed to a more fitting `Section.id`. (#167) - `setup.cfg` now uses `license_files` instead of deprecated `license_file`. (#162) * Wed Dec 14 2022 Packit - 0.11.1-1 diff --git a/sources b/sources index a30615b..7b7a03d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.12.0.tar.gz) = af2e1cf639e06f50587696dce01723bbdbfcd20f78633e67ab9532831af5ec2530f5af2a5a5c6908fa802216b7a15430c1817851f014b5557f73ddd2ba165fdb +SHA512 (specfile-0.13.0.tar.gz) = e982df2b8d9ef1e443886b1cb22137b8d6def83135a7c1acfe9ae63f085b857a1fb095235e15718d2bdcf1275369ede94c9bdcad379398a57b2f7e3fbb2ade00 From 066bb2d04d578d133a7feebb2002facdc30d62a6 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 23 Jan 2023 15:03:00 +0000 Subject: [PATCH 16/21] [packit] 0.13.1 upstream release Upstream tag: 0.13.1 Upstream commit: 326ceffa Signed-off-by: Packit --- plans/main.fmf | 2 +- python-specfile.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/plans/main.fmf b/plans/main.fmf index 007082f..fc7cb75 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: 032a6e2464699788d904e74a6aa92baec989dbbb + ref: 326ceffa6ed735af6c49da7e62e4c17c4ce5ed3b execute: how: tmt diff --git a/python-specfile.spec b/python-specfile.spec index ddae226..ab3e17f 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -13,7 +13,7 @@ in a minimal diff.} Name: python-specfile -Version: 0.13.0 +Version: 0.13.1 Release: 1%{?dist} Summary: A library for parsing and manipulating RPM spec files @@ -69,6 +69,9 @@ sed -i 's/rpm-py-installer/rpm/' setup.cfg %changelog +* Mon Jan 23 2023 Packit - 0.13.1-1 +- Fixed a bug in section parsing that caused sections to be ignored when there were macro definitions spread across the spec file and not cumulated at the top. (#191) + * Fri Jan 20 2023 Packit - 0.13.0-1 - Added `Section.options` attribute for convenient manipulation of section options. (#183) - specfile now supports single-line sections where section content is represented by a macro starting with a newline. (#182) diff --git a/sources b/sources index 7b7a03d..8c3cc0f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.13.0.tar.gz) = e982df2b8d9ef1e443886b1cb22137b8d6def83135a7c1acfe9ae63f085b857a1fb095235e15718d2bdcf1275369ede94c9bdcad379398a57b2f7e3fbb2ade00 +SHA512 (specfile-0.13.1.tar.gz) = 264ab19ec450fd4475a07c683a19a1b4645c5d54305c4e2bd5a26b471d3c4e514e2dedf0d6351ba0593b33f93e8a73c68b2a7cf31db72dec5551d35ada796404 From 69000ae2c652d8284ca8d7935c832f1a38e498ff Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 30 Jan 2023 13:29:30 +0000 Subject: [PATCH 17/21] [packit] 0.13.2 upstream release Upstream tag: 0.13.2 Upstream commit: dc2440f6 Signed-off-by: Packit --- README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- python-specfile.spec | 5 ++++- sources | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/README.packit b/README.packit index df1d760..be03dc7 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.65.2.post26+ga788f71. +The file was generated using packit 0.66.0.post6+gedfbde6. diff --git a/plans/main.fmf b/plans/main.fmf index fc7cb75..3ed3a35 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: 326ceffa6ed735af6c49da7e62e4c17c4ce5ed3b + ref: dc2440f68076c8dccd7239487cbc800b4121f1b2 execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index 7a9c2e5..27bc3ba 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: a4b3c4f91d339a3e52d5583e2bf8488fb55b0e51 + ref: edfbde6e77552293e3c8888460b68f6726d5f115 adjust: - when: how == integration because: provide latest python-specfile rpm when running locally diff --git a/python-specfile.spec b/python-specfile.spec index ab3e17f..ec30bbd 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -13,7 +13,7 @@ in a minimal diff.} Name: python-specfile -Version: 0.13.1 +Version: 0.13.2 Release: 1%{?dist} Summary: A library for parsing and manipulating RPM spec files @@ -69,6 +69,9 @@ sed -i 's/rpm-py-installer/rpm/' setup.cfg %changelog +* Mon Jan 30 2023 Packit - 0.13.2-1 +- Fixed infinite loop that occured when section options were followed by whitespace. (#197) + * Mon Jan 23 2023 Packit - 0.13.1-1 - Fixed a bug in section parsing that caused sections to be ignored when there were macro definitions spread across the spec file and not cumulated at the top. (#191) diff --git a/sources b/sources index 8c3cc0f..22d3252 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.13.1.tar.gz) = 264ab19ec450fd4475a07c683a19a1b4645c5d54305c4e2bd5a26b471d3c4e514e2dedf0d6351ba0593b33f93e8a73c68b2a7cf31db72dec5551d35ada796404 +SHA512 (specfile-0.13.2.tar.gz) = b8303b951039106990ab7783a82d7ae23cdf14957bd0c4103d11312e1055662c8188fc13ae91fc1497266dee038298f679857f89d096892e9b50c8f52dd856c5 From 38e4c433cc9338b0fe7bad4708d466ce67c6208f Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 23 Feb 2023 16:16:02 +0000 Subject: [PATCH 18/21] [packit] 0.14.0 upstream release Upstream tag: 0.14.0 Upstream commit: 78e2e8b3 Signed-off-by: Packit --- README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- python-specfile.spec | 8 +++++--- sources | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/README.packit b/README.packit index be03dc7..9693a25 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.66.0.post6+gedfbde6. +The file was generated using packit 0.68.0.post11+gf18369e. diff --git a/plans/main.fmf b/plans/main.fmf index 3ed3a35..107ae72 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: dc2440f68076c8dccd7239487cbc800b4121f1b2 + ref: 78e2e8b30abd9e67e934f87c2aac0854f5a4b204 execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index 27bc3ba..2c55725 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: edfbde6e77552293e3c8888460b68f6726d5f115 + ref: f18369ebcfbf9207f771fb1e9ec8e6c4b4467318 adjust: - when: how == integration because: provide latest python-specfile rpm when running locally diff --git a/python-specfile.spec b/python-specfile.spec index ec30bbd..a8334dc 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -13,7 +13,7 @@ in a minimal diff.} Name: python-specfile -Version: 0.13.2 +Version: 0.14.0 Release: 1%{?dist} Summary: A library for parsing and manipulating RPM spec files @@ -41,8 +41,6 @@ Summary: %{summary} %prep %autosetup -p1 -n specfile-%{version} -# Use packaged RPM python bindings downstream -sed -i 's/rpm-py-installer/rpm/' setup.cfg %generate_buildrequires @@ -69,6 +67,10 @@ sed -i 's/rpm-py-installer/rpm/' setup.cfg %changelog +* Thu Feb 23 2023 Packit - 0.14.0-1 +- Fixed a bug that broke parsing in case spec file contained conditionalized macro definitions or similar constructs. (#209) +- Specfile no longer depends on rpm-py-installer, it now depends directly on rpm. (#207) + * Mon Jan 30 2023 Packit - 0.13.2-1 - Fixed infinite loop that occured when section options were followed by whitespace. (#197) diff --git a/sources b/sources index 22d3252..881b65f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.13.2.tar.gz) = b8303b951039106990ab7783a82d7ae23cdf14957bd0c4103d11312e1055662c8188fc13ae91fc1497266dee038298f679857f89d096892e9b50c8f52dd856c5 +SHA512 (specfile-0.14.0.tar.gz) = 4e9a34d77f3d6eb5704253607bb5c3afeb66b0a2224ad76762dbd9c8de6ef2b9aacb581258323456861ee348ed1251b8b93aa485c79d0de67407c74ae12bfd9f From d871fc8557299b8dbd4c9f86fed1de4760ba4cf9 Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 10 Mar 2023 11:25:08 +0000 Subject: [PATCH 19/21] [packit] 0.15.0 upstream release Upstream tag: 0.15.0 Upstream commit: efb94f1d Signed-off-by: Packit --- README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 7 ++++++- python-specfile.spec | 6 +++++- sources | 2 +- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/README.packit b/README.packit index 9693a25..4a7d1af 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.68.0.post11+gf18369e. +The file was generated using packit 0.69.0.post2+g0d966f8. diff --git a/plans/main.fmf b/plans/main.fmf index 107ae72..0c51115 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: 78e2e8b30abd9e67e934f87c2aac0854f5a4b204 + ref: efb94f1d791eebbe8f45f066674ec64e71a518cb execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index 2c55725..22e1dff 100644 --- a/plans/packit-integration.fmf +++ b/plans/packit-integration.fmf @@ -2,7 +2,12 @@ discover: how: fmf url: https://github.com/packit/packit filter: tier:0 | tier:1 - ref: f18369ebcfbf9207f771fb1e9ec8e6c4b4467318 + ref: 2e6d5610d67deffc8643046172db1d422b83e7a8 +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 diff --git a/python-specfile.spec b/python-specfile.spec index a8334dc..7c60a15 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -13,7 +13,7 @@ in a minimal diff.} Name: python-specfile -Version: 0.14.0 +Version: 0.15.0 Release: 1%{?dist} Summary: A library for parsing and manipulating RPM spec files @@ -67,6 +67,10 @@ Summary: %{summary} %changelog +* Fri Mar 10 2023 Packit - 0.15.0-1 +- Parsing the spec file by RPM is now performed only if really necessary, greatly improving performance in certain scenarios. (#212) +- Checked that license is a valid SPDX license. + * Thu Feb 23 2023 Packit - 0.14.0-1 - Fixed a bug that broke parsing in case spec file contained conditionalized macro definitions or similar constructs. (#209) - Specfile no longer depends on rpm-py-installer, it now depends directly on rpm. (#207) diff --git a/sources b/sources index 881b65f..fb75752 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.14.0.tar.gz) = 4e9a34d77f3d6eb5704253607bb5c3afeb66b0a2224ad76762dbd9c8de6ef2b9aacb581258323456861ee348ed1251b8b93aa485c79d0de67407c74ae12bfd9f +SHA512 (specfile-0.15.0.tar.gz) = d2f8829dbe5e4e526690982a08e3fbbbbc69c403097767bf2b4a5226d433cbeb25ee56b9b32601ed3be02edf44396509a23e9420c58b24759d38bd45406c7f2e From 9ec0d0ccdfe9312651f761f5cb935405b9012d4d Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 20 Apr 2023 17:03:54 +0000 Subject: [PATCH 20/21] [packit] 0.16.0 upstream release Upstream tag: 0.16.0 Upstream commit: 15be0aba --- README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- python-specfile.spec | 5 ++++- sources | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/README.packit b/README.packit index 4a7d1af..2dd6ac1 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.post2+g0d966f8. +The file was generated using packit 0.74.0.post25+ga1e902b. diff --git a/plans/main.fmf b/plans/main.fmf index 0c51115..2f365ff 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: efb94f1d791eebbe8f45f066674ec64e71a518cb + ref: 15be0abadeb910dd273cc4dbf4f08c777d8576f0 execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index 22e1dff..52b6315 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: 2e6d5610d67deffc8643046172db1d422b83e7a8 + ref: a1e902bd8783e1964b9379ea93ef1a062d1d179c prepare: - how: install copr: packit/packit-dev diff --git a/python-specfile.spec b/python-specfile.spec index 7c60a15..5b0df4a 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -13,7 +13,7 @@ in a minimal diff.} Name: python-specfile -Version: 0.15.0 +Version: 0.16.0 Release: 1%{?dist} Summary: A library for parsing and manipulating RPM spec files @@ -67,6 +67,9 @@ Summary: %{summary} %changelog +* Thu Apr 20 2023 Packit - 0.16.0-1 +- Added `Specfile.has_autorelease` property to detect if a spec file uses the `%%autorelease` macro. (#221) + * Fri Mar 10 2023 Packit - 0.15.0-1 - Parsing the spec file by RPM is now performed only if really necessary, greatly improving performance in certain scenarios. (#212) - Checked that license is a valid SPDX license. diff --git a/sources b/sources index fb75752..8a3e292 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.15.0.tar.gz) = d2f8829dbe5e4e526690982a08e3fbbbbc69c403097767bf2b4a5226d433cbeb25ee56b9b32601ed3be02edf44396509a23e9420c58b24759d38bd45406c7f2e +SHA512 (specfile-0.16.0.tar.gz) = 296e73d2ea5fe14a1c2f8504cd9772ad5310366d765fb75651a22aaf7021107b16a53c5b8535f85c846005e557552932f483aaabd68487a245717cb7ef789e7d From 59eed68aac832659bf63e8cbedb809a46606b452 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 11 May 2023 09:49:24 +0000 Subject: [PATCH 21/21] [packit] 0.17.0 upstream release Upstream tag: 0.17.0 Upstream commit: bc4fbbdd --- README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- python-specfile.spec | 10 +++++++++- sources | 2 +- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/README.packit b/README.packit index 2dd6ac1..c6a9a6c 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.74.0.post25+ga1e902b. +The file was generated using packit 0.75.0.post9+g9ce4c01. diff --git a/plans/main.fmf b/plans/main.fmf index 2f365ff..74edd5b 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: 15be0abadeb910dd273cc4dbf4f08c777d8576f0 + ref: bc4fbbdd7073f69b8ab9a1e1e3afc5140b5c348f execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index 52b6315..a0f0582 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: a1e902bd8783e1964b9379ea93ef1a062d1d179c + ref: 33d32c702b3d26a81e12984d925222ce9935dee7 prepare: - how: install copr: packit/packit-dev diff --git a/python-specfile.spec b/python-specfile.spec index 5b0df4a..15a7b66 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -13,7 +13,7 @@ in a minimal diff.} Name: python-specfile -Version: 0.16.0 +Version: 0.17.0 Release: 1%{?dist} Summary: A library for parsing and manipulating RPM spec files @@ -25,6 +25,10 @@ Source0: %{pypi_source specfile} BuildArch: noarch BuildRequires: python%{python3_pkgversion}-devel +%if %{with tests} +# tests/unit/test_guess_packager.py +BuildRequires: git-core +%endif %description @@ -67,6 +71,10 @@ Summary: %{summary} %changelog +* Thu May 11 2023 Packit - 0.17.0-1 +- Added a new `guess_packager()` function that uses similar heuristics as `rpmdev-packager`, meaning that the `Specfile.add_changelog_entry()` method no longer requires `rpmdev-packager` to guess the changelog entry author. (#220) +- The `Specfile.add_changelog_entry()` method now uses dates based on UTC instead of the local timezone. (#223) + * Thu Apr 20 2023 Packit - 0.16.0-1 - Added `Specfile.has_autorelease` property to detect if a spec file uses the `%%autorelease` macro. (#221) diff --git a/sources b/sources index 8a3e292..2794e00 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.16.0.tar.gz) = 296e73d2ea5fe14a1c2f8504cd9772ad5310366d765fb75651a22aaf7021107b16a53c5b8535f85c846005e557552932f483aaabd68487a245717cb7ef789e7d +SHA512 (specfile-0.17.0.tar.gz) = 236c9a3b74b0c767d1ea0b40a459fb082f59c3e6ce4e0c1fc93525f67d1aa176e56a230d181d0007799b1cb781fccfa94d226cbac06550bde3cc2f8259a8eb09