]> granicus.if.org Git - zfs/commit
pyzfs: python3 support (build system)
authorBrian Behlendorf <behlendorf1@llnl.gov>
Wed, 31 Oct 2018 16:22:59 +0000 (09:22 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Sun, 6 Jan 2019 18:39:41 +0000 (10:39 -0800)
commit6e72a5b9b61066146deafda39ab8158c559f5f15
tree9439fbf7ba661e5d12fec2699a3d9c554791cc3b
parent4b1c4062d050e2cfa609e1040384d1f3b5f04f52
pyzfs: python3 support (build system)

Almost all of the Python code in the respository has been updated
to be compatibile with Python 2.6, Python 3.4, or newer.  The only
exceptions are arc_summery3.py which requires Python 3, and pyzfs
which requires at least Python 2.7.  This allows us to maintain a
single version of the code and support most default versions of
python.  This change does the following:

* Sets the default shebang for all Python scripts to python3.  If
  only Python 2 is available, then at install time scripts which
  are compatible with Python 2 will have their shebangs replaced
  with /usr/bin/python.  This is done for compatibility until
  Python 2 goes end of life.  Since only the installed versions
  are changed this means Python 3 must be installed on the system
  for test-runner when testing in-tree.

* Added --with-python=<2|3|3.4,etc> configure option which sets
  the PYTHON environment variable to target a specific python
  version.  By default the newest installed version of Python
  will be used or the preferred distribution version when
  creating pacakges.

* Fixed --enable-pyzfs configure checks so they are run when
  --enable-pyzfs=check and --enable-pyzfs=yes.

* Enabled pyzfs for Python 3.4 and newer, which is now supported.

* Renamed pyzfs package to python<VERSION>-pyzfs and updated to
  install in the appropriate site location.  For example, when
  building with --with-python=3.4 a python34-pyzfs will be
  created which installs in /usr/lib/python3.4/site-packages/.

* Renamed the following python scripts according to the Fedora
  guidance for packaging utilities in /bin

  - dbufstat.py     -> dbufstat
  - arcstat.py      -> arcstat
  - arc_summary.py  -> arc_summary
  - arc_summary3.py -> arc_summary3

* Updated python-cffi package name.  On CentOS 6, CentOS 7, and
  Amazon Linux it's called python-cffi, not python2-cffi.  For
  Python3 it's called python3-cffi or python3x-cffi.

* Install one version of arc_summary.  Depending on the version
  of Python available install either arc_summary2 or arc_summary3
  as arc_summary.  The user output is only slightly different.

Reviewed-by: John Ramsden <johnramsden@riseup.net>
Reviewed-by: Neal Gompa <ngompa@datto.com>
Reviewed-by: loli10K <ezomori.nozomu@gmail.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #8096
29 files changed:
.gitignore
cmd/arc_summary/Makefile.am
cmd/arc_summary/arc_summary2 [moved from cmd/arc_summary/arc_summary.py with 99% similarity]
cmd/arc_summary/arc_summary3 [moved from cmd/arc_summary/arc_summary3.py with 99% similarity]
cmd/arcstat/Makefile.am
cmd/arcstat/arcstat [moved from cmd/arcstat/arcstat.py with 97% similarity]
cmd/dbufstat/Makefile.am
cmd/dbufstat/dbufstat [moved from cmd/dbufstat/dbufstat.py with 97% similarity]
config/always-python.m4 [new file with mode: 0644]
config/always-pyzfs.m4
config/deb.am
config/zfs-build.m4
contrib/pyzfs/Makefile.am
contrib/pyzfs/setup.py
rpm/generic/zfs.spec.in
tests/test-runner/bin/Makefile.am
tests/test-runner/bin/test-runner.py
tests/test-runner/bin/zts-report.py
tests/zfs-tests/include/commands.cfg
tests/zfs-tests/tests/functional/arc/dbufstats_001_pos.ksh
tests/zfs-tests/tests/functional/arc/dbufstats_002_pos.ksh
tests/zfs-tests/tests/functional/cli_user/misc/arc_summary3_001_pos.ksh
tests/zfs-tests/tests/functional/cli_user/misc/arc_summary_001_pos.ksh
tests/zfs-tests/tests/functional/cli_user/misc/arc_summary_002_neg.ksh
tests/zfs-tests/tests/functional/cli_user/misc/arcstat_001_pos.ksh
tests/zfs-tests/tests/functional/cli_user/misc/dbufstat_001_pos.ksh
tests/zfs-tests/tests/functional/pyzfs/.gitignore [new file with mode: 0644]
tests/zfs-tests/tests/functional/pyzfs/Makefile.am
tests/zfs-tests/tests/functional/pyzfs/pyzfs_unittest.ksh.in [moved from tests/zfs-tests/tests/functional/pyzfs/pyzfs_unittest.ksh with 95% similarity]