diff --git a/.packit.yaml b/.packit.yaml index c326264..837931a 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: @@ -34,7 +34,8 @@ packages: get-current-version: python3 -m setuptools_scm specfile-epel8: - <<: *specfile + upstream_package_name: specfile + downstream_package_name: python-specfile specfile_path: &specfile_path_epel8 epel8/python-specfile.spec files_to_sync: - *specfile_path_epel8 @@ -43,140 +44,102 @@ packages: dest: plans/ - src: .fmf/ dest: .fmf/ + srpm_build_deps: + - python3-setuptools_scm actions: - <<: *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" - - 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 + get-current-version: python3 setup.py --version jobs: - - &copr_build_pr - job: copr_build + - job: copr_build trigger: pull_request packages: [specfile] targets: - fedora-all - - fedora-all-aarch64 - epel-9 - - <<: *copr_build_pr + - job: copr_build + trigger: pull_request packages: [specfile-epel8] targets: - epel-8 - - <<: *copr_build_pr - packages: [specfile-epel10] - targets: - - epel-10-all - - &copr_build_commit_main - job: copr_build + - job: copr_build trigger: commit branch: main packages: [specfile] targets: - fedora-all - - fedora-all-aarch64 - epel-9 project: packit-dev list_on_homepage: True preserve_project: True - - <<: *copr_build_commit_main + - job: copr_build + trigger: commit + branch: main packages: [specfile-epel8] targets: - epel-8 - - <<: *copr_build_commit_main - packages: [specfile-epel10] - targets: - - epel-10-all + project: packit-dev + list_on_homepage: True + preserve_project: True - - &copr_build_commit_stable - job: copr_build + - 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 project: packit-stable list_on_homepage: True preserve_project: True - - &copr_build_release - job: copr_build + - job: copr_build trigger: release packages: [specfile] targets: - fedora-all - - fedora-all-aarch64 - epel-9 project: packit-releases list_on_homepage: True preserve_project: True - - <<: *copr_build_release + - job: copr_build + trigger: release packages: [specfile-epel8] targets: - epel-8 - - <<: *copr_build_release - packages: [specfile-epel10] - targets: - - epel-10-all + project: packit-releases + list_on_homepage: True + preserve_project: True - - &tests - job: tests + - job: tests trigger: pull_request packages: [specfile] tmt_plan: "smoke|full|packit-integration" targets: - fedora-all - epel-9 - - <<: *tests - identifier: performance - tmt_plan: performance - targets: - - fedora-rawhide - - <<: *tests + - job: tests + trigger: pull_request packages: [specfile-epel8] tmt_plan: "smoke|full" use_internal_tf: true targets: - epel-8-x86_64: - distros: [RHEL-8.10.0-Nightly] + epel-8: + distros: [RHEL-8] # enable EPEL tf_extra_params: environments: @@ -186,102 +149,66 @@ jobs: set -x dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm %end - - <<: *tests - packages: [specfile-epel10] - tmt_plan: "smoke|full" + + - job: tests + trigger: pull_request + packages: [specfile] + identifier: performance + tmt_plan: performance targets: - - epel-10-all + - fedora-rawhide - - &propose_downstream - job: propose_downstream + - job: propose_downstream trigger: release packages: [specfile] dist_git_branches: rawhide: fast_forward_merge_into: - fedora-branched - - eln epel-9: {} - - <<: *propose_downstream + - job: propose_downstream + trigger: release packages: [specfile-epel8] dist_git_branches: - epel-8 - - <<: *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 - - &pull_from_upstream - job: pull_from_upstream + - job: pull_from_upstream trigger: release packages: [specfile] dist_git_branches: rawhide: fast_forward_merge_into: - fedora-branched - - eln epel-9: {} - - <<: *pull_from_upstream + - job: pull_from_upstream + trigger: release packages: [specfile-epel8] dist_git_branches: - epel-8 - - <<: *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 - - &koji_build - job: 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 - - - &bodhi_update - job: bodhi_update + - epel-9 + - job: koji_build trigger: commit - packages: [specfile] + packages: [specfile-epel8] + packit_instances: ["stg"] + allowed_pr_authors: ["packit-stg", "packit"] + dist_git_branches: + - epel-8 + + - job: bodhi_update + trigger: commit + packages: [specfile-epel8] 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 9bb65f0..2e89534 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.13.0.post1.dev2+g84134016c. +The file was generated using packit 0.103.0.post1.dev4+g30e2fb58. diff --git a/plans/full.fmf b/plans/full.fmf index dc00841..4ed1316 100644 --- a/plans/full.fmf +++ b/plans/full.fmf @@ -8,11 +8,3 @@ 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 299f169..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: a07560dd2609cf23add5deeadc103033611b7b22 + ref: 442e2a976fc608a33e6e4a970e3420ce9aafc8ac execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index 2d0af65..a6b2670 100644 --- a/plans/packit-integration.fmf +++ b/plans/packit-integration.fmf @@ -1,14 +1,13 @@ discover: how: fmf url: https://github.com/packit/packit - filter: tag:full - ref: 87042fcac49435dd55a1b989ed0c6ead290e703d + filter: tier:0 | tier:1 + ref: 30e2fb5839ded7dd901fd2852d32e7b02e416270 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 @@ -23,7 +22,6 @@ 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 or distro == rhel-9 or distro == centos-9 or distro == centos-stream-9 + - 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 044ba0f..d093810 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.38.0 +%global base_version 0.32.6 #global prerelease rc1 %global package_version %{base_version}%{?prerelease:~%{prerelease}} @@ -77,66 +77,6 @@ sed -i 's/setuptools_scm\[toml\]>=7/setuptools_scm[toml]/' pyproject.toml %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) - -* Fri Sep 19 2025 Python Maint - 0.37.0-2 -- Rebuilt for Python 3.14.0rc3 bytecode - -* Fri Sep 05 2025 Packit - 0.37.0-1 -- Added support for Elbrus E2K CPU architectures. (#484) - -* Fri Aug 15 2025 Python Maint - 0.36.0-5 -- Rebuilt for Python 3.14.0rc2 bytecode - -* Fri Jul 25 2025 Fedora Release Engineering - 0.36.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Fri Jun 06 2025 Python Maint - 0.36.0-3 -- Rebuilt for Python 3.14 - -* 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) - -* Tue Jun 03 2025 Python Maint - 0.35.1-2 -- Rebuilt for Python 3.14 - -* Fri May 16 2025 Packit - 0.35.1-1 -- We have fixed a bug that caused changes to get lost when a spec file passed as a path was replaced or deleted. (#470) - -* 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) - -* 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 - -* Sat Jan 18 2025 Fedora Release Engineering - 0.33.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* 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 - * Wed Nov 13 2024 Packit - 0.32.6-1 - New minor release for testing in CBS Koji diff --git a/sources b/sources index 46cc24d..a94b119 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.38.0.tar.gz) = bfd60434b868fd191fb68d5b2fa319db45df80397b6c1000a63d9fe947e998a8a86fcf6a76c0ae9b6ef3321d2b04d4dd9bc565a610bfb117faa64180342fda4d +SHA512 (specfile-0.32.6.tar.gz) = 1ea328772f2779854f9b0099a106322fa08a8f6fd2b6e9e55fe5d9c9724bcb3dc102f43291a0cdcdc3cc7e973d928c5d47fe47836d364da5cd2a5276d2e1baba