From: Rob Browning <rlb@defaultvalue.org>
Date: Thu, 26 Nov 2020 19:11:57 +0000 (-0600)
Subject: freebsd: fix pytest setup for python 3
X-Git-Tag: 0.32~21^2~1
X-Git-Url: https://arthur.barton.de/gitweb/?p=bup.git;a=commitdiff_plain;h=d24c3d38d0033edc0b7d17e7142ea644fae7c9fc

freebsd: fix pytest setup for python 3

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
---

diff --git a/.cirrus.yml b/.cirrus.yml
index 832cd59..d676e7c 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -105,7 +105,7 @@ task:
     set -xe
     dev/prep-for-freebsd-build python3
     dev/system-info
-    gmake -j6 PYTHON=python3 check
+    gmake -j6 PYTHON=python3.7 check
 
 task:
   name: macos (py2)
diff --git a/dev/prep-for-freebsd-build b/dev/prep-for-freebsd-build
index 446ec40..26d6fc1 100755
--- a/dev/prep-for-freebsd-build
+++ b/dev/prep-for-freebsd-build
@@ -7,9 +7,6 @@ usage()
     echo "Usage: prep-for-freebsd-build [python2|python3]"
 }
 
-common_pkgs='gmake git bash rsync curl par2cmdline readline duplicity'
-common_pkgs="$common_pkgs rsnapshot"
-
 pyver="${1:-python2}"
 
 # Install build deps
@@ -19,15 +16,20 @@ pkg update
 # https://reviews.freebsd.org/D24816
 pkg install rdiff-backup || true
 
+pkgs='gmake git bash rsync curl par2cmdline readline duplicity'
+pkgs="$pkgs rsnapshot"
+
 case "$pyver" in
     python2)
-        pkg install $common_pkgs python2 py27-tornado pytest pytest-xdist
+        pkgs="$pkgs python2 py27-tornado pytest pytest-xdist"
         ;;
     python3)
-        pkg install $common_pkgs python3 py37-tornado pytest3 pytest3-xdist
+        pkgs="$pkgs python37 py37-tornado py37-pytest py37-pytest-xdist"
         ;;
     *)
         usage 1>&2
         exit 2
         ;;
 esac
+
+pkg install $pkgs