freebsd: fix pytest setup for python 3

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

diff --git a/.cirrus.yml b/.cirrus.yml
index 832cd598b56f0d26465f6331eadd63e0c2242727..d676e7c3f6e6169f87ec04a264561fff806179c4 100644 (file)
--- 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 446ec40f4d3455b5df9ee5b330038eef06005074..26d6fc1436a37c855c15be75aa9040481a0ad509 100755 (executable)
--- 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