From a407a51761fc6e962346caad19c9b50f135ef033 Mon Sep 17 00:00:00 2001 From: Cyrus Harrison Date: Fri, 3 Nov 2023 09:01:58 -0700 Subject: [PATCH] track down various uses of python and change to python3 --- package.py | 2 +- .../alpinedav_ubuntu_18.04_cuda_11.4.0_devel_tpls/build.sh | 2 +- .../alpinedav_ubuntu_20.04_cuda_12.1.1_devel_tpls/build.sh | 2 +- scripts/ci/docker/alpinedav_ubuntu_20.04_devel_tpls/build.sh | 2 +- .../alpinedav_ubuntu_20.04_rocm_5.1.3_devel_tpls/build.sh | 2 +- scripts/ci/docker/alpinedav_ubuntu_22.04_devel/build.sh | 0 scripts/ci/docker/alpinedav_ubuntu_22.04_devel_tpls/build.sh | 2 +- scripts/ci/docker/build_and_tag.py | 2 +- src/examples/docker/ubuntu/build_and_tag.py | 2 +- 9 files changed, 8 insertions(+), 8 deletions(-) mode change 100644 => 100755 scripts/ci/docker/alpinedav_ubuntu_22.04_devel/build.sh mode change 100644 => 100755 scripts/ci/docker/alpinedav_ubuntu_22.04_devel_tpls/build.sh diff --git a/package.py b/package.py index a43e0055a..5d35ad588 100755 --- a/package.py +++ b/package.py @@ -27,7 +27,7 @@ def create_package(output_file=None): suffix = "tar" t = datetime.datetime.now() output_file = "%s.%04d.%02d.%02d.%s" % (repo_name,t.year,t.month,t.day,suffix) - cmd = "python " + pkg_script + " --prefix=ascent " + output_file + cmd = "python3 " + pkg_script + " --prefix=ascent " + output_file print("[exe: {}]".format(cmd)) subprocess.call(cmd,shell=True) diff --git a/scripts/ci/docker/alpinedav_ubuntu_18.04_cuda_11.4.0_devel_tpls/build.sh b/scripts/ci/docker/alpinedav_ubuntu_18.04_cuda_11.4.0_devel_tpls/build.sh index f668de35c..57574466e 100644 --- a/scripts/ci/docker/alpinedav_ubuntu_18.04_cuda_11.4.0_devel_tpls/build.sh +++ b/scripts/ci/docker/alpinedav_ubuntu_18.04_cuda_11.4.0_devel_tpls/build.sh @@ -8,6 +8,6 @@ export TAG_BASE=alpinedav/ascent-ci:ubuntu-18.04-cuda-11.4.0-devel-tpls date -python ../build_and_tag.py ${TAG_BASE} +python3 ../build_and_tag.py ${TAG_BASE} date diff --git a/scripts/ci/docker/alpinedav_ubuntu_20.04_cuda_12.1.1_devel_tpls/build.sh b/scripts/ci/docker/alpinedav_ubuntu_20.04_cuda_12.1.1_devel_tpls/build.sh index 1070d45dc..5a5e9d5b8 100644 --- a/scripts/ci/docker/alpinedav_ubuntu_20.04_cuda_12.1.1_devel_tpls/build.sh +++ b/scripts/ci/docker/alpinedav_ubuntu_20.04_cuda_12.1.1_devel_tpls/build.sh @@ -8,6 +8,6 @@ export TAG_BASE=alpinedav/ascent-ci:ubuntu-20.04-cuda-12.1.1-devel-tpls date -python ../build_and_tag.py ${TAG_BASE} +python3 ../build_and_tag.py ${TAG_BASE} date diff --git a/scripts/ci/docker/alpinedav_ubuntu_20.04_devel_tpls/build.sh b/scripts/ci/docker/alpinedav_ubuntu_20.04_devel_tpls/build.sh index a5cfce236..bda99bf29 100644 --- a/scripts/ci/docker/alpinedav_ubuntu_20.04_devel_tpls/build.sh +++ b/scripts/ci/docker/alpinedav_ubuntu_20.04_devel_tpls/build.sh @@ -8,7 +8,7 @@ export TAG_BASE=alpinedav/ascent-ci:ubuntu-20.04-devel-tpls date -python ../build_and_tag.py ${TAG_BASE} +python3 ../build_and_tag.py ${TAG_BASE} date diff --git a/scripts/ci/docker/alpinedav_ubuntu_20.04_rocm_5.1.3_devel_tpls/build.sh b/scripts/ci/docker/alpinedav_ubuntu_20.04_rocm_5.1.3_devel_tpls/build.sh index fc768f572..12bc0c93a 100755 --- a/scripts/ci/docker/alpinedav_ubuntu_20.04_rocm_5.1.3_devel_tpls/build.sh +++ b/scripts/ci/docker/alpinedav_ubuntu_20.04_rocm_5.1.3_devel_tpls/build.sh @@ -8,6 +8,6 @@ export TAG_BASE=alpinedav/ascent-ci:ubuntu-20.04-rocm-5.1.3-devel-tpls date -python ../build_and_tag.py ${TAG_BASE} +python3 ../build_and_tag.py ${TAG_BASE} date diff --git a/scripts/ci/docker/alpinedav_ubuntu_22.04_devel/build.sh b/scripts/ci/docker/alpinedav_ubuntu_22.04_devel/build.sh old mode 100644 new mode 100755 diff --git a/scripts/ci/docker/alpinedav_ubuntu_22.04_devel_tpls/build.sh b/scripts/ci/docker/alpinedav_ubuntu_22.04_devel_tpls/build.sh old mode 100644 new mode 100755 index a601090ef..a74bc29d8 --- a/scripts/ci/docker/alpinedav_ubuntu_22.04_devel_tpls/build.sh +++ b/scripts/ci/docker/alpinedav_ubuntu_22.04_devel_tpls/build.sh @@ -8,7 +8,7 @@ export TAG_BASE=alpinedav/ascent-ci:ubuntu-22.04-devel-tpls date -python ../build_and_tag.py ${TAG_BASE} +python3 ../build_and_tag.py ${TAG_BASE} date diff --git a/scripts/ci/docker/build_and_tag.py b/scripts/ci/docker/build_and_tag.py index 6ea76d431..e1a026d25 100755 --- a/scripts/ci/docker/build_and_tag.py +++ b/scripts/ci/docker/build_and_tag.py @@ -86,7 +86,7 @@ def main(): os.chdir("../../../../") # get current copy of the ascent source - cmd ='python package.py {0}' + cmd ='python3 package.py {0}' sexe(cmd.format(pjoin(orig_dir, "ascent.docker.src.tar.gz"))) # change back to orig working dir diff --git a/src/examples/docker/ubuntu/build_and_tag.py b/src/examples/docker/ubuntu/build_and_tag.py index 6ea76d431..e1a026d25 100644 --- a/src/examples/docker/ubuntu/build_and_tag.py +++ b/src/examples/docker/ubuntu/build_and_tag.py @@ -86,7 +86,7 @@ def main(): os.chdir("../../../../") # get current copy of the ascent source - cmd ='python package.py {0}' + cmd ='python3 package.py {0}' sexe(cmd.format(pjoin(orig_dir, "ascent.docker.src.tar.gz"))) # change back to orig working dir