Release v1.0.3.1

This is useful for distros like Debian that do tests on installed packages.

See-also: https://ci.debian.net/

Makefile

@@ -14,9 +14,9 @@ build:
 		PYTHON=python2 ; \
 	elif python -c 'import mercurial' 2> /dev/null ; then \
 		PYTHON=python ; \
-	fi ; \
+	else ; \
-	if [ -n "$$PYTHON" ] ; then \
+		echo 'Python with Mercurial not available' >&2 ; \
-		PYTHON=python ; \
+		exit 1 ; \
 	fi ; \
 	mkdir -p bin ; \
 	for s in git-remote-hg git-hg-helper ; do \

setup.py

@@ -3,7 +3,7 @@
 import setuptools
 
 # strip leading v
-version = 'v1.0.3'[1:]
+version = 'v1.0.3.1'[1:]
 
 # check for released version
 assert (len(version) > 0)

test/test-lib.sh

@@ -27,16 +27,17 @@ SHARNESS_BUILD_DIRECTORY="$(mktemp -d)"
 export PATH="${PATH#*:}"
 rmdir "$SHARNESS_BUILD_DIRECTORY"
 
-if [ -n "$PYTHON" ] && "$PYTHON" -c 'import mercurial' 2> /dev/null ; then
+if [ -z "$TEST_INSTALLED_SCRIPTS" ] ; then
+	if [ -n "$PYTHON" ] && "$PYTHON" -c 'import mercurial' 2> /dev/null ; then
 		: Use chosen Python version
-elif python3 -c 'import mercurial' 2> /dev/null ; then
+	elif python3 -c 'import mercurial' 2> /dev/null ; then
 		PYTHON=python3
-elif python2 -c 'import mercurial' 2> /dev/null ; then
+	elif python2 -c 'import mercurial' 2> /dev/null ; then
 		PYTHON=python2
-elif python -c 'import mercurial' 2> /dev/null ; then
+	elif python -c 'import mercurial' 2> /dev/null ; then
 		PYTHON=python
-fi
+	fi
-if [ -n "$PYTHON" ] ; then
+	if [ -n "$PYTHON" ] ; then
 		test_set_prereq PYTHON
 
 		# Change shebang on a copy of scripts to chosen Python version
@@ -49,6 +50,10 @@ if [ -n "$PYTHON" ] ; then
 		done
 		export PATH="$TEST_BIN${PATH:+:$PATH}"
 		unset TEST_BIN
+	fi
+else
+	# The build/install process ensures Python is available
+	test_set_prereq PYTHON
 fi
 
 GIT_AUTHOR_EMAIL=author@example.com