21184: Remove refs to subprocess32 python2 compatibility shim.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --git a/sdk/cwl/arvados_cwl/runner.py b/sdk/cwl/arvados_cwl/runner.py
index f52768d3d39662ec9ce67e91a930f50587b7f5b9..437aa39eb86dc7453fee161c53d85686fbe00f5c 100644 (file)
--- 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 9e20efd2a3a5d9f38460c712a1a36b9f2e870582..1da0d53ce8813d29bb788ce86fb35b96a94646c8 100644 (file)
--- 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 4c5b13aa1710d9cea02314c6a4d9055e99580c10..7b7367080fdd0780ddcf23c03cd197ea949ceeb8 100644 (file)
--- 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