Fix tests in build script, small changes to Dockerfile

seaflow-uw · Jun 30, 2021 · 1e11917 · 1e11917
1 parent 329be1f
commit 1e11917
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -22,7 +22,6 @@ COPY --chown=seaflow:seaflow . /seaflowpy/
 RUN git clean -qfdx \
     && python3 setup.py sdist bdist_wheel \
     && pip3 install --user --no-index --no-deps dist/*.whl \
-    && mkdir seaflowpy-dist \
-    && cp ./dist/*.tar.gz ./dist/*.whl seaflowpy-dist/
+    && rm -rf __pycache__ build/
 
 CMD ["bash"]
diff --git a/build.sh b/build.sh
@@ -51,7 +51,7 @@ fi
 # Test the new Docker image
 # --------------------------------------------------------------------------- #
 if [[ "$skiptests" -eq 0 ]]; then
-    docker run -it --rm seaflowpy:"$verstr" bash -c 'cd /seaflowpy-tests && pytest'
+    docker run -it --rm seaflowpy:"$verstr" pytest
     dockertestrc=$?
     if [ $dockertestrc -ne 0 ]; then
         echo "docker image failed tests" >&2
@@ -64,7 +64,7 @@ fi
 # Will create directory seaflowpy-dist
 # --------------------------------------------------------------------------- #
 [[ -d seaflowpy-dist ]] || mkdir seaflowpy-dist
-docker run -it --rm -v "$(pwd)"/seaflowpy-dist:/app seaflowpy:"$verstr" sh -c 'cp /seaflowpy-dist/* /app/'
+docker run -it --rm -v "$(pwd)"/seaflowpy-dist:/dist seaflowpy:"$verstr" bash -c 'cp /seaflowpy/dist/* /dist/'
 
 # --------------------------------------------------------------------------- #
 # Misc docker tasks