diff --git a/packages/build_packages.sh b/packages/build_packages.sh index 38a7dd978bf..249b9143df5 100755 --- a/packages/build_packages.sh +++ b/packages/build_packages.sh @@ -9,27 +9,8 @@ set -ex cd "$(dirname "$0")" # ensure ordered by dependency dag -PACKAGE_DIRS=( - util - objectstore - job_metrics - config - files - tool_util - data - job_execution - auth - web_stack - web_framework - app - webapps - test_base - test_driver - test_api -) -for ((i=0; i<${#PACKAGE_DIRS[@]}; i++)); do - printf "\n========= RELEASING PACKAGE ${PACKAGE_DIRS[$i]} =========\n\n" - package_dir=${PACKAGE_DIRS[$i]} +while read -r package_dir; do + printf "\n========= RELEASING PACKAGE ${package_dir} =========\n\n" cd "$package_dir" @@ -39,4 +20,4 @@ for ((i=0; i<${#PACKAGE_DIRS[@]}; i++)); do make new-version cd .. -done +done < packages_by_dep_dag.txt diff --git a/packages/packages_by_dep_dag.txt b/packages/packages_by_dep_dag.txt new file mode 100644 index 00000000000..66bd5d1ddc5 --- /dev/null +++ b/packages/packages_by_dep_dag.txt @@ -0,0 +1,19 @@ +util +config +files +job_metrics +navigation +objectstore +tool_util +data +selenium +tours +auth +job_execution +web_stack +web_framework +app +webapps +test_base +test_driver +test_api diff --git a/packages/selenium/setup.cfg b/packages/selenium/setup.cfg index f25aa4a2a4a..74f7511f7fd 100644 --- a/packages/selenium/setup.cfg +++ b/packages/selenium/setup.cfg @@ -31,7 +31,8 @@ version = 22.5.0.dev0 [options] include_package_data = True install_requires = - galaxy-data + galaxy-navigation + galaxy-util PyYAML requests selenium diff --git a/packages/test.sh b/packages/test.sh index ee0cef696b5..90d0e225cfc 100755 --- a/packages/test.sh +++ b/packages/test.sh @@ -18,30 +18,8 @@ pip install --upgrade pip setuptools wheel pip install -r../lib/galaxy/dependencies/pinned-typecheck-requirements.txt # ensure ordered by dependency DAG -# TODO: add selenium in once type issues are cleared up -PACKAGE_DIRS=( - util - objectstore - job_metrics - config - files - tool_util - data - job_execution - auth - web_stack - web_framework - navigation - tours - app - webapps - test_base - test_driver - test_api -) -for ((i=0; i<${#PACKAGE_DIRS[@]}; i++)); do - printf "\n========= TESTING PACKAGE ${PACKAGE_DIRS[$i]} =========\n\n" - package_dir=${PACKAGE_DIRS[$i]} +while read -r package_dir; do + printf "\n========= TESTING PACKAGE ${package_dir} =========\n\n" cd "$package_dir" @@ -63,4 +41,4 @@ for ((i=0; i<${#PACKAGE_DIRS[@]}; i++)); do pytest $unit_extra -m 'not external_dependency_management' . || test $? -eq 5 make mypy cd .. -done +done < packages_by_dep_dag.txt