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.
use manlinux dir as base
authorrobin
Fri, 23 Jun 2017 12:33:21 +0100
changeset 11 138feabe2772
parent 10 863dc27e003d
child 12 f3f4904af418
use manlinux dir as base
manylinux/build-wheels file | annotate | diff | comparison | revisions
manylinux/container-build-wheels file | annotate | diff | comparison | revisions
manylinux/test-wheels file | annotate | diff | comparison | revisions 
--- a/manylinux/build-wheels	Fri Jun 23 12:15:17 2017 +0100
+++ b/manylinux/build-wheels	Fri Jun 23 12:33:21 2017 +0100
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -ev
+cd "$(dirname "${BASH_SOURCE[0]}")"
 UNICODE_WIDTHS='16 32'
 PYTHON_VERSIONS='2.7 3.3 3.4 3.5 3.6'
 ARCHS='x86_64 i686'
@@ -7,7 +8,7 @@
 REPO=${REPO:-https://bitbucket.org/rptlab/reportlab}
 REQUIREMENT=${REPO:-$(basename ${REPO})}
 DOCKER_SCRIPT=${DOCKER_SCRIPT:-container-build-wheels}
-DOCKER_PATH=${DOCKER_PATH:-/io/rl_ci_tools/manylinux/${DOCKER_SCRIPT}}
+DOCKER_PATH=${DOCKER_PATH:-/io/${DOCKER_SCRIPT}}
 #IMAGESRC=rl
 sudo rm -rf wheels wheelsu
 mkdir wheels wheelsu
@@ -22,7 +23,6 @@
 		-e UNICODE_WIDTHS="$UNICODE_WIDTHS" \
 		-e REPO="$REPO" \
 		-e REQUIREMENT="$REQUIREMENT" \
-		-e DOCKER_PATH="$DOCKER_PATH" \
 		-e ARCH="$arch" \
 		-v $(pwd):/io ${DOCKER_IMAGE}  ${DOCKER_PATH}
 	cp wheelhouse/* wheels/
--- a/manylinux/container-build-wheels	Fri Jun 23 12:15:17 2017 +0100
+++ b/manylinux/container-build-wheels	Fri Jun 23 12:33:21 2017 +0100
@@ -1,15 +1,15 @@
 #!/bin/bash
 # Run with:
-#	 docker run --rm -v $PWD:/io quay.io/pypa/manylinux1_x86_64 /io/rl_ci_tools/manylinux/reportlab-wheels.sh
+#	 docker run --rm -v $PWD:/io quay.io/pypa/manylinux1_x86_64 /io/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
+#	 docker run --rm -e PYTHON_VERSIONS=2.7 -v $PWD:/io quay.io/pypa/manylinux1_x86_64 /io/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
+#	 docker run --rm -e PYTHON_VERSIONS=2.7 -v $PWD:/io quay.io/pypa/manylinux1_x86_64 /io/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}
+WHEELHOUSE=${WHEELHOUSE:-/io/wheelhouse}
+WHEELS_UNFIXED=${WHEELS_UNFIXED:-/io/wheels_unfixed}
 
 mark(){
 	echo "######################################################################################"
@@ -17,10 +17,10 @@
 	}
 
 # 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 source /io/manylinux_utils.sh
+source /io/manylinux_utils.sh
+mark source /io/library_builders.sh
+source /io/library_builders.sh
 mark "$(env)"
 
 #mark build_jpeg
--- a/manylinux/test-wheels	Fri Jun 23 12:15:17 2017 +0100
+++ b/manylinux/test-wheels	Fri Jun 23 12:33:21 2017 +0100
@@ -6,6 +6,7 @@
 REPO=${REPO:-https://bitbucket.org/rptlab/reportlab}
 REQUIREMENT=${REPO:-$(basename ${REPO})}
 DOCKER_SCRIPT=${DOCKER_SCRIPT:-container-test-wheels}
+DOCKER_PATH=${DOCKER_PATH:-/io/${DOCKER_SCRIPT}}
 sudo rm -rf test-src
 hg clone ${REPO} test-src
 [ -n "$REVISION" ] && (cd test-src && hg up "$REVISION")
@@ -13,11 +14,12 @@
 for arch in ${ARCHS}; do
 	DOCKER_IMAGE=${IMAGESRC}/manylinux1_${arch}
 	docker run --rm \
+		${DOCKER_ARGS} \
 		-e PYTHON_VERSIONS="$PYTHON_VERSIONS" \
 		-e UNICODE_WIDTHS="$UNICODE_WIDTHS" \
 		-e REPO="$REPO" \
-		-e REEQUIREMENT="$REQUIREMENT" \
+		-e REQUIREMENT="$REQUIREMENT" \
 		-e ARCH="$arch" \
-		-v $(pwd):/io ${IMAGESRC}/manylinux1_${arch} /io/rl_ci_tools/manylinux/${DOCKER_SCRIPT}
+		-v $(pwd):/io ${DOCKER_IMAGE} ${DOCKER_PATH}
 done
 sudo rm -rf reportlab-src test-env
rl-ci-tools