Include rc/post/dev in version. #260

gordonmessmer · 2021-01-11T23:23:41Z

No description provided.

gordonmessmer · 2021-01-15T23:32:24Z

@decathorpe Would you review these changes?

Overall: rather than discarding a/b/rc/dev/post information provided in Python versions, those will be preserved and transformed into something that rpm understands. Because the version string may be modified for the rpm Version:, but used literally in filesystem paths, the original value needs to be stored in a define/global value in the spec file, the same way that package names are handled. Most values of %{version} are replaced with %{pypi_version}, similar to the use of %{pypi_name}

In filters.py, I've introduced two new filters. One will convert a/b/rc/dev to a tilde suffix which should be supported on RHEL 6 and 7 (I'll test that asap), and the other will convert a/b/rc/dev to a tilde suffix and also convert post to a caret suffix. If the original version doesn't need any transformation, the filter returns "%{pypi_version}", which produces a spec file that needs minimal modification for future releases. The exception is for the changelog, where the pypi_version macro can't be used, so the filters accept a flag indicating whether or not the macro or the literal version is returned.

Also in filters, macroed_url is updated to recognize the use of pypi_version rather than version.

package_getters.py is updated to preserve the version suffix which was previously discarded.

The majority of this PR is changes to the templates and the tests.

gordonmessmer · 2021-01-17T01:10:14Z

CentOS 7 can install packages with ~ version, and:

# rpmdev-vercmp 1.9 1.9.rc1
1.9 < 1.9.rc1
# rpmdev-vercmp 1.9 1.9~rc1
1.9 > 1.9~rc1

decathorpe · 2021-02-06T14:44:25Z

This is a bit above my paygrade ...

The thing that*s weird though is that this PR has six commits of which 5 have the same message, making it hard to review, since you can't tell which commit is supposed to do what. Breaking the "flesh" of this change into multiple commits would also make it easier to review :)

gordonmessmer · 2021-02-06T22:05:30Z

I'd intended to squash it all to one since the vast majority of this change is just the same update to many templates and the corresponding test spec files. I've reorganized the commits.

decathorpe · 2021-02-07T09:18:44Z

Thanks! I'll leave some comments inline.

decathorpe · 2021-02-07T09:22:34Z

pyp2rpm/filters.py

+        return default
+    rpm_version, rpm_suffix = re_match.groups()
+    if rpm_suffix.startswith("dev"):
+        return '{}~~{}'.format(rpm_version, rpm_suffix)


Do you think we actually should support -dev versions? Doing so makes this non-standard double-tilde necessary, and it's at least not covered by the Fedora packaging guidelines at all.

The double tilde is what the Python dist RPM dependency generator does for dev.

decathorpe · 2021-02-07T09:23:26Z

pyp2rpm/filters.py

+    else:
+        default = version
+    re_match = re.compile(
+        r"(\d+\.?\d*\.?\d*\.?\d*)\.?((?:a|b|rc|post|dev)\d*)").search(


Why does this regex contain post as choice, but the one above does not?
And should we actually support post and dev versions in pyp2rpm?

I've added documentation to the filter functions. rpm 4.10 - 4.14 support pre-release suffixes. 4.15 added support for a post-release suffix.

decathorpe · 2021-02-07T09:26:05Z

Last question: When running pyp2rpm now, will it choose the latest version regardless of alpha / beta / rc status now? At least I think by default it should use the latest "stable" release, and using a newer prerelease should be optional (either by specifying the version manually or by setting a --use-prereleases flag or similar).

hroncok · 2021-02-07T11:28:23Z

pyp2rpm/pyp2rpm/bin.py

Lines 127 to 130 in 24002cc

    
           @click.option('--prerelease', 
        
                         help='Use the latest release, even if it is a pre-release ' 
        
                         '(default: disabled).', 
        
                         is_flag=True)

hroncok · 2021-02-07T11:30:14Z

pyp2rpm/filters.py

@@ -71,11 +74,49 @@ def macroed_url(url):
    return url


+def rpm_version_410(version, use_macro=True):
+    if use_macro:
+        default = '%{pypi_version}'


Where is this from?

Oh, it is defined in the spec file.

hroncok · 2021-02-07T11:34:48Z

Oh. So I was thinking. What if we have a %{pypi_version} macro in Fedora and EPEL?

Usage:

Version: 7.5.0~~dev1
%{pypi_version} -> 7.5.0dev1

Version: 7.5.0~b4
%{pypi_version} -> 7.5.0b4

Version: 7.5.0
%{pypi_version} -> 7.5.0

Version: 7.5.0^post1
%{pypi_version} -> 7.5.0post1


%{pypi_version 7.5.0~~dev1} -> 7.5.0dev1
%{pypi_version 7.5.0~b4} -> 7.5.0b4
%{pypi_version 7.5.0} -> 7.5.0
%{pypi_version 7.5.0^post1} -> 7.5.0post1

I would definitively use it in some of the packages. There is %{version_nodots} from rust srpm macros, but it adds - by default :/ See also rpm-software-management/rpm#1219

gordonmessmer · 2021-02-07T19:32:50Z

Oh. So I was thinking. What if we have a %{pypi_version} macro in Fedora and EPEL?

From a maintenance point of view: I lean toward consistency with existing behavior. pyp2rpm already uses %{pypi_name} for the unmodified name, and converts to an rpm-semantics name where those are required. If we do the inverse here, storing the converted version in the Version field and converting to the pypi semantics for the filesystem paths, we should have a good reason for the inconsistent behavior.

From an implementation point of view: Python is a bit permissive with version parsing, and I worry that someday we'd see packages where attempting to convert back to the original version didn't work (as it would not have in issue 259, which prompted this change).

>>> from pkg_resources import parse_version
>>> parse_version('0.1.post8')
<Version('0.1.post8')>
>>> parse_version('0.1post8')
<Version('0.1.post8')>

hroncok · 2021-02-08T14:58:45Z

I see. I'd still like to have macro I can use that would strip tildes and carets from version :(

decathorpe · 2021-02-09T11:30:39Z

I see. I'd still like to have macro I can use that would strip tildes and carets from version :(

The Rust macros have some version of this, at least for stripping tilde to convert back to semver (%{version_no_tilde}).

hroncok · 2021-02-09T11:47:15Z

Yes but that replaces the tilde with dash by default and the only way to wwork around it is to provide empty string as the first argument to that macro. Which is not readable: %{version_no_tilde %{quote:}}

…o RPM equivalent.

…discarded.

rather than "version". Where the RPM version is needed, use the new macros to convert the original version string to the RPM equivalent.

gordonmessmer · 2021-06-20T22:03:56Z

@decathorpe

gordonmessmer · 2021-06-20T22:54:25Z

I see. I'd still like to have macro I can use that would strip tildes and carets from version :(

https://src.fedoraproject.org/rpms/python-rpm-macros/pull-request/101

decathorpe · 2021-06-22T08:08:26Z

I think I already reviewed this once ... unless you made some drastic changes, and it works ...

gordonmessmer mentioned this pull request Jan 11, 2021

egg-info syntax wrong in epel7.spec #259

Open

gordonmessmer force-pushed the issue_259 branch from 4ecff4f to eeaad79 Compare February 6, 2021 22:03

decathorpe reviewed Feb 7, 2021

View reviewed changes

hroncok reviewed Feb 7, 2021

View reviewed changes

gordonmessmer added 2 commits June 19, 2021 23:44

Add new macros which convert Python pre and post release versions int…

da738e9

…o RPM equivalent.

Preserve Python pre and post release versions, which were previously …

c539763

…discarded.

gordonmessmer force-pushed the issue_259 branch from 3496fad to 2831a94 Compare June 20, 2021 06:45

gordonmessmer added 2 commits June 20, 2021 14:41

Add a new spec variable, "pypi_version" to templates, and use that

daec0ca

rather than "version". Where the RPM version is needed, use the new macros to convert the original version string to the RPM equivalent.

Add documentation to the rpm_version filters.

1842ce9

gordonmessmer force-pushed the issue_259 branch from 2831a94 to 1842ce9 Compare June 20, 2021 21:41

gordonmessmer merged commit 39b53ef into master Jun 28, 2021

gordonmessmer deleted the issue_259 branch June 28, 2021 15:32

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Include rc/post/dev in version. #260

Include rc/post/dev in version. #260

gordonmessmer commented Jan 11, 2021

gordonmessmer commented Jan 15, 2021

gordonmessmer commented Jan 17, 2021

decathorpe commented Feb 6, 2021

gordonmessmer commented Feb 6, 2021

decathorpe commented Feb 7, 2021

decathorpe Feb 7, 2021

hroncok Feb 7, 2021

decathorpe Feb 7, 2021

gordonmessmer Feb 7, 2021

decathorpe commented Feb 7, 2021

hroncok commented Feb 7, 2021

hroncok Feb 7, 2021

hroncok Feb 7, 2021

hroncok commented Feb 7, 2021

gordonmessmer commented Feb 7, 2021

hroncok commented Feb 8, 2021

decathorpe commented Feb 9, 2021

hroncok commented Feb 9, 2021

gordonmessmer commented Jun 20, 2021

gordonmessmer commented Jun 20, 2021

decathorpe commented Jun 22, 2021

Include rc/post/dev in version. #260

Include rc/post/dev in version. #260

Conversation

gordonmessmer commented Jan 11, 2021

gordonmessmer commented Jan 15, 2021

gordonmessmer commented Jan 17, 2021

decathorpe commented Feb 6, 2021

gordonmessmer commented Feb 6, 2021

decathorpe commented Feb 7, 2021

decathorpe Feb 7, 2021

Choose a reason for hiding this comment

hroncok Feb 7, 2021

Choose a reason for hiding this comment

decathorpe Feb 7, 2021

Choose a reason for hiding this comment

gordonmessmer Feb 7, 2021

Choose a reason for hiding this comment

decathorpe commented Feb 7, 2021

hroncok commented Feb 7, 2021

hroncok Feb 7, 2021

Choose a reason for hiding this comment

hroncok Feb 7, 2021

Choose a reason for hiding this comment

hroncok commented Feb 7, 2021

gordonmessmer commented Feb 7, 2021

hroncok commented Feb 8, 2021

decathorpe commented Feb 9, 2021

hroncok commented Feb 9, 2021

gordonmessmer commented Jun 20, 2021

gordonmessmer commented Jun 20, 2021

decathorpe commented Jun 22, 2021