From 365bc4056b943996d7a235eb86eaa2a2b0f5604d Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 31 Jul 2023 13:16:45 +0000 Subject: [PATCH] [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-f38-update-propose_downstream ``` --- .packit.yaml | 160 ++++++++++++++++++++++++----------- README.packit | 2 +- plans/main.fmf | 2 +- plans/packit-integration.fmf | 5 +- python-specfile.spec | 5 +- sources | 2 +- 6 files changed, 123 insertions(+), 53 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index e3a0e15..3ae2f09 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -1,101 +1,162 @@ --- -# 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 -m build --sdist --outdir ./fedora/ - - bash -c "ls -1t ./fedora/*.tar.gz | head -n 1" - 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 +copy_upstream_release_description: true -srpm_build_deps: - - python3-build - - python3-setuptools_scm +packages: + specfile: + upstream_package_name: specfile + downstream_package_name: python-specfile + specfile_path: &specfile_path fedora/python-specfile.spec + files_to_sync: + - *specfile_path + - .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 ./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 jobs: - - job: propose_downstream - trigger: release - dist_git_branches: - - fedora-all - - epel-9 - - job: copr_build trigger: pull_request + packages: [specfile] targets: - fedora-all - epel-9 - - - job: tests + - job: copr_build trigger: pull_request + packages: [specfile-epel8] targets: - - fedora-all - - epel-9 + - 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 + - job: copr_build + trigger: commit + branch: main + packages: [specfile-epel8] + targets: + - epel-8 + project: packit-dev + list_on_homepage: True + preserve_project: True - job: copr_build trigger: commit branch: stable + packages: [specfile] targets: - fedora-stable - 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 + project: packit-stable + list_on_homepage: True + preserve_project: True - job: copr_build trigger: release + packages: [specfile] targets: - fedora-all - epel-9 project: packit-releases list_on_homepage: True preserve_project: True - - - job: pull_from_upstream + - job: copr_build trigger: release + packages: [specfile-epel8] + targets: + - epel-8 + project: packit-releases + list_on_homepage: True + preserve_project: True + + - 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 - # downstream automation: - job: koji_build trigger: commit packit_instances: ["stg"] @@ -103,9 +164,12 @@ 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 a03aeb9..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.78.0.post2+g694f5f6. +The file was generated using packit 0.78.1. diff --git a/plans/main.fmf b/plans/main.fmf index f94f1fe..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: 8aae0b14df14935ff3153703525f14644f3fa1da + ref: 4486a88c56fdfdea0c8b1e16f32a76056e9faba3 execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index 35017ad..48ba7dd 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: 854782d52103b1640a295b3262364a4122051452 + ref: 4b998555d18e3e7abfb7a521b3b65a34de02dc76 prepare: - how: install copr: packit/packit-dev @@ -22,3 +22,6 @@ adjust: 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 a7ba017..f628dd5 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -13,7 +13,7 @@ in a minimal diff.} Name: python-specfile -Version: 0.20.0 +Version: 0.20.2 Release: 1%{?dist} Summary: A library for parsing and manipulating RPM spec files @@ -71,6 +71,9 @@ Summary: %{summary} %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) + * Thu Jul 13 2023 Packit - 0.20.0-1 - Fixed infinite loop when removing macros with `%` in the name. (#244) - Added a possibility to undefine system macros by setting a macro value to `None` in the `macros` argument of the `Specfile` constructor. (#244) diff --git a/sources b/sources index a16b3f8..636f4d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.20.0.tar.gz) = 110919bc8445b743f8c480c2bb04dd007ab896b2323b79185ba5a5f85468e0806f0073e292c46458b30268f416037a321612ef7d5bcafea8764b32c166f5a316 +SHA512 (specfile-0.20.2.tar.gz) = 754a9108589822a17dce79f022c3c2edd5ae86fc3894b874afe6761f18275f7b567af8f953adc474cfe24e67672cae61df26429a5d8a087d6aff8b396f891183