pkg-utils python sitelib for SLES15 #8969
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The name of python sitelib macro changes Signed-off-by: Shaun Tancheff <[email protected]>
Codecov Report
@@ Coverage Diff @@
## master #8969 +/- ##
==========================================
- Coverage 78.74% 78.57% -0.17%
==========================================
Files 388 388
Lines 119972 119972
==========================================
- Hits 94466 94271 -195
- Misses 25506 25701 +195
Continue to review full report at Codecov.
|
behlendorf
approved these changes
Jul 2, 2019
|
@Conan-Kudo would you mind taking a look at this. |
|
Ugh, this is where SUSE's completely different implementation of the Python macros kind of bites us... I'll look into it. |
Conan-Kudo
suggested changes
Jul 8, 2019
rpm/generic/zfs.spec.in
Outdated
| @@ -87,17 +87,28 @@ | |||
| %define __python_pkg_version 2 | |||
| %define __python_cffi_pkg python-cffi | |||
| %define __python_setuptools_pkg python-setuptools | |||
| %define __python_sitelib %{python_sitelib} | |||
There was a problem hiding this comment.
just do this:
%define __python_sitelib %(%{__python} -Ic "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
There was a problem hiding this comment.
This %{__python} -Ic only works for python3.
However I can use the selected __python value to cleanup and make it generic.
There was a problem hiding this comment.
-I is not required. You can swap it for -Es instead.
rpm/generic/zfs.spec.in
Outdated
| %define __python_sitelib %{python3_sitelib} | ||
| %else | ||
| %define __python_sitelib %{python_sitelib} | ||
| %endif |
rpm/generic/zfs.spec.in
Outdated
| %define __python_sitelib %{python%{__python_pkg_version}_sitelib} | ||
| %else | ||
| %define __python_sitelib %{python_sitelib} | ||
| %endif |
The name of python sitelib macro changes Signed-off-by: Shaun Tancheff <[email protected]> --- Changes since v1: Incorporate comments from @Conan-Kudo to simplify patch
The name of python sitelib macro changes Signed-off-by: Shaun Tancheff <[email protected]> --- Changes since v1: Correct __py_major -> __py_major_version Changes since v1: Incorporate comments from @Conan-Kudo to simplify patch
Conan-Kudo
suggested changes
Jul 9, 2019
rpm/generic/zfs.spec.in
Outdated
| @@ -99,6 +99,13 @@ | |||
| %define __python_cffi_pkg python%{__python_pkg_version}-cffi | |||
| %define __python_setuptools_pkg python%{__python_pkg_version}-setuptools | |||
| %endif | |||
| %define __py_major_version %(%{__python} -c "import sys; print(str(sys.version_info[0]))") | |||
| %if 0%{?__py_major_version} >= 3 | |||
| %define __python_sitelib %(%{__python} -Ic "from distutils.sysconfig import get_python_lib; print(get_python_lib())") | |||
There was a problem hiding this comment.
Instead of using -Ic, use -Esc and then we don't have to care about the %__py_major_version and that logic can be dropped.
We don't need to reference %python_sitelib at all either.
There was a problem hiding this comment.
Even better .. Thanks!
The name of python sitelib macro changes Signed-off-by: Shaun Tancheff <[email protected]> --- Changes since v3: Use python -Esc to find python_lib Changes since v2: Correct __py_major -> __py_major_version Changes since v1: Incorporate comments from @Conan-Kudo to simplify patch
Conan-Kudo
approved these changes
Jul 9, 2019
behlendorf
approved these changes
Jul 9, 2019
behlendorf
added
Status: Accepted
TulsiJain
pushed a commit
to TulsiJain/zfs
that referenced
this pull request
Jul 20, 2019
Use python -Esc to set __python_sitelib. Reviewed-by: Neal Gompa <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Shaun Tancheff <[email protected]> Closes openzfs#8969
TulsiJain
pushed a commit
to TulsiJain/zfs
that referenced
this pull request
Jul 20, 2019
Use python -Esc to set __python_sitelib. Reviewed-by: Neal Gompa <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Shaun Tancheff <[email protected]> Closes openzfs#8969
tonyhutter
pushed a commit
to tonyhutter/zfs
that referenced
this pull request
Aug 13, 2019
Use python -Esc to set __python_sitelib. Reviewed-by: Neal Gompa <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Shaun Tancheff <[email protected]> Closes openzfs#8969
tonyhutter
pushed a commit
to tonyhutter/zfs
that referenced
this pull request
Aug 22, 2019
Use python -Esc to set __python_sitelib. Reviewed-by: Neal Gompa <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Shaun Tancheff <[email protected]> Closes openzfs#8969
tonyhutter
pushed a commit
to tonyhutter/zfs
that referenced
this pull request
Aug 23, 2019
Use python -Esc to set __python_sitelib. Reviewed-by: Neal Gompa <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Shaun Tancheff <[email protected]> Closes openzfs#8969
tonyhutter
pushed a commit
to tonyhutter/zfs
that referenced
this pull request
Sep 17, 2019
Use python -Esc to set __python_sitelib. Reviewed-by: Neal Gompa <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Shaun Tancheff <[email protected]> Closes openzfs#8969
tonyhutter
pushed a commit
to tonyhutter/zfs
that referenced
this pull request
Sep 18, 2019
Use python -Esc to set __python_sitelib. Reviewed-by: Neal Gompa <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Shaun Tancheff <[email protected]> Closes openzfs#8969
tonyhutter
pushed a commit
that referenced
this pull request
Sep 26, 2019
Use python -Esc to set __python_sitelib. Reviewed-by: Neal Gompa <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Shaun Tancheff <[email protected]> Closes #8969
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The name of python sitelib macro changed for openSuSE 15
Attempting to run make pkg-utils fails with errors expecting to find
Processing files: python3-pyzfs-0.8.1-1.noarch
error: File not found: /tmp/.../usr/lib/python2.7/site-packages/libzfs_core/*
error: File not found: /tmp/.../usr/lib/python2.7/site-packages/pyzfs*
Executing(%doc): /bin/sh -e /tmp/zfs-build-shaun-3VGQcteZ/TMP/rpm-tmp.ONu8QE
This resolves the issue by updating the rpm macro python3_sitelib where required.
Signed-off-by: Shaun Tancheff [email protected]