From 228221edf73d1a7a04af077be8d7c41149ff5e53 Mon Sep 17 00:00:00 2001
From: Brett Smith <brett.smith@curii.com>
Date: Wed, 5 Jun 2024 14:09:54 -0400
Subject: [PATCH] 21863: Stop building cwltest distro package

This was previously used to run the CWL conformance test on shell
nodes. We have an entirely different testing strategy now, so we no
longer need the package. Any users who want it can still get it from
upstream.

Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith@curii.com>
---
 build/get-package-version.sh                          | 3 +--
 build/package-testing/test-package-python3-cwltest.sh | 8 --------
 build/run-build-packages-one-target.sh                | 3 +--
 build/run-build-packages.sh                           | 1 -
 4 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100755 build/package-testing/test-package-python3-cwltest.sh

diff --git a/build/get-package-version.sh b/build/get-package-version.sh
index 390b5dd828..6b29b2c7c2 100755
--- a/build/get-package-version.sh
+++ b/build/get-package-version.sh
@@ -44,8 +44,7 @@ elif [[ "$TYPE_LANG" == "python3" ]]; then
 
   rm -rf dist/*
 
-  # filter a useless warning (when building the cwltest package) from the stderr output
-  if ! python3 setup.py $DASHQ_UNLESS_DEBUG sdist 2> >(grep -v 'warning: no previously-included files matching' |grep -v 'for version number calculation'); then
+  if ! python3 setup.py $DASHQ_UNLESS_DEBUG sdist; then
     echo "Error, unable to run python3 setup.py sdist for $SRC_PATH"
     exit 1
   fi
diff --git a/build/package-testing/test-package-python3-cwltest.sh b/build/package-testing/test-package-python3-cwltest.sh
deleted file mode 100755
index 77f1f44016..0000000000
--- a/build/package-testing/test-package-python3-cwltest.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-# Copyright (C) The Arvados Authors. All rights reserved.
-#
-# SPDX-License-Identifier: AGPL-3.0
-
-set -e
-
-cwltest -h >/dev/null
diff --git a/build/run-build-packages-one-target.sh b/build/run-build-packages-one-target.sh
index b1801dd307..a200e14a03 100755
--- a/build/run-build-packages-one-target.sh
+++ b/build/run-build-packages-one-target.sh
@@ -252,8 +252,7 @@ if test -z "$packages" ; then
         python3-arvados-fuse
         python3-arvados-python-client
         python3-arvados-user-activity
-        python3-crunchstat-summary
-        python3-cwltest"
+        python3-crunchstat-summary"
 fi
 
 FINAL_EXITCODE=0
diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index 588ebedb92..a348f7a61f 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -272,7 +272,6 @@ debug_echo -e "\nPython packages\n"
 # Before a Python package can be built, its dependencies must already be built.
 # This list is ordered accordingly.
 setup_build_virtualenv
-fpm_build_virtualenv cwltest "==2.3.20230108193615" "$FORMAT" "$ARCH"
 fpm_build_virtualenv "arvados-python-client" "sdk/python" "$FORMAT" "$ARCH"
 fpm_build_virtualenv "crunchstat-summary" "tools/crunchstat-summary" "$FORMAT" "$ARCH"
 fpm_build_virtualenv "arvados-cwl-runner" "sdk/cwl" "$FORMAT" "$ARCH"
-- 
2.30.2