Commits

Aleš Erjavec committed 1a93782

Update the included libraries in OSX application.

Comments (0)

Files changed (2)

install-scripts/mac/build-osx-app-template.sh

 # Versions of included 3rd party software
 
 PYTHON_VER=2.7.6
-PIP_VER=1.4.1
-DISTRIBUTE_VER=0.6.49
-NUMPY_VER=1.8.0
-SCIPY_VER=0.13.1
-QT_VER=4.8.5
+PIP_VER=1.5.5
+SETUPTOOLS_VER=3.4.4
+NUMPY_VER=1.8.1
+SCIPY_VER=0.13.3
+QT_VER=4.8.6
 SIP_VER=4.14.6
 PYQT_VER=4.10.1
 PYQWT_VER=5.2.0
 	popd
 }
 
-function install_distribute() {
-	download_and_extract "https://pypi.python.org/packages/source/d/distribute/distribute-$DISTRIBUTE_VER.tar.gz"
+function install_setuptools() {
+	download_and_extract "https://pypi.python.org/packages/source/s/setuptools/setuptools-$SETUPTOOLS_VER.tar.gz"
 
-	pushd distribute-$DISTRIBUTE_VER
+	pushd setuptools-$SETUPTOOLS_VER
 
 	"$PYTHON" setup.py install
 	create_shell_start_script easy_install
 	popd
 }
 
+
 function install_ipython {
 	# install with easy_install (does not work with pip)
 	"$EASY_INSTALL" ipython
 }
 
 function make_standalone {
-	"$PIP" install macholib
+	"$PIP" install macholib==1.5.1
 	"$PYTHON" -m macholib standalone $APP
 	yes y | "$PIP" uninstall altgraph
 	yes y | "$PIP" uninstall macholib
 
 install_python
 
-install_distribute
+install_setuptools
 
 install_pip
 

install-scripts/mac/build-osx-app.sh

 echo "Installing optional dependencies"
 echo "================================"
 "$PIP" install slumber
-"$PIP" install PIL
+"$PIP" install --allow-external PIL --allow-unverified PIL PIL
 
 
 if [[ ! $INPLACE ]]; then