From ce8c0066d048bf4d91a53a51ebbbd6dc9a241b64 Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Mon, 25 Nov 2019 12:51:49 -0500 Subject: [PATCH] Fix downstream tests I backported how we do the VERSION detection in 3.5.something. This should already be fixed upstream. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 03f6f21941..8f9716e64b 100644 --- a/Makefile +++ b/Makefile @@ -364,7 +364,7 @@ check: flake8 pep8 # pyflakes pylint awx-link: cp -R /tmp/awx.egg-info /awx_devel/ || true - sed -i "s/placeholder/$(shell git describe --long | sed 's/\./\\./g')/" /awx_devel/awx.egg-info/PKG-INFO + sed -i "s/placeholder/$(shell cat VERSION)/" /awx_devel/awx.egg-info/PKG-INFO cp -f /tmp/awx.egg-link /venv/awx/lib/python$(PYTHON_VERSION)/site-packages/awx.egg-link TEST_DIRS ?= awx/main/tests/unit awx/main/tests/functional awx/conf/tests awx/sso/tests