diff options
author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2018-08-29 11:09:27 -0400 |
---|---|---|
committer | Amar Tumballi <amarts@redhat.com> | 2018-09-03 09:14:44 +0000 |
commit | af0d5a9b5375a5cd87ac10b429e2b9934718ce5b (patch) | |
tree | ae376c8ca9c6b643ea615feff5d946d48e0363ee /tests | |
parent | eda69f2e327f5f65d14190eed1821a0f45b2f914 (diff) |
core: python3
see https://review.gluster.org/#/c/19788/,
https://review.gluster.org/#/c/19871/,
https://review.gluster.org/#/c/19952/,
https://review.gluster.org/#/c/20104/,
https://review.gluster.org/#/c/20162/,
https://review.gluster.org/#/c/20185/,
https://review.gluster.org/#/c/20207/,
https://review.gluster.org/#/c/20227/,
https://review.gluster.org/#/c/20307/,
https://review.gluster.org/#/c/20320/,
https://review.gluster.org/#/c/20332/,
https://review.gluster.org/#/c/20364/,
https://review.gluster.org/#/c/20441/, and
https://review.gluster.org/#/c/20484
shebangs changed from /usr/bin/python2 to /usr/bin/python3.
(Reminder, various distribution packaging guidelines require use
of explicit python version and don't allow '#!/usr/bin/env python',
regardless of how handy that idiom may be.)
glusterfs.spec(.in) package python{2,3}-gluster and python2 or
python3 dependencies as appropriate.
configure(.ac):
+ test for and use python2 or python3 as appropriate. If build
machine has python2 and python3, use python3. Override by
setting PYTHON=/usr/bin/python2 when running configure.
+ PYTHONDEV_CPPFLAGS from python[23]-config --includes is a
better match to the original python sysconfig.get_python_inc().
All those other extraneous flags breaks the build.
+ Only change the shebangs once. Changing them over and over
again, e.g., during a `make glusterrpms` in extras/LinuxRPM
just sends make (is it really make that's looping?) into an
infinite loop. If you figure out why, let me know.
+ Oldest python2 is python2.6 on CentOS 6 and Debian 8 (Jessie).
Everything else has 2.7 or 3.x
+ logic from https://review.gluster.org/c/glusterfs/+/21050, which
needs to be removed/merged after that patch is merged.
Builds on CentOS 6, CentOS 7, Fedora 28, Fedora rawhide, and the
mysterious RHEL > 7.
Change-Id: Idae21d3b6f58b32372e1daa0d234e491e563198f
updates: #411
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/bugs/distribute/overlap.py | 2 | ||||
-rwxr-xr-x | tests/bugs/nfs/socket-as-fifo.py | 2 | ||||
-rwxr-xr-x | tests/features/ipctest.py | 2 | ||||
-rwxr-xr-x | tests/utils/create-files.py | 2 | ||||
-rwxr-xr-x | tests/utils/getfattr.py | 2 | ||||
-rwxr-xr-x | tests/utils/gfid-access.py | 2 | ||||
-rwxr-xr-x | tests/utils/pidof.py | 2 | ||||
-rwxr-xr-x | tests/utils/setfattr.py | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/tests/bugs/distribute/overlap.py b/tests/bugs/distribute/overlap.py index 726389a78d6..5416991b7a3 100755 --- a/tests/bugs/distribute/overlap.py +++ b/tests/bugs/distribute/overlap.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 from __future__ import print_function import sys diff --git a/tests/bugs/nfs/socket-as-fifo.py b/tests/bugs/nfs/socket-as-fifo.py index 796b8ef671b..2c8ef26a804 100755 --- a/tests/bugs/nfs/socket-as-fifo.py +++ b/tests/bugs/nfs/socket-as-fifo.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # # Create a unix domain socket and test if it is a socket (and not a fifo/pipe). # diff --git a/tests/features/ipctest.py b/tests/features/ipctest.py index b64d4f86895..9ff7a271cf2 100755 --- a/tests/features/ipctest.py +++ b/tests/features/ipctest.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 from __future__ import print_function import ctypes diff --git a/tests/utils/create-files.py b/tests/utils/create-files.py index 594072a359a..6b72a853509 100755 --- a/tests/utils/create-files.py +++ b/tests/utils/create-files.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # This script was developed by Vijaykumar Koppad (vkoppad@redhat.com) # The latest version of this script can found at diff --git a/tests/utils/getfattr.py b/tests/utils/getfattr.py index b0dba822d64..e2357901a93 100755 --- a/tests/utils/getfattr.py +++ b/tests/utils/getfattr.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 from __future__ import print_function import os diff --git a/tests/utils/gfid-access.py b/tests/utils/gfid-access.py index 6d892a37b2e..377c504270f 100755 --- a/tests/utils/gfid-access.py +++ b/tests/utils/gfid-access.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # # Copyright (c) 2011-2014 Red Hat, Inc. <http://www.redhat.com> # This file is part of GlusterFS. diff --git a/tests/utils/pidof.py b/tests/utils/pidof.py index 9f4a6a48a39..19deeb1fe21 100755 --- a/tests/utils/pidof.py +++ b/tests/utils/pidof.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 from __future__ import print_function import sys diff --git a/tests/utils/setfattr.py b/tests/utils/setfattr.py index 9a7daeb1be4..364ad8b6966 100755 --- a/tests/utils/setfattr.py +++ b/tests/utils/setfattr.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 import os import sys |