Commit62d1d20

committed

[CI] An initization of python virtualenv is simplified

Let's avoid creating useless environment variables.

1 parent126608d commit62d1d20Copy full SHA for 62d1d20

File tree

-12

lines changed

-12

lines changed

Lines changed: 5 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,24 +8,17 @@ if [ -z ${TEST_FILTER+x} ]; \`
`8`	`8`	`thenexport TEST_FILTER="TestgresTests or (TestTestgresCommon and (not remote_ops))"; \`
`9`	`9`	`fi`
`10`	`10`
`11`		`-# choose python version`
`12`		`-echo python version is$PYTHON_VERSION`
`13`		`-VIRTUALENV="virtualenv --python=/usr/bin/python$PYTHON_VERSION"`
`14`		`-PIP="pip$PYTHON_VERSION"`
`15`		`-`
`16`	`11`	`# fail early`
`17`	`12`	`echo check that pg_config isin PATH`
`18`	`13`	`command -v pg_config`
`19`	`14`
`20`		`-# prepare environment`
`21`		`-VENV_PATH=/tmp/testgres_venv`
	`15`	`+# preparepythonenvironment`
	`16`	`+VENV_PATH="/tmp/testgres_venv"`
`22`	`17`	`rm -rf$VENV_PATH`
`23`		`-$VIRTUALENV$VENV_PATH`
	`18`	`+virtualenv --python="/usr/bin/python${PYTHON_VERSION}""${VENV_PATH}"`
`24`	`19`	`export VIRTUAL_ENV_DISABLE_PROMPT=1`
`25`		`-source$VENV_PATH/bin/activate`
`26`		`-`
`27`		`-# install utilities`
`28`		`-$PIP install coverage flake8 psutil Sphinx pytest pytest-xdist psycopg2 six psutil`
	`20`	`+source"${VENV_PATH}/bin/activate"`
	`21`	`+pip install coverage flake8 psutil Sphinx pytest pytest-xdist psycopg2 six psutil`
`29`	`22`
`30`	`23`	`# install testgres' dependencies`
`31`	`24`	`export PYTHONPATH=$(pwd)`

Comments

(0)