You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bi...@apache.org on 2023/06/30 15:20:55 UTC

[storm] branch master updated: [STORM-3928] Use python3 in flux test, examples and wrappers (#3550)

This is an automated email from the ASF dual-hosted git repository.

bipinprasad pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git


The following commit(s) were added to refs/heads/master by this push:
     new 707e817b2 [STORM-3928] Use python3 in flux test, examples and wrappers (#3550)
707e817b2 is described below

commit 707e817b221ee8ca8ee9a6955f6fff72e26b95d5
Author: Bipin Prasad <bi...@apache.org>
AuthorDate: Fri Jun 30 08:20:49 2023 -0700

    [STORM-3928] Use python3 in flux test, examples and wrappers (#3550)
---
 flux/README.md                                                    | 6 +++---
 flux/flux-core/src/test/resources/configs/bad_shell_test.yaml     | 2 +-
 flux/flux-core/src/test/resources/configs/kafka_test.yaml         | 2 +-
 flux/flux-core/src/test/resources/configs/shell_test.yaml         | 2 +-
 flux/flux-core/src/test/resources/configs/substitution-test.yaml  | 2 +-
 flux/flux-examples/src/main/resources/kafka_spout.yaml            | 2 +-
 flux/flux-examples/src/main/resources/multilang.yaml              | 2 +-
 .../java/org/apache/storm/flux/wrappers/bolts/FluxShellBolt.java  | 8 ++++----
 .../org/apache/storm/flux/wrappers/spouts/FluxShellSpout.java     | 8 ++++----
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/flux/README.md b/flux/README.md
index 47bc7d6df..eb10d5a9c 100644
--- a/flux/README.md
+++ b/flux/README.md
@@ -44,7 +44,7 @@ The easiest way to use Flux, is to add it as a Maven dependency in you project a
 If you would like to build Flux from source and run the unit/integration tests, you will need the following installed
 on your system:
 
-* Python 2.6.x or later
+* Python 3.0.x or later
 * Node.js 0.10.x or later
 
 #### Building with unit tests enabled:
@@ -640,7 +640,7 @@ bolts:
     className: "org.apache.storm.flux.wrappers.bolts.FluxShellBolt"
     constructorArgs:
       # command line
-      - ["python", "splitsentence.py"]
+      - ["python3", "splitsentence.py"]
       # output fields
       - ["word"]
     parallelism: 1
@@ -787,7 +787,7 @@ bolts:
     className: "org.apache.storm.flux.wrappers.bolts.FluxShellBolt"
     constructorArgs:
       # command line
-      - ["python", "splitsentence.py"]
+      - ["python3", "splitsentence.py"]
       # output fields
       - ["word"]
     parallelism: 1
diff --git a/flux/flux-core/src/test/resources/configs/bad_shell_test.yaml b/flux/flux-core/src/test/resources/configs/bad_shell_test.yaml
index 0892ce716..a7f03b41d 100644
--- a/flux/flux-core/src/test/resources/configs/bad_shell_test.yaml
+++ b/flux/flux-core/src/test/resources/configs/bad_shell_test.yaml
@@ -69,7 +69,7 @@ bolts:
     className: "org.apache.storm.flux.wrappers.bolts.FluxShellBolt"
     constructorArgs:
       # command line
-      - ["python", "splitsentence.py"]
+      - ["python3", "splitsentence.py"]
       # output fields
       - ["word"]
     configMethods:
diff --git a/flux/flux-core/src/test/resources/configs/kafka_test.yaml b/flux/flux-core/src/test/resources/configs/kafka_test.yaml
index 76d2ee8c2..a6f38bbb2 100644
--- a/flux/flux-core/src/test/resources/configs/kafka_test.yaml
+++ b/flux/flux-core/src/test/resources/configs/kafka_test.yaml
@@ -71,7 +71,7 @@ bolts:
     className: "org.apache.storm.flux.wrappers.bolts.FluxShellBolt"
     constructorArgs:
       # command line
-      - ["python", "splitsentence.py"]
+      - ["python3", "splitsentence.py"]
       # output fields
       - ["word"]
     parallelism: 1
diff --git a/flux/flux-core/src/test/resources/configs/shell_test.yaml b/flux/flux-core/src/test/resources/configs/shell_test.yaml
index dfab39760..b18d846e9 100644
--- a/flux/flux-core/src/test/resources/configs/shell_test.yaml
+++ b/flux/flux-core/src/test/resources/configs/shell_test.yaml
@@ -69,7 +69,7 @@ bolts:
     className: "org.apache.storm.flux.wrappers.bolts.FluxShellBolt"
     constructorArgs:
       # command line
-      - ["python", "splitsentence.py"]
+      - ["python3", "splitsentence.py"]
       # output fields
       - ["word"]
     configMethods:
diff --git a/flux/flux-core/src/test/resources/configs/substitution-test.yaml b/flux/flux-core/src/test/resources/configs/substitution-test.yaml
index 67ac92aa3..759ee38d0 100644
--- a/flux/flux-core/src/test/resources/configs/substitution-test.yaml
+++ b/flux/flux-core/src/test/resources/configs/substitution-test.yaml
@@ -67,7 +67,7 @@ bolts:
     className: "org.apache.storm.flux.wrappers.bolts.FluxShellBolt"
     constructorArgs:
       # command line
-      - ["python", "splitsentence.py"]
+      - ["python3", "splitsentence.py"]
       # output fields
       - ["word"]
     parallelism: 1
diff --git a/flux/flux-examples/src/main/resources/kafka_spout.yaml b/flux/flux-examples/src/main/resources/kafka_spout.yaml
index 37f14f1a2..938968051 100644
--- a/flux/flux-examples/src/main/resources/kafka_spout.yaml
+++ b/flux/flux-examples/src/main/resources/kafka_spout.yaml
@@ -71,7 +71,7 @@ bolts:
     className: "org.apache.storm.flux.wrappers.bolts.FluxShellBolt"
     constructorArgs:
       # command line
-      - ["python", "splitsentence.py"]
+      - ["python3", "splitsentence.py"]
       # output fields
       - ["word"]
     parallelism: 1
diff --git a/flux/flux-examples/src/main/resources/multilang.yaml b/flux/flux-examples/src/main/resources/multilang.yaml
index aaab5d3b3..a0d9dfef4 100644
--- a/flux/flux-examples/src/main/resources/multilang.yaml
+++ b/flux/flux-examples/src/main/resources/multilang.yaml
@@ -47,7 +47,7 @@ bolts:
     className: "org.apache.storm.flux.wrappers.bolts.FluxShellBolt"
     constructorArgs:
       # command line
-      - ["python", "splitsentence.py"]
+      - ["python3", "splitsentence.py"]
       # output fields
       - ["word"]
     parallelism: 1
diff --git a/flux/flux-wrappers/src/main/java/org/apache/storm/flux/wrappers/bolts/FluxShellBolt.java b/flux/flux-wrappers/src/main/java/org/apache/storm/flux/wrappers/bolts/FluxShellBolt.java
index 8f8916b7b..3881e93be 100644
--- a/flux/flux-wrappers/src/main/java/org/apache/storm/flux/wrappers/bolts/FluxShellBolt.java
+++ b/flux/flux-wrappers/src/main/java/org/apache/storm/flux/wrappers/bolts/FluxShellBolt.java
@@ -65,7 +65,7 @@ public class FluxShellBolt extends ShellBolt implements IRichBolt {
      * className: "org.apache.storm.flux.wrappers.bolts.FluxShellBolt"
      * constructorArgs:
      * # command line
-     * - ["python", "splitsentence.py"]
+     * - ["python3", "splitsentence.py"]
      * # output fields
      * - ["word"]
      * configMethods:
@@ -90,7 +90,7 @@ public class FluxShellBolt extends ShellBolt implements IRichBolt {
      * className: "org.apache.storm.flux.wrappers.bolts.FluxShellBolt"
      * constructorArgs:
      * # command line
-     * - ["python", "splitsentence.py"]
+     * - ["python3", "splitsentence.py"]
      * # output fields
      * - ["word"]
      * configMethods:
@@ -118,7 +118,7 @@ public class FluxShellBolt extends ShellBolt implements IRichBolt {
      * - className: org.apache.storm.flux.wrappers.bolts.FluxShellBolt
      *   id: my_bolt
      *   constructorArgs:
-     *   - [python, my_bolt.py]
+     *   - [python3, my_bolt.py]
      *   configMethods:
      *   - name: setDefaultStream
      *     args:
@@ -139,7 +139,7 @@ public class FluxShellBolt extends ShellBolt implements IRichBolt {
      * - className: org.apache.storm.flux.wrappers.bolts.FluxShellBolt
      *   id: my_bolt
      *   constructorArgs:
-     *   - [python, my_bolt.py]
+     *   - [python3, my_bolt.py]
      *   configMethods:
      *   - name: setNamedStream
      *     args:
diff --git a/flux/flux-wrappers/src/main/java/org/apache/storm/flux/wrappers/spouts/FluxShellSpout.java b/flux/flux-wrappers/src/main/java/org/apache/storm/flux/wrappers/spouts/FluxShellSpout.java
index 89495fe32..caa920f5b 100644
--- a/flux/flux-wrappers/src/main/java/org/apache/storm/flux/wrappers/spouts/FluxShellSpout.java
+++ b/flux/flux-wrappers/src/main/java/org/apache/storm/flux/wrappers/spouts/FluxShellSpout.java
@@ -67,7 +67,7 @@ public class FluxShellSpout extends ShellSpout implements IRichSpout {
      * className: "org.apache.storm.flux.wrappers.bolts.FluxShellSpout"
      * constructorArgs:
      * # command line
-     * - ["python", "splitsentence.py"]
+     * - ["python3", "splitsentence.py"]
      * # output fields
      * - ["word"]
      * configMethods:
@@ -92,7 +92,7 @@ public class FluxShellSpout extends ShellSpout implements IRichSpout {
      * className: "org.apache.storm.flux.wrappers.bolts.FluxShellSpout"
      * constructorArgs:
      * # command line
-     * - ["python", "splitsentence.py"]
+     * - ["python3", "splitsentence.py"]
      * # output fields
      * - ["word"]
      * configMethods:
@@ -120,7 +120,7 @@ public class FluxShellSpout extends ShellSpout implements IRichSpout {
      * - className: org.apache.storm.flux.wrappers.bolts.FluxShellSpout
      *   id: my_spout
      *   constructorArgs:
-     *   - [python, my_spout.py]
+     *   - [python3, my_spout.py]
      *   configMethods:
      *   - name: setDefaultStream
      *     args:
@@ -141,7 +141,7 @@ public class FluxShellSpout extends ShellSpout implements IRichSpout {
      * - className: org.apache.storm.flux.wrappers.bolts.FluxShellSpout
      *   id: my_spout
      *   constructorArgs:
-     *   - [python, my_spout.py]
+     *   - [python3, my_spout.py]
      *   configMethods:
      *   - name: setNamedStream
      *     args: