From: Rob Browning <rlb@defaultvalue.org>
Date: Fri, 27 Nov 2020 18:51:51 +0000 (-0600)
Subject: cirrus freebsd: install pytest via pip for python 2
X-Git-Tag: 0.32~21^2
X-Git-Url: https://arthur.barton.de/gitweb/?p=bup.git;a=commitdiff_plain;h=c73611b6ab28b5734cdf4f70f8d4dbd5a0be732a;ds=sidebyside

cirrus freebsd: install pytest via pip for python 2

I didn't see a port, and pkg warns that python 2 may be removed
entirely at the end of the year, so just use pip for now.

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

diff --git a/dev/prep-for-freebsd-build b/dev/prep-for-freebsd-build
index 26d6fc1..9631b41 100755
--- a/dev/prep-for-freebsd-build
+++ b/dev/prep-for-freebsd-build
@@ -21,15 +21,16 @@ pkgs="$pkgs rsnapshot"
 
 case "$pyver" in
     python2)
-        pkgs="$pkgs python2 py27-tornado pytest pytest-xdist"
+        pkgs="$pkgs python2 py27-tornado py27-pip"
+        pkg install $pkgs
+        pip-2.7 install --user pytest pytest-xdist
         ;;
     python3)
         pkgs="$pkgs python37 py37-tornado py37-pytest py37-pytest-xdist"
+        pkg install $pkgs
         ;;
     *)
         usage 1>&2
         exit 2
         ;;
 esac
-
-pkg install $pkgs