Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correct a flaw in the Python 3 version checking (for 2.1) #12636

Merged
merged 1 commit into from
Nov 1, 2021

Conversation

rincebrain
Copy link
Contributor

Motivation and Context

As keeps happening, someone in IRC said "hey, 2.1.1 breaks building on my Fedora 35 system".

Description

I cherrypicked 08cd071, cleaned up the .github conflicts, and here we are.
(Yes I remember this comment about it still being broken in some cases, I'll go correct that Soon(tm), but since this fixes many people right now, it seemed worthwhile to pull now...)

How Has This Been Tested?

I applied it to zfs-2.1-release and built on Fedora 34 (3.9.X) and -next (3.10.0). Built fine after.

I have admittedly not run through any of the pyzfs test suite bits.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Performance enhancement (non-breaking change which improves efficiency)
  • Code cleanup (non-breaking change which makes code smaller or more readable)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Library ABI change (libzfs, libzfs_core, libnvpair, libuutil and libzfsbootenv)
  • Documentation (a change to man pages or other documentation)

Checklist:

It turns out the ax_python_devel.m4 version check assumes that
("3.X+1.0" >= "3.X.0") is True in Python, which is not when X+1
is 10 or above and X is not. (Also presumably X+1=100 and ...)

So let's remake the check to behave consistently, using the
"packaging" or (if absent) the "distlib" modules.

(Also, update the Github workflows to use the new packages.)

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
Closes: openzfs#12073
@behlendorf behlendorf added Status: Code Review Needed Ready for review and testing Type: Building Indicates an issue related to building binaries labels Oct 11, 2021
@Evernow
Copy link

Evernow commented Oct 19, 2021

Note that Fedora 35 is scheduled to be released on the 26th, would be nice if this can get into a stable release before then.

@tonyhutter tonyhutter merged commit 8cd9f20 into openzfs:zfs-2.1.2-staging Nov 1, 2021
ghost pushed a commit to truenas/zfs that referenced this pull request Nov 3, 2021
It turns out the ax_python_devel.m4 version check assumes that
("3.X+1.0" >= "3.X.0") is True in Python, which is not when X+1
is 10 or above and X is not. (Also presumably X+1=100 and ...)

So let's remake the check to behave consistently, using the
"packaging" or (if absent) the "distlib" modules.

(Also, update the Github workflows to use the new packages.)

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
Closes: openzfs#12073
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Status: Code Review Needed Ready for review and testing Type: Building Indicates an issue related to building binaries
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants