Removed Python 2 and Python 3.5- support

Deprecation of Python versions below 3.6 gives opportunity to unify the build and install requirements for OpenZFS packages. The minimal supported Python version is 3.6 as this is the most recent Python package CentOS/RHEL 7 users can get. Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: Rich Ercolani <[email protected]> Reviewed-by: John Kennedy <[email protected]> Signed-off-by: szubersk <[email protected]> Closes openzfs#12925
tonyhutter · Feb 10, 2022 · 83797e2 · 83797e2
1 parent 2e3b3e3
commit 83797e2
Show file tree

Hide file tree

Showing 20 changed files with 64 additions and 1,316 deletions.
diff --git a/.github/workflows/checkstyle.yaml b/.github/workflows/checkstyle.yaml
@@ -15,7 +15,7 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get install --yes -qq build-essential autoconf libtool gawk alien fakeroot linux-headers-$(uname -r)
-        sudo apt-get install --yes -qq zlib1g-dev uuid-dev libattr1-dev libblkid-dev libselinux-dev libudev-dev libssl-dev python-dev python-setuptools python-cffi python3 python3-dev python3-setuptools python3-cffi
+        sudo apt-get install --yes -qq zlib1g-dev uuid-dev libattr1-dev libblkid-dev libselinux-dev libudev-dev libssl-dev python3 python3-dev python3-setuptools python3-cffi
         # packages for tests
         sudo apt-get install --yes -qq parted lsscsi ksh attr acl nfs-kernel-server fio
         sudo apt-get install --yes -qq mandoc cppcheck pax-utils devscripts

diff --git a/.github/workflows/zfs-tests-functional.yml b/.github/workflows/zfs-tests-functional.yml
@@ -25,7 +25,7 @@ jobs:
           zlib1g-dev uuid-dev libblkid-dev libselinux-dev \
           xfslibs-dev libattr1-dev libacl1-dev libudev-dev libdevmapper-dev \
           libssl-dev libffi-dev libaio-dev libelf-dev libmount-dev \
-          libpam0g-dev pamtester python-dev python-setuptools python-cffi \
+          libpam0g-dev pamtester libcurl4-openssl-dev \
           python3 python3-dev python3-setuptools python3-cffi python3-packaging
     - name: Autogen.sh
       run: |

diff --git a/.github/workflows/zfs-tests-sanity.yml b/.github/workflows/zfs-tests-sanity.yml
@@ -21,7 +21,7 @@ jobs:
           zlib1g-dev uuid-dev libblkid-dev libselinux-dev \
           xfslibs-dev libattr1-dev libacl1-dev libudev-dev libdevmapper-dev \
           libssl-dev libffi-dev libaio-dev libelf-dev libmount-dev \
-          libpam0g-dev pamtester python-dev python-setuptools python-cffi \
+          libpam0g-dev pamtester libcurl4-openssl-dev \
           python3 python3-dev python3-setuptools python3-cffi python3-packaging
     - name: Autogen.sh
       run: |

diff --git a/.github/workflows/zloop.yml b/.github/workflows/zloop.yml
@@ -22,7 +22,6 @@ jobs:
           xfslibs-dev libattr1-dev libacl1-dev libudev-dev libdevmapper-dev \
           libssl-dev libffi-dev libaio-dev libelf-dev libmount-dev \
           libpam0g-dev \
-          python-dev python-setuptools python-cffi python-packaging \
           python3 python3-dev python3-setuptools python3-cffi python3-packaging
     - name: Autogen.sh
       run: |

diff --git a/cmd/arc_summary/Makefile.am b/cmd/arc_summary/Makefile.am
@@ -1,13 +1,8 @@
 bin_SCRIPTS = arc_summary
 
 CLEANFILES = arc_summary
-EXTRA_DIST = arc_summary2 arc_summary3
-
-if USING_PYTHON_2
-SCRIPT = arc_summary2
-else
+EXTRA_DIST = arc_summary3
 SCRIPT = arc_summary3
-endif
 
 arc_summary: $(SCRIPT)
 	cp $< $@