[arvados] created: 2.7.0-5323-gdc524f398e

[git repository hosting]

        at  dc524f398ed78c9820ef90b87d2ec4422d4f9132 (commit)


commit dc524f398ed78c9820ef90b87d2ec4422d4f9132
Author: Tom Clegg <tom at curii.com>
Date:   Wed Nov 8 15:30:45 2023 -0500

    21184: Accept singularity env var passed through to container.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/crunchrun/executor_test.go b/lib/crunchrun/executor_test.go
index f1a873ae8d..3a91c78641 100644
--- a/lib/crunchrun/executor_test.go
+++ b/lib/crunchrun/executor_test.go
@@ -134,6 +134,10 @@ func (s *executorSuite) TestExecCleanEnv(c *C) {
 			// singularity also sets this by itself (v3.5.2, but not v3.7.4)
 		case "PROMPT_COMMAND", "PS1", "SINGULARITY_BIND", "SINGULARITY_COMMAND", "SINGULARITY_ENVIRONMENT":
 			// singularity also sets these by itself (v3.7.4)
+		case "SINGULARITY_NO_EVAL":
+			// our singularity driver sets this to control
+			// singularity behavior, and it gets passed
+			// through to the container
 		default:
 			got[kv[0]] = kv[1]
 		}

commit e8d36edca6d1601a50f3712bc7d1c7258a23fcc7
Author: Tom Clegg <tom at curii.com>
Date:   Wed Nov 8 15:20:50 2023 -0500

    21184: Remove refs to subprocess32 python2 compatibility shim.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/sdk/cwl/arvados_cwl/runner.py b/sdk/cwl/arvados_cwl/runner.py
index f52768d3d3..437aa39eb8 100644
--- a/sdk/cwl/arvados_cwl/runner.py
+++ b/sdk/cwl/arvados_cwl/runner.py
@@ -42,10 +42,7 @@ from cwltool.utils import (
     CWLOutputType,
 )
 
-if os.name == "posix" and sys.version_info[0] < 3:
-    import subprocess32 as subprocess
-else:
-    import subprocess
+import subprocess
 
 from schema_salad.sourceline import SourceLine, cmap
 
diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index 9e20efd2a3..1da0d53ce8 100644
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -58,7 +58,6 @@ setup(name='arvados-cwl-runner',
       test_suite='tests',
       tests_require=[
           'mock>=1.0,<4',
-          'subprocess32>=3.5.1',
       ],
       zip_safe=True,
 )
diff --git a/sdk/python/arvados/commands/keepdocker.py b/sdk/python/arvados/commands/keepdocker.py
index 4c5b13aa17..7b7367080f 100644
--- a/sdk/python/arvados/commands/keepdocker.py
+++ b/sdk/python/arvados/commands/keepdocker.py
@@ -19,10 +19,7 @@ import fcntl
 from operator import itemgetter
 from stat import *
 
-if os.name == "posix" and sys.version_info[0] < 3:
-    import subprocess32 as subprocess
-else:
-    import subprocess
+import subprocess
 
 import arvados
 import arvados.util

commit 5e2a9f3aeb1e72b9776f3a9974f8f4bffde83f8a
Author: Tom Clegg <tom at curii.com>
Date:   Wed Nov 8 14:58:41 2023 -0500

    21184: Expect recent setuptools and pip versions.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/build/run-tests.sh b/build/run-tests.sh
index 753f32e222..9586a085a3 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -592,7 +592,7 @@ setup_virtualenv() {
     elif [[ -n "$short" ]]; then
         return
     fi
-    "$venvdest/bin/pip3" install --no-cache-dir 'setuptools>=18.5' 'pip>=7'
+    "$venvdest/bin/pip3" install --no-cache-dir 'setuptools>=68' 'pip>=20'
 }
 
 initialize() {

-----------------------------------------------------------------------


hooks/post-receive
--