Web apps

app-build

@@ -7,6 +7,7 @@ set -x
 printf "travis_fold:start:app-build\n"
 
 TARGET=${TARGET:-..}
+DIR=${DIR:-.}
 cd $TARGET
 
 GUESS=${PWD#*omero-*}
@@ -20,6 +21,6 @@ export PYTHONPATH=${OMERO_DIST}/lib/python:${OMERO_DIST}/lib/python/omeroweb
 
 set +u
 source /opt/omero/web/venv/bin/activate
-ICE_CONFIG=${OMERO_DIST}/etc/ice.config python setup.py test
+ICE_CONFIG=${OMERO_DIST}/etc/ice.config python $DIR/setup.py test
 
 printf "travis_fold:end:app-build\n"

app-docker

@@ -6,6 +6,8 @@
 set -e
 set -u
 
+EXCLUDE=${EXCLUDE:-}
+DIR=${DIR:-.}
 PROJECT=${PROJECT:-omero}
 CID=${CID:-"$PROJECT"_web_1}
 TARGET=/$(basename $PWD)
@@ -21,13 +23,20 @@ docker exec $CID sed -i "s/^\(omero\.host\s*=\s*\).*\$/\1omero/" /opt/omero/web/
 docker exec -e USER_AGENT=Travis -u root $CID /opt/omero/omego/bin/omego download java --sym /opt/omero/java
 docker exec $CID ln -s /opt/omero/java/libs /opt/omero/web/OMERO.web/lib/client
 
+# Run custom dependencies setup
+if [ -e .omeroci/app-build-deps ];
+then
+  docker exec -u root $CID bash /$TARGET/.omeroci/app-build-deps
+fi
+
 docker exec -e OMERO_HOST=omero $CID /infra/wait-on-login
-docker exec -u root -e TARGET=$TARGET $CID /infra/py-setup
+docker exec -u root -e TARGET=$TARGET -e EXCLUDE=$EXCLUDE -e DIR=$DIR $CID /infra/py-setup
+
 
 # Run custom server setup
 if [ -e .omeroci/app-config ];
 then
   docker exec $CID bash /$TARGET/.omeroci/app-config
 fi
 
-docker exec         -e TARGET=$TARGET $CID /infra/app-build
+docker exec  -u root -e TARGET=$TARGET -e DIR=$DIR $CID /infra/app-build

py-setup

@@ -7,14 +7,25 @@ set -x
 printf "travis_fold:start:py-setup\n"
 
 TARGET=${TARGET:-..}
-
+EXCLUDE=${EXCLUDE:-}
+DIR=${DIR:-.}
 dir=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
 cd $TARGET
 pip install --upgrade pip setuptools
 pip install -r $dir/requirements.txt
-flake8 -v .
+array=( $EXCLUDE )
+size="${#array[@]}"
+v=""
+if (( $size != 0 )); then 
+    v="--exclude "
+    for i in "${array[@]}"; do
+      v=$v" "$i
+    done
+fi
+flake8 $v -v .
 rst-lint README.rst
 
+cd $DIR
 python setup.py sdist
 pip install dist/*.tar.gz
 python setup.py clean