Commit 25aa17c2 authored by Andreas Klöckner's avatar Andreas Klöckner
Browse files

Modernize install script

parent 4f190803

build-py-project.sh

+9 −7
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ fi 


# {{{ virtualenv



VENV_VERSION="virtualenv-13.0.3"

VENV_VERSION="virtualenv-15.1.0"

rm -Rf "$VENV_VERSION"

curl -k https://pypi.python.org/packages/source/v/virtualenv/$VENV_VERSION.tar.gz | tar xfz -
@@ -51,17 +51,18 @@ fi 
#curl -k https://ssl.tiker.net/software/ez_setup.py | python -

#curl -k https://bootstrap.pypa.io/ez_setup.py | python -



SETUPTOOLS_VERSION="setuptools-33.1.1"

curl -k -O https://pypi.python.org/packages/dc/8c/7c9869454bdc53e72fb87ace63eac39336879eef6f2bf96e946edbf03e90/$SETUPTOOLS_VERSION.zip

unzip $SETUPTOOLS_VERSION

(cd $SETUPTOOLS_VERSION; $PY_EXE setup.py install)

# SETUPTOOLS_VERSION="setuptools-33.1.1"

# curl -k -O https://pypi.python.org/packages/dc/8c/7c9869454bdc53e72fb87ace63eac39336879eef6f2bf96e946edbf03e90/$SETUPTOOLS_VERSION.zip

# unzip $SETUPTOOLS_VERSION

# (cd $SETUPTOOLS_VERSION; $PY_EXE setup.py install)



# }}}



if [[ "${PY_EXE}" == python3.[56789] ]]; then

  $PY_EXE -m ensurepip

else

  curl -k https://gitlab.tiker.net/inducer/pip/raw/7.0.3/contrib/get-pip.py | python -

  #curl -k https://gitlab.tiker.net/inducer/pip/raw/7.0.3/contrib/get-pip.py | python -

  curl -k https://bootstrap.pypa.io/get-pip.py | python -

fi



# Not sure why the hell pip ends up there, but in Py3.3, it sometimes does.
@@ -69,6 +70,8 @@ export PATH=`pwd`/.env/local/bin:$PATH 


PIP="${PY_EXE} $(which pip)"



$PIP install setuptools



if test "$EXTRA_INSTALL" != ""; then

  for i in $EXTRA_INSTALL ; do

    if [ "$i" = "numpy" ] && [[ "${PY_EXE}" == pypy* ]]; then
@@ -90,4 +93,3 @@ if test -f $REQUIREMENTS_TXT; then 
fi



$PIP install .