Mercurial Mercurial > hg-public > rl-ci-tools / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix names and perms
authorrobin
Fri, 23 Jun 2017 11:50:00 +0100
changeset 9 55f05d532826
parent 8 a39bdd5144d6
child 10 863dc27e003d
fix names and perms
manylinux/build-wheels file | annotate | diff | comparison | revisions
manylinux/container-build-wheels file | annotate | diff | comparison | revisions
manylinux/container-build-wheels.sh file | annotate | diff | comparison | revisions
manylinux/container-test-wheels file | annotate | diff | comparison | revisions
manylinux/container-test-wheels.sh file | annotate | diff | comparison | revisions
manylinux/test-wheels file | annotate | diff | comparison | revisions 
--- a/manylinux/build-wheels	Fri Jun 23 11:38:34 2017 +0100
+++ b/manylinux/build-wheels	Fri Jun 23 11:50:00 2017 +0100
@@ -6,7 +6,7 @@
 IMAGESRC=quay.io/pypa
 REPO=${REPO:-https://bitbucket.org/rptlab/reportlab}
 REQUIREMENT=${REPO:-$(basename ${REPO})}
-DOCKER_SCRIPT=${DOCKER_SCRIPT:-container-build-wheels.sh}
+DOCKER_SCRIPT=${DOCKER_SCRIPT:-container-build-wheels}
 #IMAGESRC=rl
 sudo rm -rf wheels wheelsu
 mkdir wheels wheelsu
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/manylinux/container-build-wheels	Fri Jun 23 11:50:00 2017 +0100
@@ -0,0 +1,72 @@
+#!/bin/bash
+# Run with:
+#	 docker run --rm -v $PWD:/io quay.io/pypa/manylinux1_x86_64 /io/rl_ci_tools/manylinux/reportlab-wheels.sh
+# or something like:
+#	 docker run --rm -e PYTHON_VERSIONS=2.7 -v $PWD:/io quay.io/pypa/manylinux1_x86_64 /io/rl_ci_tools/manylinux/reportlab-wheels.sh
+# or:
+#	 docker run --rm -e PYTHON_VERSIONS=2.7 -v $PWD:/io quay.io/pypa/manylinux1_x86_64 /io/rl_ci_tools/manylinux/reportlab-wheels.sh
+set -e
+
+UNICODE_WIDTHS=${UNICODE_WIDTHS:-16 32}
+WHEELHOUSE=${WHEELHOUSE:-/io/rl_ci_tools/manylinux/wheelhouse}
+WHEELS_UNFIXED=${WHEELS_UNFIXED:-/io/rl_ci_tools/manylinux/wheels_unfixed}
+
+mark(){
+	echo "######################################################################################"
+	[ "$#" -gt 0 ] && echo "$@" && echo "######################################################################################"
+	}
+
+# Manylinux, openblas version, lex_ver etc etc
+mark source /io/rl_ci_tools/manylinux/manylinux_utils.sh
+source /io/rl_ci_tools/manylinux/manylinux_utils.sh
+mark source /io/rl_ci_tools/manylinux/library_builders.sh
+source /io/rl_ci_tools/manylinux/library_builders.sh
+mark "$(env)"
+
+#mark build_jpeg
+#build_jpeg
+#mark build_tiff
+#build_tiff
+#mark build_openjpeg
+#build_openjpeg
+#mark build_lcsm2
+#build_lcms2
+#mark build_libwebp
+#build_libwebp
+mark build_freetype
+build_freetype
+#yum install -y tk-devel
+#yum install mercurial
+
+PYLO=${PYLO:-2.7}
+PYHI=${PYHI:-3.7}
+
+# Directory to store wheels
+rm_mkdir $(basename "${WHEELS_UNFIXED}")
+
+OPATH="$PATH"
+export RL_MANYLINUX=1
+
+# Compile wheels
+for PYTHON in ${PYTHON_VERSIONS}; do
+	[ $(lex_ver $PYTHON) -lt $(lex_ver $PYLO) ] && continue
+	[ $(lex_ver $PYTHON) -ge $(lex_ver $PYHI) ] && continue
+	for uw in ${UNICODE_WIDTHS}; do
+		[ $(lex_ver $PYTHON) -ge $(lex_ver 3.3) ] && [ "$uw" != 32 ] && continue
+		(
+		export UNICODE_WIDTH="$uw"
+		mark "building reportlab wheel PYTHON=$PYTHON UNICODE_WIDTH=$UNICODE_WIDTH"
+		PP="$(cpython_path $PYTHON $UNICODE_WIDTH)"
+		PY=$PP/bin/python
+		mark "platform=$($PY -mplatform) sys.platform=$($PY -c'import sys;print(sys.platform)') os.name=$($PY -c'import os;print(os.name)')"
+		export PATH="$PP/bin:$OPATH"
+		PIP="$PP/bin/pip"
+		$PIP install wheel setuptools -U
+		echo "Building reportlab for Python $PYTHON"
+		$PIP wheel --no-binary=:all: --no-deps -w "${WHEELS_UNFIXED}" -e "${REPO}#egg=${REQUIREMENT}"
+		)
+	done
+done
+
+# Bundle external shared libraries into the wheels
+repair_wheelhouse "${WHEELS_UNFIXED}" "${WHEELHOUSE}"
--- a/manylinux/container-build-wheels.sh	Fri Jun 23 11:38:34 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-#!/bin/bash
-# Run with:
-#	 docker run --rm -v $PWD:/io quay.io/pypa/manylinux1_x86_64 /io/rl_ci_tools/manylinux/reportlab-wheels.sh
-# or something like:
-#	 docker run --rm -e PYTHON_VERSIONS=2.7 -v $PWD:/io quay.io/pypa/manylinux1_x86_64 /io/rl_ci_tools/manylinux/reportlab-wheels.sh
-# or:
-#	 docker run --rm -e PYTHON_VERSIONS=2.7 -v $PWD:/io quay.io/pypa/manylinux1_x86_64 /io/rl_ci_tools/manylinux/reportlab-wheels.sh
-set -e
-
-UNICODE_WIDTHS=${UNICODE_WIDTHS:-16 32}
-WHEELHOUSE=${WHEELHOUSE:-/io/rl_ci_tools/manylinux/wheelhouse}
-WHEELS_UNFIXED=${WHEELS_UNFIXED:-/io/rl_ci_tools/manylinux/wheels_unfixed}
-
-mark(){
-	echo "######################################################################################"
-	[ "$#" -gt 0 ] && echo "$@" && echo "######################################################################################"
-	}
-
-# Manylinux, openblas version, lex_ver etc etc
-mark source /io/rl_ci_tools/manylinux/manylinux_utils.sh
-source /io/rl_ci_tools/manylinux/manylinux_utils.sh
-mark source /io/rl_ci_tools/manylinux/library_builders.sh
-source /io/rl_ci_tools/manylinux/library_builders.sh
-mark "$(env)"
-
-#mark build_jpeg
-#build_jpeg
-#mark build_tiff
-#build_tiff
-#mark build_openjpeg
-#build_openjpeg
-#mark build_lcsm2
-#build_lcms2
-#mark build_libwebp
-#build_libwebp
-mark build_freetype
-build_freetype
-#yum install -y tk-devel
-#yum install mercurial
-
-PYLO=${PYLO:-2.7}
-PYHI=${PYHI:-3.7}
-
-# Directory to store wheels
-rm_mkdir $(basename "${WHEELS_UNFIXED}")
-
-OPATH="$PATH"
-export RL_MANYLINUX=1
-
-# Compile wheels
-for PYTHON in ${PYTHON_VERSIONS}; do
-	[ $(lex_ver $PYTHON) -lt $(lex_ver $PYLO) ] && continue
-	[ $(lex_ver $PYTHON) -ge $(lex_ver $PYHI) ] && continue
-	for uw in ${UNICODE_WIDTHS}; do
-		[ $(lex_ver $PYTHON) -ge $(lex_ver 3.3) ] && [ "$uw" != 32 ] && continue
-		(
-		export UNICODE_WIDTH="$uw"
-		mark "building reportlab wheel PYTHON=$PYTHON UNICODE_WIDTH=$UNICODE_WIDTH"
-		PP="$(cpython_path $PYTHON $UNICODE_WIDTH)"
-		PY=$PP/bin/python
-		mark "platform=$($PY -mplatform) sys.platform=$($PY -c'import sys;print(sys.platform)') os.name=$($PY -c'import os;print(os.name)')"
-		export PATH="$PP/bin:$OPATH"
-		PIP="$PP/bin/pip"
-		$PIP install wheel setuptools -U
-		echo "Building reportlab for Python $PYTHON"
-		$PIP wheel --no-binary=:all: --no-deps -w "${WHEELS_UNFIXED}" -e "${REPO}#egg=${REQUIREMENT}"
-		)
-	done
-done
-
-# Bundle external shared libraries into the wheels
-repair_wheelhouse "${WHEELS_UNFIXED}" "${WHEELHOUSE}"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/manylinux/container-test-wheels	Fri Jun 23 11:50:00 2017 +0100
@@ -0,0 +1,81 @@
+#!/bin/bash
+# Run with:
+#	 docker run --rm -v $PWD:/io quay.io/pypa/manylinux1_x86_64 /io/build_reportlab.sh
+# or something like:
+#	 docker run --rm -e PYTHON_VERSIONS=2.7 -v $PWD:/io quay.io/pypa/manylinux1_x86_64 /io/build_reportlab.sh
+# or:
+#	 docker run --rm -e PYTHON_VERSIONS=2.7 -v $PWD:/io quay.io/pypa/manylinux1_x86_64 /io/build_reportlab.sh
+set -e
+
+UNICODE_WIDTHS=${UNICODE_WIDTHS:-16 32}
+WHEELHOUSE=${WHEELHOUSE:-/io/wheelhouse}
+WHEELS_UNFIXED=${WHEELS_UNFIXED:-/io/wheels_unfixed}
+
+mark(){
+	echo "######################################################################################"
+	[ "$#" -gt 0 ] && echo "$@" && echo "######################################################################################"
+	}
+
+# Manylinux, openblas version, lex_ver etc etc
+mark source /io/rl_ci_utils/manylinux/manylinux_utils.sh
+source /io/rl_ci_utils/manylinux/manylinux_utils.sh
+mark source /io/rl_ci_utils/manylinux/library_builders.sh
+source /io/rl_ci_utils/manylinux/library_builders.sh
+mark "$(env)"
+
+#mark build_jpeg
+#build_jpeg
+#mark build_tiff
+#build_tiff
+#mark build_openjpeg
+#build_openjpeg
+#mark build_lcsm2
+#build_lcms2
+#mark build_libwebp
+#build_libwebp
+#mark build_freetype
+#build_freetype
+#yum install -y tk-devel
+
+PYLO=${PYLO:-2.7}
+PYHI=${PYHI:-3.7}
+
+OPATH="$PATH"
+export RL_MANYLINUX=1
+ENV=/io/test-env
+SRC=/io/${REQUIREMENT}-src
+
+# Compile wheels
+for PYTHON in ${PYTHON_VERSIONS}; do
+	[ $(lex_ver $PYTHON) -lt $(lex_ver $PYLO) ] && continue
+	[ $(lex_ver $PYTHON) -ge $(lex_ver $PYHI) ] && continue
+	for uw in ${UNICODE_WIDTHS}; do
+		[ $(lex_ver $PYTHON) -ge $(lex_ver 3.3) ] && [ "$uw" != 32 ] && continue
+		(
+		export UNICODE_WIDTH="$uw"
+		mark "building reportlab wheel PYTHON=$PYTHON UNICODE_WIDTH=$UNICODE_WIDTH"
+		PP="$(cpython_path $PYTHON $UNICODE_WIDTH)"
+		PY=$PP/bin/python
+		mark "platform=$($PY -mplatform) sys.platform=$($PY -c'import sys;print(sys.platform)') os.name=$($PY -c'import os;print(os.name)')"
+		export PATH="$PP/bin:$OPATH"
+		PIP="$PP/bin/pip"
+		echo "Testing ${REQUIREMENT} for Python $PYTHON"
+		$PIP install virtualenv
+		rm -rf $ENV
+		$PY -mvirtualenv $ENV
+		(
+		cd $ENV
+		. $ENV/bin/activate
+		EPY=$ENV/bin/python
+		EPIP=$ENV/bin/pip
+		[ "${REQUIREMENT}" = "reportlab" ] && $EPIP install --find-links=/io/TEST-WHEELS pillow
+		$EPIP install --find-links=/io/wheels ${REQUIREMENT}
+		rm -f /tmp/eee
+		$EPY setup.py test | tee /tmp/eee
+		grep -q 'OK' /tmp/eee && R="##### OK  " || R="!!!!! FAIL"
+		echo "${R} PYTHON=${PYTHON} UNICODE_WIDTH=${UNICODE_WIDTH} ARCH=${ARCH}" >> /io/test-results.txt
+		deactivate
+		)
+		)
+	done
+done
--- a/manylinux/container-test-wheels.sh	Fri Jun 23 11:38:34 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-#!/bin/bash
-# Run with:
-#	 docker run --rm -v $PWD:/io quay.io/pypa/manylinux1_x86_64 /io/build_reportlab.sh
-# or something like:
-#	 docker run --rm -e PYTHON_VERSIONS=2.7 -v $PWD:/io quay.io/pypa/manylinux1_x86_64 /io/build_reportlab.sh
-# or:
-#	 docker run --rm -e PYTHON_VERSIONS=2.7 -v $PWD:/io quay.io/pypa/manylinux1_x86_64 /io/build_reportlab.sh
-set -e
-
-UNICODE_WIDTHS=${UNICODE_WIDTHS:-16 32}
-WHEELHOUSE=${WHEELHOUSE:-/io/wheelhouse}
-WHEELS_UNFIXED=${WHEELS_UNFIXED:-/io/wheels_unfixed}
-
-mark(){
-	echo "######################################################################################"
-	[ "$#" -gt 0 ] && echo "$@" && echo "######################################################################################"
-	}
-
-# Manylinux, openblas version, lex_ver etc etc
-mark source /io/rl_ci_utils/manylinux/manylinux_utils.sh
-source /io/rl_ci_utils/manylinux/manylinux_utils.sh
-mark source /io/rl_ci_utils/manylinux/library_builders.sh
-source /io/rl_ci_utils/manylinux/library_builders.sh
-mark "$(env)"
-
-#mark build_jpeg
-#build_jpeg
-#mark build_tiff
-#build_tiff
-#mark build_openjpeg
-#build_openjpeg
-#mark build_lcsm2
-#build_lcms2
-#mark build_libwebp
-#build_libwebp
-#mark build_freetype
-#build_freetype
-#yum install -y tk-devel
-
-PYLO=${PYLO:-2.7}
-PYHI=${PYHI:-3.7}
-
-OPATH="$PATH"
-export RL_MANYLINUX=1
-ENV=/io/test-env
-SRC=/io/${REQUIREMENT}-src
-
-# Compile wheels
-for PYTHON in ${PYTHON_VERSIONS}; do
-	[ $(lex_ver $PYTHON) -lt $(lex_ver $PYLO) ] && continue
-	[ $(lex_ver $PYTHON) -ge $(lex_ver $PYHI) ] && continue
-	for uw in ${UNICODE_WIDTHS}; do
-		[ $(lex_ver $PYTHON) -ge $(lex_ver 3.3) ] && [ "$uw" != 32 ] && continue
-		(
-		export UNICODE_WIDTH="$uw"
-		mark "building reportlab wheel PYTHON=$PYTHON UNICODE_WIDTH=$UNICODE_WIDTH"
-		PP="$(cpython_path $PYTHON $UNICODE_WIDTH)"
-		PY=$PP/bin/python
-		mark "platform=$($PY -mplatform) sys.platform=$($PY -c'import sys;print(sys.platform)') os.name=$($PY -c'import os;print(os.name)')"
-		export PATH="$PP/bin:$OPATH"
-		PIP="$PP/bin/pip"
-		echo "Testing ${REQUIREMENT} for Python $PYTHON"
-		$PIP install virtualenv
-		rm -rf $ENV
-		$PY -mvirtualenv $ENV
-		(
-		cd $ENV
-		. $ENV/bin/activate
-		EPY=$ENV/bin/python
-		EPIP=$ENV/bin/pip
-		[ "${REQUIREMENT}" = "reportlab" ] && $EPIP install --find-links=/io/TEST-WHEELS pillow
-		$EPIP install --find-links=/io/wheels ${REQUIREMENT}
-		rm -f /tmp/eee
-		$EPY setup.py test | tee /tmp/eee
-		grep -q 'OK' /tmp/eee && R="##### OK  " || R="!!!!! FAIL"
-		echo "${R} PYTHON=${PYTHON} UNICODE_WIDTH=${UNICODE_WIDTH} ARCH=${ARCH}" >> /io/test-results.txt
-		deactivate
-		)
-		)
-	done
-done
--- a/manylinux/test-wheels	Fri Jun 23 11:38:34 2017 +0100
+++ b/manylinux/test-wheels	Fri Jun 23 11:50:00 2017 +0100
@@ -5,7 +5,7 @@
 IMAGESRC=quay.io/pypa
 REPO=${REPO:-https://bitbucket.org/rptlab/reportlab}
 REQUIREMENT=${REPO:-$(basename ${REPO})}
-DOCKER_SCRIPT=${DOCKER_SCRIPT:-container-test-wheels.sh}
+DOCKER_SCRIPT=${DOCKER_SCRIPT:-container-test-wheels}
 sudo rm -rf test-src
 hg clone ${REPO} test-src
 [ -n "$REVISION" ] && (cd test-src && hg up "$REVISION")
rl-ci-tools