From 8c43f510a3a97977bc499b1b12c350169eb8076f Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Fri, 26 Feb 2021 10:50:51 -0600 Subject: [PATCH] Update debian packaging to python3 patch by Brandon Williams; reviewed by Mick Semb Wever for CASSANDRA-16396 --- CHANGES.txt | 1 + debian/compat | 2 +- debian/control | 4 ++-- debian/rules | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 376f4c8291..9f0a5a7ab8 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.0.25: + * Update debian packaging for python3 (CASSANDRA-16396) * Avoid pushing schema mutations when setting up distributed system keyspaces locally (CASSANDRA-16387) Merged from 2.2: * Make TokenMetadata's ring version increments atomic (CASSANDRA-16286) diff --git a/debian/compat b/debian/compat index 7ed6ff82de..b4de394767 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +11 diff --git a/debian/control b/debian/control index 6a0128e447..328502eceb 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: misc Priority: extra Maintainer: Eric Evans Uploaders: Sylvain Lebresne -Build-Depends: debhelper (>= 5), openjdk-8-jdk | java8-jdk, ant (>= 1.9), ant-optional (>= 1.9), dh-python, python-dev (>= 2.7), dpatch, bash-completion +Build-Depends: debhelper (>= 11), openjdk-8-jdk | java8-jdk, ant (>= 1.9), ant-optional (>= 1.9), dh-python, python3-dev (>= 3.6), dpatch, bash-completion Homepage: http://cassandra.apache.org Vcs-Git: http://git-wip-us.apache.org/repos/asf/cassandra.git Vcs-Browser: https://git-wip-us.apache.org/repos/asf?p=cassandra.git @@ -11,7 +11,7 @@ Standards-Version: 3.8.3 Package: cassandra Architecture: all -Depends: openjdk-8-jre-headless | java8-runtime, adduser, python (>= 2.7), ${misc:Depends} +Depends: openjdk-8-jre-headless | java8-runtime, adduser, python (>= 3.6), ${misc:Depends}, ${python3:Depends} Recommends: ntp | time-daemon Suggests: cassandra-tools Conflicts: apache-cassandra1 diff --git a/debian/rules b/debian/rules index ff1d64df1b..5acb71680d 100755 --- a/debian/rules +++ b/debian/rules @@ -30,7 +30,7 @@ build-stamp: patch-stamp $(ANT) generate-cql-html $(ANT) jar - cd pylib && python setup.py install --no-compile --install-layout deb \ + cd pylib && python3 setup.py install --no-compile --install-layout deb \ --root $(CURDIR)/debian/cassandra touch build-stamp @@ -40,7 +40,7 @@ install: build dh_testroot dh_installdirs dh_install - dh_python2 + dh_python3 # Copy in the jar and symlink to something stable dh_install build/apache-cassandra-$(VERSION).jar \