From d3719517e7353fbe1eb0a107f76dd3ac9d67ee41 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Sat, 28 May 2022 18:37:05 -0400 Subject: [PATCH] attempt to run CI on test_base so we can catch issues with packaging... --- packages/package.Makefile | 3 ++- packages/test.sh | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/package.Makefile b/packages/package.Makefile index f924ba81fe7..dbf38ce86b5 100644 --- a/packages/package.Makefile +++ b/packages/package.Makefile @@ -93,4 +93,5 @@ push-release: release: release-local push-release mypy: - mypy $(SOURCE_DIR) $(TEST_DIR) + test -f $(TEST_DIR) && mypy $(SOURCE_DIR) $(TEST_DIR) + test -f $(TEST_DIR) || mypy $(SOURCE_DIR) diff --git a/packages/test.sh b/packages/test.sh index cd03382faf7..69e518a6fa3 100755 --- a/packages/test.sh +++ b/packages/test.sh @@ -32,6 +32,7 @@ PACKAGE_DIRS=( web_framework app webapps + test_base ) for ((i=0; i<${#PACKAGE_DIRS[@]}; i++)); do printf "\n========= TESTING PACKAGE ${PACKAGE_DIRS[$i]} =========\n\n" @@ -52,7 +53,10 @@ for ((i=0; i<${#PACKAGE_DIRS[@]}; i++)); do # Prevent execution of alembic/env.py at test collection stage (alembic.context not set) unit_extra='--doctest-modules --ignore galaxy/model/migrations/alembic' - pytest $unit_extra galaxy tests + if [ -e tests ]; + then + pytest $unit_extra galaxy tests + fi make mypy cd .. done