Depend on Python3 instead of EOL Python2 (#2829)

edenhill · edenhill · commit cedb2917396d · 2020-04-29T11:18:44.000+02:00
diff --git a/.doozer.json b/.doozer.json
@@ -5,7 +5,7 @@
       "buildenv": "xenial-amd64",
       "builddeps": [
         "build-essential",
-        "python",
+        "python3",
         "zlib1g-dev",
         "libssl-dev",
         "libsasl2-dev",
@@ -26,7 +26,7 @@
       "buildenv": "xenial-i386",
       "builddeps": [
         "build-essential",
-        "python",
+        "python3",
         "zlib1g-dev",
         "libssl-dev",
         "libsasl2-dev",
@@ -48,7 +48,7 @@
       "buildenv": "xenial-armhf",
       "builddeps": [
         "build-essential",
-        "python",
+        "python3",
         "zlib1g-dev",
         "libssl-dev",
         "libsasl2-dev",
@@ -71,7 +71,7 @@
       "buildenv": "stretch-mips",
       "builddeps": [
         "build-essential",
-        "python",
+        "python3",
         "zlib1g-dev",
         "libssl-dev",
         "libsasl2-dev",
@@ -94,7 +94,7 @@
       "buildenv": "xenial-amd64",
       "builddeps": [
         "build-essential",
-        "python",
+        "python3",
         "zlib1g-dev",
         "libssl-dev",
         "libsasl2-dev",
diff --git a/.travis.yml b/.travis.yml
@@ -10,6 +10,9 @@ env:
 addons:
   apt:
     packages:
+    - python3
+    - python3-pip
+    - python3-setuptools
     # required by openssl installer
     - perl
 
@@ -65,7 +68,7 @@ matrix:
    before_script:
     - wget -O rapidjson-dev.deb https://launchpad.net/ubuntu/+archive/primary/+files/rapidjson-dev_1.1.0+dfsg2-3_all.deb
     - sudo dpkg -i rapidjson-dev.deb
-    - sudo pip install -r tests/requirements.txt
+    - sudo pip3 install -r tests/requirements.txt
     - sudo apt update
     - sudo apt install -y doxygen graphviz gdb
     - ./configure --install-deps --disable-lz4-ext --prefix="$PWD/dest"
diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@ DOC_FILES+=	LICENSE LICENSES.txt INTRODUCTION.md README.md \
 		CONFIGURATION.md STATISTICS.md
 
 PKGNAME?=	librdkafka
-VERSION?=	$(shell python packaging/get_version.py src/rdkafka.h)
+VERSION?=	$(shell python3 packaging/get_version.py src/rdkafka.h)
 
 # Jenkins CI integration
 BUILD_NUMBER ?= 1
diff --git a/configure.self b/configure.self
@@ -264,10 +264,10 @@ void foo (void) {
 	mkl_mkvar_set SYMDUMPER SYMDUMPER 'echo'
     fi
 
-    # The linker-script generator (lds-gen.py) requires python
+    # The linker-script generator (lds-gen.py) requires python3
     if [[ $WITH_LDS == y ]]; then
-        if ! mkl_command_check python "HAVE_PYTHON" "disable" "python -V"; then
-            mkl_err "disabling linker-script since python is not available"
+        if ! mkl_command_check python3 "HAVE_PYTHON" "disable" "python3 -V"; then
+            mkl_err "disabling linker-script since python3 is not available"
             mkl_mkvar_set WITH_LDS WITH_LDS "n"
         fi
     fi
diff --git a/debian/control b/debian/control
@@ -2,7 +2,7 @@ Source: librdkafka
 Priority: optional
 Maintainer: Faidon Liambotis <paravoid@debian.org>
 Uploaders: Christos Trochalakis <ctrochalakis@debian.org>
-Build-Depends: debhelper (>= 9), zlib1g-dev, libssl-dev, libsasl2-dev, liblz4-dev, python
+Build-Depends: debhelper (>= 9), zlib1g-dev, libssl-dev, libsasl2-dev, liblz4-dev, python3
 Standards-Version: 3.9.7
 Section: libs
 Homepage: https://github.com/edenhill/librdkafka
diff --git a/lds-gen.py b/lds-gen.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # librdkafka - Apache Kafka C library
 #
diff --git a/packaging/RELEASE.md b/packaging/RELEASE.md
@@ -138,7 +138,7 @@ On a Linux host with docker installed, this will also require S3 credentials
 to be set up.
 
     $ cd packaging/nuget
-    $ pip install -r requirements.txt  # if necessary
+    $ pip3 install -r requirements.txt  # if necessary
     $ ./release.py v0.11.1-RC1
 
 Test the generated librdkafka.redist.0.11.1-RC1.nupkg and
diff --git a/packaging/alpine/build-alpine.sh b/packaging/alpine/build-alpine.sh
@@ -9,7 +9,7 @@ if [ "$1" = "--in-docker" ]; then
     # Runs in docker, performs the actual build.
     shift
 
-    apk add bash curl gcc g++ make musl-dev bsd-compat-headers git python perl
+    apk add bash curl gcc g++ make musl-dev bsd-compat-headers git python3 perl
 
     git clone /v /librdkafka
 
diff --git a/packaging/archlinux/PKGBUILD b/packaging/archlinux/PKGBUILD
@@ -8,7 +8,7 @@ arch=('x86_64')
 source=('git+https://github.com/edenhill/librdkafka#branch=master')
 sha256sums=('SKIP')
 depends=(glibc libsasl lz4 openssl zlib zstd)
-makedepends=(bash git python)
+makedepends=(bash git python3)
 
 pkgver() {
 	cd "$pkgname"
diff --git a/packaging/debian/control b/packaging/debian/control
@@ -1,7 +1,7 @@
 Source: librdkafka
 Priority: optional
 Maintainer: Faidon Liambotis <paravoid@debian.org>
-Build-Depends: debhelper (>= 9), zlib1g-dev, libssl-dev, libsasl2-dev, python
+Build-Depends: debhelper (>= 9), zlib1g-dev, libssl-dev, libsasl2-dev, python3
 Standards-Version: 3.9.6
 Section: libs
 Homepage: https://github.com/edenhill/librdkafka
diff --git a/packaging/debian/librdkafka.dsc b/packaging/debian/librdkafka.dsc
@@ -8,7 +8,7 @@ Homepage: https://github.com/edenhill/librdkafka
 Standards-Version: 3.9.6
 Vcs-Browser: https://github.com/edenhill/librdkafka/tree/master
 Vcs-Git: git://github.com/edenhill/librdkafka.git -b master
-Build-Depends: debhelper (>= 9), zlib1g-dev, libssl-dev, libsasl2-dev, python
+Build-Depends: debhelper (>= 9), zlib1g-dev, libssl-dev, libsasl2-dev, python3
 Package-List:
  librdkafka-dev deb libdevel optional arch=any
  librdkafka1 deb libs optional arch=any
diff --git a/packaging/get_version.py b/packaging/get_version.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import sys
 
@@ -18,4 +18,4 @@
 patch = int(version[6:8], 16)
 version = '.'.join(str(item) for item in (major, minor, patch))
 
-print version
+print(version)
diff --git a/packaging/nuget/artifact.py b/packaging/nuget/artifact.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 #
 # Collects CI artifacts from S3 storage, downloading them
diff --git a/packaging/nuget/packaging.py b/packaging/nuget/packaging.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # NuGet packaging script.
 # Assembles a NuGet package using CI artifacts in S3
diff --git a/packaging/nuget/release.py b/packaging/nuget/release.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 #
 # NuGet release packaging tool.
diff --git a/packaging/nuget/zfile/zfile.py b/packaging/nuget/zfile/zfile.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import os
 import tarfile
diff --git a/packaging/rpm/librdkafka.spec b/packaging/rpm/librdkafka.spec
@@ -9,7 +9,7 @@ License: BSD-2-Clause
 URL:     https://github.com/edenhill/librdkafka
 Source:	 librdkafka-%{version}.tar.gz
 
-BuildRequires: zlib-devel libstdc++-devel gcc >= 4.1 gcc-c++ openssl-devel cyrus-sasl-devel python
+BuildRequires: zlib-devel libstdc++-devel gcc >= 4.1 gcc-c++ openssl-devel cyrus-sasl-devel python3
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %define _source_payload w9.gzdio
diff --git a/packaging/rpm/mock-on-docker.sh b/packaging/rpm/mock-on-docker.sh
@@ -28,7 +28,7 @@ if [[ ! -f /.dockerenv ]]; then
 
 else
 
-    yum install -y python mock make git
+    yum install -y python3 mock make git
 
     cfg_file=/etc/mock/${MOCK_CONFIG}.cfg
     ls -la /etc/mock
diff --git a/packaging/tools/build-debian.sh b/packaging/tools/build-debian.sh
@@ -25,7 +25,7 @@ fi
 set -u
 
 apt-get update
-apt-get install -y gcc g++ zlib1g-dev python2.7 git-core make
+apt-get install -y gcc g++ zlib1g-dev python3 git-core make
 
 
 # Copy the librdkafka git archive to a new location to avoid messing
diff --git a/packaging/tools/gh-release-checksums.py b/packaging/tools/gh-release-checksums.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Calculate checksums for GitHub release artifacts/assets.
 #
diff --git a/tests/LibrdkafkaTestApp.py b/tests/LibrdkafkaTestApp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # librdkafka test trivup app module
 #
diff --git a/tests/README.md b/tests/README.md
@@ -25,7 +25,7 @@ to alternate directory, e.g., `TRIVUP_ROOT=$HOME/trivup make full`.
 
 First install trivup:
 
-    $ pip install trivup
+    $ pip3 install trivup
 
 Bring up a Kafka cluster (with the specified version) and start an interactive
 shell, when the shell is exited the cluster is brought down and deleted.
diff --git a/tests/autotest.sh b/tests/autotest.sh
@@ -21,7 +21,7 @@ pushd tests
 source _venv/bin/activate
 
 # Install trivup that is used to bring up a cluster.
-pip install -U trivup
+pip3 install -U trivup
 
 # Run tests that automatically spin up their clusters
 export KAFKA_VERSION
diff --git a/tests/broker_version_tests.py b/tests/broker_version_tests.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 #
 # Run librdkafka regression tests on with different SASL parameters
diff --git a/tests/cluster_testing.py b/tests/cluster_testing.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 #
 # Cluster testing helper
diff --git a/tests/interactive_broker_version.py b/tests/interactive_broker_version.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 #
 # Run librdkafka regression tests on different supported broker versions.
diff --git a/tests/performance_plot.py b/tests/performance_plot.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 
 import sys, json
diff --git a/tests/sasl_test.py b/tests/sasl_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 #
 # Run librdkafka regression tests on with different SASL parameters
@@ -11,9 +11,6 @@
 from cluster_testing import LibrdkafkaTestCluster, print_report_summary, print_test_report_summary, read_scenario_conf
 from LibrdkafkaTestApp import LibrdkafkaTestApp
 
-
-import time
-import tempfile
 import os
 import sys
 import argparse
@@ -225,7 +222,7 @@ def handle_report (report, version, suite):
             else:
                 tests_to_run = tests
             report = test_it(version, tests=tests_to_run, conf=_conf, rdkconf=_rdkconf,
-                             debug=args.debug, scenario=scenario)
+                             debug=args.debug, scenario=args.scenario)
 
             # Handle test report
             report['version'] = version

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/bin/env python`
	`1`	`+#!/usr/bin/env python3`
`2`	`2`	`#`
`3`	`3`	`# librdkafka - Apache Kafka C library`
`4`	`4`	`#`