From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Tue, 8 Jun 2021 15:04:54 +0000 (-0700)
Subject: remove Python 2 support from shapes regression test
X-Git-Tag: 2.47.3~2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0d675ce14f131f6825fd3b6a4a8e058b2dbafc54;p=graphviz

remove Python 2 support from shapes regression test

Python 2 was EOLed in 2020. This change removes the ability to use Python 2 when
running the shapes test.

This is somewhat moot as the Makefile.am targets for this are not really usable
right now (see the commits merged in 7d0bd41a7ccac1d0d992e8c19ce08f62b85b16ad
that improved the situation but still did not make `make check-recursive`
runnable). Nevertheless this at least removes one legacy code path that does not
need to be worked on in future.

Related to #1992.
---

diff --git a/tests/regression_tests/shapes/Makefile.am b/tests/regression_tests/shapes/Makefile.am
index 46a0c36c7..8ac3d18b0 100644
--- a/tests/regression_tests/shapes/Makefile.am
+++ b/tests/regression_tests/shapes/Makefile.am
@@ -1,9 +1,8 @@
 SUBDIRS = reference
 
 check test rtest:
-	./shapes.sh
+	python3 shapes.py
 
 EXTRA_DIST = \
-	shapes.sh \
 	test_shapes.py \
 	shapes.py
diff --git a/tests/regression_tests/shapes/shapes.sh b/tests/regression_tests/shapes/shapes.sh
deleted file mode 100755
index ba09fdbf2..000000000
--- a/tests/regression_tests/shapes/shapes.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh -e
-
-cd `dirname $0`
-
-if command -v python3; then
-    python3 shapes.py
-else
-    python2 shapes.py
-fi