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 b6c870b..b604f33 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -7,7 +7,7 @@ Main focus is on modifying existing spec files, any change should result in a minimal diff.} -%global base_version 0.34.1 +%global base_version 0.34.2 #global prerelease rc1 %global package_version %{base_version}%{?prerelease:~%{prerelease}} @@ -77,6 +77,9 @@ sed -i 's/setuptools_scm\[toml\]>=7/setuptools_scm[toml]/' pyproject.toml %changelog +* 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