fedpkg

#544 Add support for new EPEL10 major/minor schema
Merged by onosek. Opened by dherrera.
dherrera/fedpkg epel10-work  into  master

Download 544.patch

These changes are required to support EPEL10 new schemas [0]

Things that changed
- Support for reading mayor/minor version on the epel name through the code
- Fixed assert_valid_epel_package to work correctly with EPEL10 [1]
- Changed load_rpmdefines method to get correct information regarding EPEL10.X branches

[0] https://discussion.fedoraproject.org/t/epel-10-proposal/44304
[1] https://bugzilla.redhat.com/show_bug.cgi?id=2005139

1 new commit added

  • Fix mayor -> major

Double checking: Is this still a work in progress?

rebased onto af020e9ac9e77aa87a4e77453703139e8bb293ff

I think we can use a similar regex here as we use in other files, that doesn't limit the major or minor version to two digits.

epel\d+(?:\.\d+)?$

Instead of defining url twice, I think it would make sense to use an if/else statement here and always assign url once. We can also drop the comments about currently only having the latest symlink as it's no longer accurate.

We may want to test with an actual Fedora branch name like f36 instead of fedora36.

I think this is a typo and should be rawhide.

3 new commits added

  • Fix new test typo
  • Fix assert_valid_epel_package url for EPEL10+
  • Remove up to 2 digit limitation for EPEL branch name

Addressed @carlwgeorge 's comments and fixed an issue in my assert_valid_epel_package implementation where epel10+ didn't point to the correct path.

rebased onto af020e9ac9e77aa87a4e77453703139e8bb293ff

Remade the branch so that it's easier to navigate.
Old branch is at dherrera/fedpkg/old-epel10-work

This looks good to me.

@onosek, what do you think? We're eager to get this bit of code out to unblock requesting epel10 branches. I know you just recently released version 1.45, so if you're not wanting to tag another release so soon we'd be happy to add a patch to the fedpkg spec file to include this.

1 new commit added

  • Intentation fix reported by flake8

6 new commits added

  • Intentation fix reported by flake8
  • Extend load_rpmdefines to work with EPEL10+
  • Add EPEL10+ url pattern on assert_valid_epel_package
  • Test url usage in assert_valid_epel_package
  • Add EPEL10 branch name cases as valid
  • Test for valid EPEL branch names

The latest commit is just an indentation fix found after fixing flake8 in the CI env ( PR #553 ).

rebased onto 0db445b09c1f556407e29e985a204f9e39cbdaae

Commit a270fc79 fixes this pull-request

Pull-Request has been merged by onosek

Thanks for the change. I just put the flake8 fix from the last commit directly into the relevant commit.
Metadata
None
No Tags
Static archive. pagure.io was sunset in 2026; this is a read-only snapshot.
Red Hat Logo

Fedora is sponsored by Red Hat. Learn more about the relationship between Red Hat and Fedora »

© Red Hat, Inc. and others.