From 2d8ac74f8d2b2cdc0bba924adbfc752d559ccfbe Mon Sep 17 00:00:00 2001 From: Oleg Kalachev Date: Thu, 11 Apr 2024 01:55:30 +0300 Subject: [PATCH] Remove Python 2 tests --- builder/image-validate.sh | 1 - builder/test/tests.sh | 4 +--- builder/test/tests_py3.py | 8 -------- 3 files changed, 1 insertion(+), 12 deletions(-) delete mode 100755 builder/test/tests_py3.py diff --git a/builder/image-validate.sh b/builder/image-validate.sh index cf11647cd..73ee4d817 100755 --- a/builder/image-validate.sh +++ b/builder/image-validate.sh @@ -25,7 +25,6 @@ systemctl start roscore cd /home/pi/catkin_ws/src/clover/builder/test/ ./tests.sh ./tests.py -./tests_py3.py [[ $(./test_qr.py) == "Found QRCODE with data Проверка Unicode with center at x=66.0, y=66.0" ]] [[ $(./tests_clever.py) == "Warning: clever package is renamed to clover" ]] # test backwards compatibility diff --git a/builder/test/tests.sh b/builder/test/tests.sh index 1d0ccc18a..e11c4c455 100755 --- a/builder/test/tests.sh +++ b/builder/test/tests.sh @@ -6,7 +6,6 @@ set -ex # validate required software is installed -python2 --version python3 --version ipython3 --version @@ -30,8 +29,7 @@ if [ -z $VM ]; then python --version ipython --version pip2 --version - # `python` is python2 for now - [[ $(python -c 'import sys;print(sys.version_info.major)') == "2" ]] + [[ $(python -c 'import sys;print(sys.version_info.major)') == "3" ]] # ptvsd does not have a stand-alone binary python -m ptvsd --version diff --git a/builder/test/tests_py3.py b/builder/test/tests_py3.py deleted file mode 100755 index 35513bc1f..000000000 --- a/builder/test/tests_py3.py +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env python3 - -# Make sure our Python 3 software is installed - -import cv2 -from pyzbar import pyzbar - -print(cv2.getBuildInformation())