This is an automated email from the ASF dual-hosted git repository. madhan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 483ba3ea23c0b329a30b58460d4450f72f166e62 Author: Madhan Neethiraj <mad...@apache.org> AuthorDate: Wed Nov 22 09:08:34 2023 -0800 Revert "ATLAS-4184: updated build/python scripts to replace references to python with python3" incorrect JIRA number in commit message This reverts commit 0f331aa63095bae010f2c4cb0a76e58eb5606e1b. --- dev-support/atlas-docker/Dockerfile.atlas-base | 2 +- distro/pom.xml | 2 +- distro/src/bin/atlas_admin.py | 2 +- distro/src/bin/atlas_client_cmdline.py | 2 +- distro/src/bin/atlas_config.py | 2 +- distro/src/bin/atlas_kafka_setup.py | 2 +- distro/src/bin/atlas_kafka_setup_hook.py | 2 +- distro/src/bin/atlas_start.py | 2 +- distro/src/bin/atlas_stop.py | 2 +- distro/src/bin/atlas_update_simple_auth_json.py | 2 +- distro/src/bin/cputil.py | 2 +- distro/src/bin/quick_start.py | 2 +- distro/src/bin/quick_start_v1.py | 2 +- distro/src/test/mock/setup.py | 2 +- distro/src/test/python/scripts/TestMetadata.py | 2 +- distro/src/test/python/unitTests.py | 2 +- tools/atlas-index-repair/src/main/resources/repair_index.py | 2 +- tools/atlas-migration-exporter/atlas_migration_export.py | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dev-support/atlas-docker/Dockerfile.atlas-base b/dev-support/atlas-docker/Dockerfile.atlas-base index 6a39586b7..4aa225c16 100644 --- a/dev-support/atlas-docker/Dockerfile.atlas-base +++ b/dev-support/atlas-docker/Dockerfile.atlas-base @@ -23,7 +23,7 @@ ARG ATLAS_BASE_JAVA_VERSION # Install tzdata, Python, Java RUN apt-get update && \ DEBIAN_FRONTEND="noninteractive" apt-get -y install tzdata \ - python3 python3-pip openjdk-8-jdk openjdk-11-jdk openjdk-17-jdk bc iputils-ping ssh pdsh + python python3 python3-pip openjdk-8-jdk openjdk-11-jdk openjdk-17-jdk bc iputils-ping ssh pdsh # Set environment variables ENV JAVA_HOME /usr/lib/jvm/java-${ATLAS_BASE_JAVA_VERSION}-openjdk-${TARGETARCH} diff --git a/distro/pom.xml b/distro/pom.xml index 874b944f2..9df238eb3 100644 --- a/distro/pom.xml +++ b/distro/pom.xml @@ -572,7 +572,7 @@ atlas.graph.storage.conf-file=${sys:atlas.home}/conf/cassandra.yml <execution> <configuration> <skip>${skipTests}</skip> - <executable>python3</executable> + <executable>python</executable> <workingDirectory>src/test/python</workingDirectory> <arguments> <argument>unitTests.py</argument> diff --git a/distro/src/bin/atlas_admin.py b/distro/src/bin/atlas_admin.py index e7413d3ae..795a5716f 100644 --- a/distro/src/bin/atlas_admin.py +++ b/distro/src/bin/atlas_admin.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/distro/src/bin/atlas_client_cmdline.py b/distro/src/bin/atlas_client_cmdline.py index 1691526e2..f05a3c8f9 100644 --- a/distro/src/bin/atlas_client_cmdline.py +++ b/distro/src/bin/atlas_client_cmdline.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/distro/src/bin/atlas_config.py b/distro/src/bin/atlas_config.py index 70030ac5c..31e6fd043 100755 --- a/distro/src/bin/atlas_config.py +++ b/distro/src/bin/atlas_config.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/distro/src/bin/atlas_kafka_setup.py b/distro/src/bin/atlas_kafka_setup.py index 4451a5bcd..c13030e88 100644 --- a/distro/src/bin/atlas_kafka_setup.py +++ b/distro/src/bin/atlas_kafka_setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/distro/src/bin/atlas_kafka_setup_hook.py b/distro/src/bin/atlas_kafka_setup_hook.py index 6dc8d08a3..cd8c0c3ca 100644 --- a/distro/src/bin/atlas_kafka_setup_hook.py +++ b/distro/src/bin/atlas_kafka_setup_hook.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/distro/src/bin/atlas_start.py b/distro/src/bin/atlas_start.py index f7d51c090..ffbe16271 100755 --- a/distro/src/bin/atlas_start.py +++ b/distro/src/bin/atlas_start.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/distro/src/bin/atlas_stop.py b/distro/src/bin/atlas_stop.py index 2132ee698..b9cd63689 100755 --- a/distro/src/bin/atlas_stop.py +++ b/distro/src/bin/atlas_stop.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/distro/src/bin/atlas_update_simple_auth_json.py b/distro/src/bin/atlas_update_simple_auth_json.py index fbd3eae20..11c249d9b 100755 --- a/distro/src/bin/atlas_update_simple_auth_json.py +++ b/distro/src/bin/atlas_update_simple_auth_json.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/distro/src/bin/cputil.py b/distro/src/bin/cputil.py index bf93cec52..8e99f95bc 100755 --- a/distro/src/bin/cputil.py +++ b/distro/src/bin/cputil.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/distro/src/bin/quick_start.py b/distro/src/bin/quick_start.py index a99f74d69..78517f865 100755 --- a/distro/src/bin/quick_start.py +++ b/distro/src/bin/quick_start.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/distro/src/bin/quick_start_v1.py b/distro/src/bin/quick_start_v1.py index 0c7bb92f2..1c5775a68 100755 --- a/distro/src/bin/quick_start_v1.py +++ b/distro/src/bin/quick_start_v1.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/distro/src/test/mock/setup.py b/distro/src/test/mock/setup.py index 08d8e4744..3639df4a1 100644 --- a/distro/src/test/mock/setup.py +++ b/distro/src/test/mock/setup.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python3 +#! /usr/bin/env python # Copyright (C) 2007-2012 Michael Foord & the mock team # E-mail: fuzzyman AT voidspace DOT org DOT uk diff --git a/distro/src/test/python/scripts/TestMetadata.py b/distro/src/test/python/scripts/TestMetadata.py index bebf35e5b..b813f927f 100644 --- a/distro/src/test/python/scripts/TestMetadata.py +++ b/distro/src/test/python/scripts/TestMetadata.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python ''' Licensed to the Apache Software Foundation (ASF) under one diff --git a/distro/src/test/python/unitTests.py b/distro/src/test/python/unitTests.py index 5e5886a08..ec1a78cb9 100644 --- a/distro/src/test/python/unitTests.py +++ b/distro/src/test/python/unitTests.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python """ Licensed to the Apache Software Foundation (ASF) under one diff --git a/tools/atlas-index-repair/src/main/resources/repair_index.py b/tools/atlas-index-repair/src/main/resources/repair_index.py index d72c2c907..0333dadca 100755 --- a/tools/atlas-index-repair/src/main/resources/repair_index.py +++ b/tools/atlas-index-repair/src/main/resources/repair_index.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/tools/atlas-migration-exporter/atlas_migration_export.py b/tools/atlas-migration-exporter/atlas_migration_export.py index f57f39d05..e1b12f609 100755 --- a/tools/atlas-migration-exporter/atlas_migration_export.py +++ b/tools/atlas-migration-exporter/atlas_migration_export.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python # # Licensed to the Apache Software Foundation (ASF) under one or more