From 77635bacb5e7ee16b45866cac096efeb5940c23a Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sat, 30 Nov 2019 12:55:15 -0600 Subject: [PATCH] cirrus: test (incomplete) python 3 support Signed-off-by: Rob Browning --- .cirrus.yml | 16 ++++++++++++++++ dev/prep-for-debianish-build | 37 +++++++++++++++++++++++++++++------- 2 files changed, 46 insertions(+), 7 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 35a3443..a2fe9cc 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -38,3 +38,19 @@ task: dev/prep-for-macos-build dev/system-info make -j3 check + +task: + name: debian (python 3 - under construction) + container: + image: debian:buster + cpu: 2 + memory: 8 + script: | + set -xe + dev/prep-for-debianish-build python3 + dev/system-info + adduser --disabled-password --gecos '' bup + chown -R bup:bup . + testcmd='BUP_ALLOW_UNEXPECTED_PYTHON_VERSION=true PYTHON=python3' + testcmd="$testcmd eatmydata make -j3 -C '$(pwd)' check" + su -l bup -c "$testcmd" diff --git a/dev/prep-for-debianish-build b/dev/prep-for-debianish-build index 2fe16ab..aab8c2d 100755 --- a/dev/prep-for-debianish-build +++ b/dev/prep-for-debianish-build @@ -1,12 +1,35 @@ #!/usr/bin/env bash -set -exo pipefail +set -exuo pipefail + +usage() +{ + echo "Usage: prep-for-debianish-build [python2|python3]" +} export DEBIAN_FRONTEND=noninteractive apt-get update -apt-get install -y \ - gcc make linux-libc-dev git rsync eatmydata \ - acl attr par2 \ - python2.7-dev python-fuse \ - python-pyxattr python-pylibacl python-tornado \ - duplicity rdiff-backup rsnapshot + +common_debs='gcc make linux-libc-dev git rsync eatmydata acl attr par2' +common_debs="$common_debs duplicity rdiff-backup rsnapshot" + +pyver="${1:-python2}" + +case "$pyver" in + python2) + apt-get install -y \ + $common_debs \ + python2.7-dev python-fuse \ + python-pyxattr python-pylibacl python-tornado + ;; + python3) + apt-get install -y \ + $common_debs \ + python3.7-dev python3-distutils python3-fuse \ + python3-pyxattr python3-pylibacl python3-tornado + ;; + *) + usage 1>&2 + exit 2 + ;; +esac -- 2.39.2