From 93a6cd716b800de2ce749877014ecec908b9cf36 Mon Sep 17 00:00:00 2001 From: Kevin Date: Thu, 17 Dec 2020 14:00:20 -0800 Subject: [PATCH 01/12] Preparing for 0.6.0 development --- pom.xml | 2 +- submarine-all/pom.xml | 4 ++-- submarine-client/pom.xml | 4 ++-- submarine-cloud/pom.xml | 4 ++-- submarine-commons/commons-cluster/pom.xml | 4 ++-- submarine-commons/commons-metastore/pom.xml | 4 ++-- submarine-commons/commons-rpc/pom.xml | 4 ++-- submarine-commons/commons-runtime/pom.xml | 4 ++-- submarine-commons/commons-unixusersync/pom.xml | 4 ++-- submarine-commons/commons-utils/pom.xml | 4 ++-- submarine-commons/pom.xml | 4 ++-- submarine-dist/pom.xml | 4 ++-- submarine-security/spark-security/pom.xml | 2 +- submarine-server/pom.xml | 4 ++-- submarine-server/server-api/pom.xml | 2 +- submarine-server/server-core/pom.xml | 2 +- submarine-server/server-rpc/pom.xml | 4 ++-- submarine-server/server-submitter/pom.xml | 4 ++-- submarine-server/server-submitter/submitter-k8s/pom.xml | 4 ++-- submarine-server/server-submitter/submitter-yarn/pom.xml | 4 ++-- .../server-submitter/submitter-yarnservice/pom.xml | 4 ++-- submarine-test/pom.xml | 4 ++-- submarine-test/test-e2e/pom.xml | 4 ++-- submarine-test/test-k8s/pom.xml | 4 ++-- submarine-workbench/pom.xml | 4 ++-- submarine-workbench/workbench-web/pom.xml | 4 ++-- 26 files changed, 48 insertions(+), 48 deletions(-) diff --git a/pom.xml b/pom.xml index 6055d53408..9d7c9b1aa9 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.submarine submarine - 0.5.0 + 0.6.0-SNAPSHOT pom Submarine Submarine project diff --git a/submarine-all/pom.xml b/submarine-all/pom.xml index 9bf988d4c7..75f5abd15b 100644 --- a/submarine-all/pom.xml +++ b/submarine-all/pom.xml @@ -25,11 +25,11 @@ org.apache.submarine submarine - 0.5.0 + 0.6.0-SNAPSHOT .. submarine-all - 0.5.0 + 0.6.0-SNAPSHOT Submarine: All diff --git a/submarine-client/pom.xml b/submarine-client/pom.xml index ddc0fd8220..6ab03620a4 100644 --- a/submarine-client/pom.xml +++ b/submarine-client/pom.xml @@ -24,12 +24,12 @@ submarine org.apache.submarine - 0.5.0 + 0.6.0-SNAPSHOT 4.0.0 submarine-client - 0.5.0 + 0.6.0-SNAPSHOT Submarine: Client diff --git a/submarine-cloud/pom.xml b/submarine-cloud/pom.xml index a3a9fee980..d2ad28dce7 100644 --- a/submarine-cloud/pom.xml +++ b/submarine-cloud/pom.xml @@ -25,10 +25,10 @@ org.apache.submarine submarine - 0.5.0 + 0.6.0-SNAPSHOT submarine-cloud - 0.5.0 + 0.6.0-SNAPSHOT Submarine: Cloud pom diff --git a/submarine-commons/commons-cluster/pom.xml b/submarine-commons/commons-cluster/pom.xml index b09a6f5e21..259b3b843b 100644 --- a/submarine-commons/commons-cluster/pom.xml +++ b/submarine-commons/commons-cluster/pom.xml @@ -23,11 +23,11 @@ org.apache.submarine submarine-commons - 0.5.0 + 0.6.0-SNAPSHOT 4.0.0 submarine-commons-cluster - 0.5.0 + 0.6.0-SNAPSHOT Submarine: Commons Cluster diff --git a/submarine-commons/commons-metastore/pom.xml b/submarine-commons/commons-metastore/pom.xml index 38e1604f05..c83e474c6a 100644 --- a/submarine-commons/commons-metastore/pom.xml +++ b/submarine-commons/commons-metastore/pom.xml @@ -25,13 +25,13 @@ org.apache.submarine submarine-commons - 0.5.0 + 0.6.0-SNAPSHOT ../pom.xml org.apache.submarine submarine-commons-metastore - 0.5.0 + 0.6.0-SNAPSHOT Submarine: Commons MetaStore diff --git a/submarine-commons/commons-rpc/pom.xml b/submarine-commons/commons-rpc/pom.xml index 9ba7362e92..c18597f74e 100644 --- a/submarine-commons/commons-rpc/pom.xml +++ b/submarine-commons/commons-rpc/pom.xml @@ -25,13 +25,13 @@ org.apache.submarine submarine-commons - 0.5.0 + 0.6.0-SNAPSHOT ../pom.xml org.apache.submarine submarine-commons-rpc - 0.5.0 + 0.6.0-SNAPSHOT Submarine: Commons RPC diff --git a/submarine-commons/commons-runtime/pom.xml b/submarine-commons/commons-runtime/pom.xml index c4d4e8b0d0..7874b62218 100644 --- a/submarine-commons/commons-runtime/pom.xml +++ b/submarine-commons/commons-runtime/pom.xml @@ -24,13 +24,13 @@ org.apache.submarine submarine-commons - 0.5.0 + 0.6.0-SNAPSHOT 4.0.0 org.apache.submarine submarine-commons-runtime - 0.5.0 + 0.6.0-SNAPSHOT Submarine: Commons Runtime diff --git a/submarine-commons/commons-unixusersync/pom.xml b/submarine-commons/commons-unixusersync/pom.xml index 95b51ee063..b1b9e0e5fa 100644 --- a/submarine-commons/commons-unixusersync/pom.xml +++ b/submarine-commons/commons-unixusersync/pom.xml @@ -25,12 +25,12 @@ org.apache.submarine submarine-commons - 0.5.0 + 0.6.0-SNAPSHOT ../pom.xml submarine-commons-unixusersync - 0.5.0 + 0.6.0-SNAPSHOT Submarine: Commons Unixusersync diff --git a/submarine-commons/commons-utils/pom.xml b/submarine-commons/commons-utils/pom.xml index cecaab3bc6..4b99d8200f 100644 --- a/submarine-commons/commons-utils/pom.xml +++ b/submarine-commons/commons-utils/pom.xml @@ -25,13 +25,13 @@ org.apache.submarine submarine-commons - 0.5.0 + 0.6.0-SNAPSHOT ../pom.xml org.apache.submarine submarine-commons-utils - 0.5.0 + 0.6.0-SNAPSHOT Submarine: Commons Utils diff --git a/submarine-commons/pom.xml b/submarine-commons/pom.xml index 3f352fedce..d9211fa4e3 100644 --- a/submarine-commons/pom.xml +++ b/submarine-commons/pom.xml @@ -23,14 +23,14 @@ org.apache.submarine submarine - 0.5.0 + 0.6.0-SNAPSHOT ../pom.xml 4.0.0 org.apache.submarine submarine-commons - 0.5.0 + 0.6.0-SNAPSHOT pom Submarine: Commons diff --git a/submarine-dist/pom.xml b/submarine-dist/pom.xml index a8dda7d1ab..2996cfe980 100644 --- a/submarine-dist/pom.xml +++ b/submarine-dist/pom.xml @@ -25,11 +25,11 @@ org.apache.submarine submarine - 0.5.0 + 0.6.0-SNAPSHOT .. submarine-dist - 0.5.0 + 0.6.0-SNAPSHOT Submarine: Dist pom diff --git a/submarine-security/spark-security/pom.xml b/submarine-security/spark-security/pom.xml index 36a1f43e29..44a2fac032 100644 --- a/submarine-security/spark-security/pom.xml +++ b/submarine-security/spark-security/pom.xml @@ -24,7 +24,7 @@ submarine org.apache.submarine - 0.5.0 + 0.6.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/submarine-server/pom.xml b/submarine-server/pom.xml index f6375e0e13..b17dfc2bb7 100644 --- a/submarine-server/pom.xml +++ b/submarine-server/pom.xml @@ -24,12 +24,12 @@ submarine org.apache.submarine - 0.5.0 + 0.6.0-SNAPSHOT 4.0.0 submarine-server - 0.5.0 + 0.6.0-SNAPSHOT pom Submarine: Server diff --git a/submarine-server/server-api/pom.xml b/submarine-server/server-api/pom.xml index 8494624446..933ff0227c 100644 --- a/submarine-server/server-api/pom.xml +++ b/submarine-server/server-api/pom.xml @@ -24,7 +24,7 @@ submarine-server org.apache.submarine - 0.5.0 + 0.6.0-SNAPSHOT 4.0.0 diff --git a/submarine-server/server-core/pom.xml b/submarine-server/server-core/pom.xml index fdc30f3fa8..dda5c63305 100644 --- a/submarine-server/server-core/pom.xml +++ b/submarine-server/server-core/pom.xml @@ -24,7 +24,7 @@ submarine-server org.apache.submarine - 0.5.0 + 0.6.0-SNAPSHOT 4.0.0 diff --git a/submarine-server/server-rpc/pom.xml b/submarine-server/server-rpc/pom.xml index ec1d773db5..a7ce5ad3fb 100644 --- a/submarine-server/server-rpc/pom.xml +++ b/submarine-server/server-rpc/pom.xml @@ -24,12 +24,12 @@ org.apache.submarine submarine-server - 0.5.0 + 0.6.0-SNAPSHOT 4.0.0 submarine-server-rpc - 0.5.0 + 0.6.0-SNAPSHOT Submarine: Server RPC diff --git a/submarine-server/server-submitter/pom.xml b/submarine-server/server-submitter/pom.xml index 95756066ee..0673ec163d 100644 --- a/submarine-server/server-submitter/pom.xml +++ b/submarine-server/server-submitter/pom.xml @@ -24,12 +24,12 @@ submarine-server org.apache.submarine - 0.5.0 + 0.6.0-SNAPSHOT 4.0.0 submarine-server-submitter - 0.5.0 + 0.6.0-SNAPSHOT pom Submarine: Submitter diff --git a/submarine-server/server-submitter/submitter-k8s/pom.xml b/submarine-server/server-submitter/submitter-k8s/pom.xml index b0cf47dbae..47997b3306 100644 --- a/submarine-server/server-submitter/submitter-k8s/pom.xml +++ b/submarine-server/server-submitter/submitter-k8s/pom.xml @@ -24,12 +24,12 @@ submarine-server-submitter org.apache.submarine - 0.5.0 + 0.6.0-SNAPSHOT 4.0.0 submarine-submitter-k8s - 0.5.0 + 0.6.0-SNAPSHOT Submarine: Kubernetes Submitter diff --git a/submarine-server/server-submitter/submitter-yarn/pom.xml b/submarine-server/server-submitter/submitter-yarn/pom.xml index d11041f8c7..1f6ea10f6b 100644 --- a/submarine-server/server-submitter/submitter-yarn/pom.xml +++ b/submarine-server/server-submitter/submitter-yarn/pom.xml @@ -20,12 +20,12 @@ org.apache.submarine submarine-server-submitter - 0.5.0 + 0.6.0-SNAPSHOT ../pom.xml submarine-submitter-yarn - 0.5.0 + 0.6.0-SNAPSHOT Submarine: YARN Submitter diff --git a/submarine-server/server-submitter/submitter-yarnservice/pom.xml b/submarine-server/server-submitter/submitter-yarnservice/pom.xml index 265e67a6cd..1f9b2eaa75 100644 --- a/submarine-server/server-submitter/submitter-yarnservice/pom.xml +++ b/submarine-server/server-submitter/submitter-yarnservice/pom.xml @@ -25,11 +25,11 @@ org.apache.submarine submarine-server-submitter - 0.5.0 + 0.6.0-SNAPSHOT submarine-submitter-yarnservice - 0.5.0 + 0.6.0-SNAPSHOT Submarine: YARN Service Submitter diff --git a/submarine-test/pom.xml b/submarine-test/pom.xml index 1ae46557dc..590a2ee0bb 100644 --- a/submarine-test/pom.xml +++ b/submarine-test/pom.xml @@ -25,10 +25,10 @@ submarine org.apache.submarine - 0.5.0 + 0.6.0-SNAPSHOT submarine-test - 0.5.0 + 0.6.0-SNAPSHOT Submarine: Test pom diff --git a/submarine-test/test-e2e/pom.xml b/submarine-test/test-e2e/pom.xml index 534eb4165d..e154195f8a 100644 --- a/submarine-test/test-e2e/pom.xml +++ b/submarine-test/test-e2e/pom.xml @@ -25,11 +25,11 @@ submarine-test org.apache.submarine - 0.5.0 + 0.6.0-SNAPSHOT submarine-test-e2e - 0.5.0 + 0.6.0-SNAPSHOT Submarine: E2E Test diff --git a/submarine-test/test-k8s/pom.xml b/submarine-test/test-k8s/pom.xml index bd29dd3ee3..512cbaa2d5 100644 --- a/submarine-test/test-k8s/pom.xml +++ b/submarine-test/test-k8s/pom.xml @@ -25,11 +25,11 @@ submarine-test org.apache.submarine - 0.5.0 + 0.6.0-SNAPSHOT submarine-test-k8s - 0.5.0 + 0.6.0-SNAPSHOT Submarine: Kubernetes Test diff --git a/submarine-workbench/pom.xml b/submarine-workbench/pom.xml index 5ee707432e..a17a472318 100644 --- a/submarine-workbench/pom.xml +++ b/submarine-workbench/pom.xml @@ -26,12 +26,12 @@ org.apache.submarine submarine - 0.5.0 + 0.6.0-SNAPSHOT ../pom.xml submarine-workbench - 0.5.0 + 0.6.0-SNAPSHOT pom Submarine: Workbench Submarine Workbench diff --git a/submarine-workbench/workbench-web/pom.xml b/submarine-workbench/workbench-web/pom.xml index 5de53253bc..b18a809461 100644 --- a/submarine-workbench/workbench-web/pom.xml +++ b/submarine-workbench/workbench-web/pom.xml @@ -25,14 +25,14 @@ org.apache.submarine submarine-workbench - 0.5.0 + 0.6.0-SNAPSHOT ../pom.xml org.apache.submarine submarine-workbench-web war - 0.5.0 + 0.6.0-SNAPSHOT Submarine: Workbench Web Angular From 3f49c5b0fbe54f8841f1937da18ce04b5e6ab8f9 Mon Sep 17 00:00:00 2001 From: HUAN-PING SU Date: Thu, 17 Dec 2020 15:13:44 -0800 Subject: [PATCH 02/12] Update setup.py --- submarine-sdk/pysubmarine/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submarine-sdk/pysubmarine/setup.py b/submarine-sdk/pysubmarine/setup.py index e99c184e43..d73b86a0fd 100644 --- a/submarine-sdk/pysubmarine/setup.py +++ b/submarine-sdk/pysubmarine/setup.py @@ -20,7 +20,7 @@ setup( name='apache-submarine', - version='0.5.0', + version='0.6.0-SNAPSHOT', description="A python SDK for submarine", long_description=long_description, long_description_content_type="text/markdown", From 838e06add9421c1a295faf49b364d0f2e55dfd13 Mon Sep 17 00:00:00 2001 From: HUAN-PING SU Date: Thu, 17 Dec 2020 15:16:44 -0800 Subject: [PATCH 03/12] Update values.yaml --- helm-charts/submarine/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helm-charts/submarine/values.yaml b/helm-charts/submarine/values.yaml index fd64b90ec9..e1f160023e 100644 --- a/helm-charts/submarine/values.yaml +++ b/helm-charts/submarine/values.yaml @@ -20,13 +20,13 @@ submarine: imagePullPolicy: IfNotPresent replicas: 1 name: submarine-server - image: apache/submarine:server-0.5.0 + image: apache/submarine:server-0.6.0-SNAPSHOT servicePort: 8080 database: imagePullPolicy: IfNotPresent replicas: 1 name: submarine-database - image: apache/submarine:database-0.5.0 + image: apache/submarine:database-0.6.0-SNAPSHOT servicePort: 3306 mysqlRootPassword: password traefik: From 92eac9a92e0d34adf7a1302295ccf73f6692f396 Mon Sep 17 00:00:00 2001 From: HUAN-PING SU Date: Thu, 17 Dec 2020 15:17:34 -0800 Subject: [PATCH 04/12] Update Makefile --- submarine-cloud/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submarine-cloud/Makefile b/submarine-cloud/Makefile index a3ad251179..59ffc9a829 100644 --- a/submarine-cloud/Makefile +++ b/submarine-cloud/Makefile @@ -20,7 +20,7 @@ GOCLEAN=$(GOCMD) clean GOTEST=$(GOCMD) test GOGET=$(GOCMD) get BINARY_NAME=submarine-operator -VERSION="0.5.0" +VERSION="0.6.0-SNAPSHOT" BuildGitBranch=$(git rev-parse --abbrev-ref HEAD) BuildGitRev=$(git rev-list --count HEAD) BuildGitCommit=$(git rev-parse HEAD) From 411919fccc462650b426ddf22f79720e0b956a06 Mon Sep 17 00:00:00 2001 From: HUAN-PING SU Date: Thu, 17 Dec 2020 15:18:04 -0800 Subject: [PATCH 05/12] Update deploy-submarine.sh --- submarine-cloud/hack/deploy-submarine.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submarine-cloud/hack/deploy-submarine.sh b/submarine-cloud/hack/deploy-submarine.sh index b9da48077d..38728d898d 100755 --- a/submarine-cloud/hack/deploy-submarine.sh +++ b/submarine-cloud/hack/deploy-submarine.sh @@ -20,7 +20,7 @@ set -euo pipefail ROOT=$(unset CDPATH && cd $(dirname "${BASH_SOURCE[0]}")/.. && pwd) cd $ROOT SUBMARINE_HOME=${ROOT}/.. -SUBMARINE_VERSION="0.5.0" +SUBMARINE_VERSION="0.6.0-SNAPSHOT" source $ROOT/hack/lib.sh From 4d9876a4fbfae02a1ccc3c67bfa7ca81b1a0e2e5 Mon Sep 17 00:00:00 2001 From: HUAN-PING SU Date: Thu, 17 Dec 2020 15:18:48 -0800 Subject: [PATCH 06/12] Update submarine-database.yaml --- .../manifests/submarine-cluster/submarine-database.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submarine-cloud/manifests/submarine-cluster/submarine-database.yaml b/submarine-cloud/manifests/submarine-cluster/submarine-database.yaml index 1107df96b8..69c7481a8f 100644 --- a/submarine-cloud/manifests/submarine-cluster/submarine-database.yaml +++ b/submarine-cloud/manifests/submarine-cluster/submarine-database.yaml @@ -30,7 +30,7 @@ spec: spec: containers: - name: submarine-database - image: apache/submarine:database-0.5.0 + image: apache/submarine:database-0.6.0-SNAPSHOT ports: - containerPort: 3306 env: From d3bb3297bf21b86d79ffefad78f3ee2fd473783a Mon Sep 17 00:00:00 2001 From: HUAN-PING SU Date: Thu, 17 Dec 2020 15:19:06 -0800 Subject: [PATCH 07/12] Update submarine-server.yaml --- .../manifests/submarine-cluster/submarine-server.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submarine-cloud/manifests/submarine-cluster/submarine-server.yaml b/submarine-cloud/manifests/submarine-cluster/submarine-server.yaml index 9a8f301130..454c94c4aa 100644 --- a/submarine-cloud/manifests/submarine-cluster/submarine-server.yaml +++ b/submarine-cloud/manifests/submarine-cluster/submarine-server.yaml @@ -31,7 +31,7 @@ spec: serviceAccountName: "submarine-node" containers: - name: submarine-node - image: "apache/submarine:server-0.5.0" + image: "apache/submarine:server-0.6.0-SNAPSHOT" args: [] imagePullPolicy: IfNotPresent ports: From 9db016ac91c3528d3313834bddfc598ff66f2c24 Mon Sep 17 00:00:00 2001 From: HUAN-PING SU Date: Thu, 17 Dec 2020 15:19:27 -0800 Subject: [PATCH 08/12] Update deployment.yaml --- submarine-cloud/manifests/submarine-operator/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submarine-cloud/manifests/submarine-operator/deployment.yaml b/submarine-cloud/manifests/submarine-operator/deployment.yaml index 61121d561b..bca6776f2d 100644 --- a/submarine-cloud/manifests/submarine-operator/deployment.yaml +++ b/submarine-cloud/manifests/submarine-operator/deployment.yaml @@ -31,7 +31,7 @@ spec: serviceAccountName: "submarine-operator" containers: - name: op - image: "apache/submarine:operator-0.5.0" + image: "apache/submarine:operator-0.6.0-SNAPSHOT" imagePullPolicy: IfNotPresent args: ["--v=7", "--logtostderr=true", "--alsologtostderr"] resources: From 60fb81e4b44299fb2f9b01c195e67364a07c551c Mon Sep 17 00:00:00 2001 From: HUAN-PING SU Date: Thu, 17 Dec 2020 15:20:07 -0800 Subject: [PATCH 09/12] Update run_deepfm.sh --- submarine-sdk/pysubmarine/example/pytorch/deepfm/run_deepfm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submarine-sdk/pysubmarine/example/pytorch/deepfm/run_deepfm.sh b/submarine-sdk/pysubmarine/example/pytorch/deepfm/run_deepfm.sh index 82388459ec..02079f2649 100644 --- a/submarine-sdk/pysubmarine/example/pytorch/deepfm/run_deepfm.sh +++ b/submarine-sdk/pysubmarine/example/pytorch/deepfm/run_deepfm.sh @@ -24,7 +24,7 @@ PYTHONPATH=$HOME/workspace/submarine/submarine-sdk/pysubmarine HADOOP_CONF_PATH=${HADOOP_CONF_PATH:-$HADOOP_CONF_DIR} -SUBMARINE_VERSION=0.5.0 +SUBMARINE_VERSION=0.6.0-SNAPSHOT SUBMARINE_HADOOP_VERSION=2.9 SUBMARINE_JAR=/opt/submarine-dist-${SUBMARINE_VERSION}-hadoop-${SUBMARINE_HADOOP_VERSION}/submarine-dist-${SUBMARINE_VERSION}-hadoop-${SUBMARINE_HADOOP_VERSION}/submarine-all-${SUBMARINE_VERSION}-hadoop-${SUBMARINE_HADOOP_VERSION}.jar From cc04fbc08ed708abac75bf8e7a68a6878985a9fe Mon Sep 17 00:00:00 2001 From: HUAN-PING SU Date: Thu, 17 Dec 2020 15:20:24 -0800 Subject: [PATCH 10/12] Update run_afm.sh --- submarine-sdk/pysubmarine/example/pytorch/afm/run_afm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submarine-sdk/pysubmarine/example/pytorch/afm/run_afm.sh b/submarine-sdk/pysubmarine/example/pytorch/afm/run_afm.sh index db90f0c687..e893fae844 100644 --- a/submarine-sdk/pysubmarine/example/pytorch/afm/run_afm.sh +++ b/submarine-sdk/pysubmarine/example/pytorch/afm/run_afm.sh @@ -24,7 +24,7 @@ PYTHONPATH=$HOME/workspace/submarine/submarine-sdk/pysubmarine HADOOP_CONF_PATH=${HADOOP_CONF_PATH:-$HADOOP_CONF_DIR} -SUBMARINE_VERSION=0.5.0 +SUBMARINE_VERSION=0.6.0-SNAPSHOT SUBMARINE_HADOOP_VERSION=2.9 SUBMARINE_JAR=/opt/submarine-dist-${SUBMARINE_VERSION}-hadoop-${SUBMARINE_HADOOP_VERSION}/submarine-dist-${SUBMARINE_VERSION}-hadoop-${SUBMARINE_HADOOP_VERSION}/submarine-all-${SUBMARINE_VERSION}-hadoop-${SUBMARINE_HADOOP_VERSION}.jar From b71c6531a82369215600c9088047ebd2efb20721 Mon Sep 17 00:00:00 2001 From: Kevin Date: Thu, 17 Dec 2020 15:50:15 -0800 Subject: [PATCH 11/12] Update --- LICENSE-binary | 2 +- dev-support/docker-images/database/build.sh | 2 +- dev-support/docker-images/jupyter/build.sh | 2 +- dev-support/docker-images/operator/build.sh | 2 +- dev-support/docker-images/submarine/build.sh | 2 +- dev-support/mini-submarine/README.md | 20 +++++++++---------- .../mini-submarine/build_mini-submarine.sh | 2 +- .../run_customized_submarine-all_mnist.sh | 2 +- .../submarine/run_submarine_mnist_tf2_tony.sh | 2 +- .../submarine/run_submarine_mnist_tony.sh | 2 +- .../submarine/run_submarine_mnist_tony_rpc.sh | 2 +- .../run_submarine_mxnet_cifar10_tony.sh | 2 +- .../run_submarine_pytorch_mnist_tony.sh | 2 +- dev-support/pysubmarine/openapi.json | 2 +- dev-support/pysubmarine/swagger_config.json | 2 +- docs/development/QuickDevTips.md | 8 ++++---- helm-charts/submarine/Chart.yaml | 2 +- .../github-actions/test-requirements.txt | 2 +- .../submarine/experiment/__init__.py | 4 ++-- .../experiment/api/experiment_api.py | 2 +- .../submarine/experiment/api_client.py | 4 ++-- .../submarine/experiment/configuration.py | 6 +++--- .../submarine/experiment/exceptions.py | 2 +- .../submarine/experiment/models/__init__.py | 2 +- .../submarine/experiment/models/code_spec.py | 2 +- .../experiment/models/environment_spec.py | 2 +- .../experiment/models/experiment_meta.py | 2 +- .../experiment/models/experiment_spec.py | 2 +- .../experiment/models/experiment_task_spec.py | 2 +- .../experiment/models/json_response.py | 2 +- .../experiment/models/kernel_spec.py | 2 +- .../pysubmarine/submarine/experiment/rest.py | 2 +- .../apache/submarine/server/Bootstrap.java | 4 ++-- .../interpreter/interpreter-core/pom.xml | 4 ++-- submarine-workbench/interpreter/pom.xml | 4 ++-- .../interpreter/python-interpreter/pom.xml | 4 ++-- .../interpreter/spark-interpreter/pom.xml | 4 ++-- 37 files changed, 58 insertions(+), 58 deletions(-) diff --git a/LICENSE-binary b/LICENSE-binary index 38dae8af29..356c231d7f 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -271,7 +271,7 @@ org.apache.hadoop:hadoop-hdfs-client:2.9.2 org.apache.htrace:htrace-core4:4.1.0-incubating org.apache.httpcomponents:httpclient:4.5.2 org.apache.httpcomponents:httpcore:4.4.4 -org.apache.submarine:submarine-core:0.5.0 +org.apache.submarine:submarine-core:0.6.0-SNAPSHOT org.apache.zookeeper:zookeeper:3.4.6 org.codehaus.jackson:jackson-core-asl:1.9.13 org.codehaus.jackson:jackson-mapper-asl:1.9.13 diff --git a/dev-support/docker-images/database/build.sh b/dev-support/docker-images/database/build.sh index d87c668412..b0ca9ba99e 100755 --- a/dev-support/docker-images/database/build.sh +++ b/dev-support/docker-images/database/build.sh @@ -24,7 +24,7 @@ fi export CURRENT_PATH=$(cd "${PWD}">/dev/null; pwd) SUBMARINE_HOME=${CURRENT_PATH}/../../.. -SUBMARINE_VERSION="0.5.0" +SUBMARINE_VERSION="0.6.0-SNAPSHOT" SUBMARINE_IMAGE_NAME="apache/submarine:database-${SUBMARINE_VERSION}" cp -rf "${SUBMARINE_HOME}/docs/database" "${CURRENT_PATH}" diff --git a/dev-support/docker-images/jupyter/build.sh b/dev-support/docker-images/jupyter/build.sh index e2b083ea3e..b506f40df0 100755 --- a/dev-support/docker-images/jupyter/build.sh +++ b/dev-support/docker-images/jupyter/build.sh @@ -16,7 +16,7 @@ set -euxo pipefail -JUPYTER_IMAGE="apache/submarine:jupyter-notebook-0.5.0" +JUPYTER_IMAGE="apache/submarine:jupyter-notebook-0.6.0-SNAPSHOT" if [ -L ${BASH_SOURCE-$0} ]; then PWD=$(dirname $(readlink "${BASH_SOURCE-$0}")) diff --git a/dev-support/docker-images/operator/build.sh b/dev-support/docker-images/operator/build.sh index 5adbfe6bb7..92aad02766 100755 --- a/dev-support/docker-images/operator/build.sh +++ b/dev-support/docker-images/operator/build.sh @@ -16,7 +16,7 @@ set -euxo pipefail -SUBMARINE_VERSION=0.5.0 +SUBMARINE_VERSION=0.6.0-SNAPSHOT SUBMARINE_IMAGE_NAME="apache/submarine:operator-${SUBMARINE_VERSION}" if [ -L ${BASH_SOURCE-$0} ]; then diff --git a/dev-support/docker-images/submarine/build.sh b/dev-support/docker-images/submarine/build.sh index 2fd38470b0..9e7ce663b8 100755 --- a/dev-support/docker-images/submarine/build.sh +++ b/dev-support/docker-images/submarine/build.sh @@ -16,7 +16,7 @@ set -euxo pipefail -SUBMARINE_VERSION=0.5.0 +SUBMARINE_VERSION=0.6.0-SNAPSHOT SUBMARINE_IMAGE_NAME="apache/submarine:server-${SUBMARINE_VERSION}" if [ -L ${BASH_SOURCE-$0} ]; then diff --git a/dev-support/mini-submarine/README.md b/dev-support/mini-submarine/README.md index 063bbee057..d7a014396c 100644 --- a/dev-support/mini-submarine/README.md +++ b/dev-support/mini-submarine/README.md @@ -57,24 +57,24 @@ In this scenario, we can do this: Put submarine candidate artifacts to a folder like "~/releases/submarine-release" ``` $ ls $release_candidates_path -submarine-dist-0.5.0-hadoop-2.9.tar.gz submarine-dist-0.5.0-src.tar.gz.asc -submarine-dist-0.5.0-hadoop-2.9.tar.gz.asc submarine-dist-0.5.0-src.tar.gz.sha512 -submarine-dist-0.5.0-hadoop-2.9.tar.gz.sha512 submarine-dist-0.5.0-src.tar.gz +submarine-dist-0.6.0-hadoop-2.9.tar.gz submarine-dist-0.6.0-src.tar.gz.asc +submarine-dist-0.6.0-hadoop-2.9.tar.gz.asc submarine-dist-0.6.0-src.tar.gz.sha512 +submarine-dist-0.6.0-hadoop-2.9.tar.gz.sha512 submarine-dist-0.6.0-src.tar.gz ``` ``` -export submarine_version=0.5.0 +export submarine_version=0.6.0 export release_candidates_path=~/releases/submarine-release ./build_mini-submarine.sh -#docker run -it -h submarine-dev --net=bridge --privileged -P local/mini-submarine:0.5.0 /bin/bash -docker tag local/mini-submarine:0.5.0 apache/mini-submarine:0.5.0:RC0 -docker push apache/mini-submarine:0.5.0:RC0 +#docker run -it -h submarine-dev --net=bridge --privileged -P local/mini-submarine:0.6.0 /bin/bash +docker tag local/mini-submarine:0.6.0 apache/mini-submarine:0.6.0:RC0 +docker push apache/mini-submarine:0.6.0:RC0 ``` -In the container, we can verify that the submarine jar version is the expected 0.5.0. Then we can upload this image with a "RC" tag for a vote. +In the container, we can verify that the submarine jar version is the expected 0.6.0. Then we can upload this image with a "RC" tag for a vote. ### Run mini-submarine image ``` -docker run -it -h submarine-dev --name mini-submarine --net=bridge --privileged -P local/mini-submarine:0.5.0 /bin/bash +docker run -it -h submarine-dev --name mini-submarine --net=bridge --privileged -P local/mini-submarine:0.6.0 /bin/bash # In the container, use root user to bootstrap hdfs and yarn /tmp/hadoop-config/bootstrap.sh @@ -83,7 +83,7 @@ docker run -it -h submarine-dev --name mini-submarine --net=bridge --privileged yarn node -list -showDetails ``` -If you pull the image directly, please replace "local/mini-submarine:0.5.0" with "apache/submarine:mini-0.5.0". +If you pull the image directly, please replace "local/mini-submarine:0.6.0" with "apache/submarine:mini-0.6.0". ### You should see info like this: diff --git a/dev-support/mini-submarine/build_mini-submarine.sh b/dev-support/mini-submarine/build_mini-submarine.sh index 43bd8ab712..9904cd606b 100755 --- a/dev-support/mini-submarine/build_mini-submarine.sh +++ b/dev-support/mini-submarine/build_mini-submarine.sh @@ -17,7 +17,7 @@ set -euo pipefail hadoop_v=2.9.2 spark_v=2.3.4 -submarine_v=${submarine_version:-"0.5.0"} +submarine_v=${submarine_version:-"0.6.0-SNAPSHOT"} echo "Using submarine version: $submarine_v" image_name="local/mini-submarine:${submarine_v}" diff --git a/dev-support/mini-submarine/submarine/run_customized_submarine-all_mnist.sh b/dev-support/mini-submarine/submarine/run_customized_submarine-all_mnist.sh index d08a7b981b..4510896daf 100755 --- a/dev-support/mini-submarine/submarine/run_customized_submarine-all_mnist.sh +++ b/dev-support/mini-submarine/submarine/run_customized_submarine-all_mnist.sh @@ -49,7 +49,7 @@ else WORKER_CMD="myvenv.zip/venv/bin/python mnist_distributed.py --steps 2 --data_dir /tmp/data --working_dir /tmp/mode" fi -SUBMARINE_VERSION=${SUBMARINE_VER:-"0.5.0"} +SUBMARINE_VERSION=${SUBMARINE_VER:-"0.6.0-SNAPSHOT"} HADOOP_VERSION=2.9 diff --git a/dev-support/mini-submarine/submarine/run_submarine_mnist_tf2_tony.sh b/dev-support/mini-submarine/submarine/run_submarine_mnist_tf2_tony.sh index b12efbff98..7e9e795a84 100755 --- a/dev-support/mini-submarine/submarine/run_submarine_mnist_tf2_tony.sh +++ b/dev-support/mini-submarine/submarine/run_submarine_mnist_tf2_tony.sh @@ -39,7 +39,7 @@ else JAVA_CMD="java" fi -SUBMARINE_VERSION=0.5.0 +SUBMARINE_VERSION=0.6.0-SNAPSHOT HADOOP_VERSION=2.9 SUBMARINE_PATH=/opt/submarine-current HADOOP_CONF_PATH=/usr/local/hadoop/etc/hadoop diff --git a/dev-support/mini-submarine/submarine/run_submarine_mnist_tony.sh b/dev-support/mini-submarine/submarine/run_submarine_mnist_tony.sh index 272ac320d2..834cf5f42d 100755 --- a/dev-support/mini-submarine/submarine/run_submarine_mnist_tony.sh +++ b/dev-support/mini-submarine/submarine/run_submarine_mnist_tony.sh @@ -17,7 +17,7 @@ # Below are configurable variables, please adapt base on your local environment. # Version of submarine jar -SUBMARINE_VERSION=${SUBMARINE_VER:-"0.5.0"} +SUBMARINE_VERSION=${SUBMARINE_VER:-"0.6.0-SNAPSHOT"} # Version of affiliated Hadoop version for this Submarine jar. SUBMARINE_HADOOP_VERSION=2.9 diff --git a/dev-support/mini-submarine/submarine/run_submarine_mnist_tony_rpc.sh b/dev-support/mini-submarine/submarine/run_submarine_mnist_tony_rpc.sh index 602e9d8d49..cb442cb367 100644 --- a/dev-support/mini-submarine/submarine/run_submarine_mnist_tony_rpc.sh +++ b/dev-support/mini-submarine/submarine/run_submarine_mnist_tony_rpc.sh @@ -47,7 +47,7 @@ else WORKER_CMD="myvenv.zip/venv/bin/python mnist_distributed.py --steps 2 --data_dir /tmp/data --working_dir /tmp/mode" fi -SUBMARINE_VERSION=${SUBMARINE_VER:-"0.5.0"} +SUBMARINE_VERSION=${SUBMARINE_VER:-"0.6.0-SNAPSHOT"} HADOOP_VERSION=2.9 diff --git a/dev-support/mini-submarine/submarine/run_submarine_mxnet_cifar10_tony.sh b/dev-support/mini-submarine/submarine/run_submarine_mxnet_cifar10_tony.sh index 4dec8687e9..be41a4f927 100755 --- a/dev-support/mini-submarine/submarine/run_submarine_mxnet_cifar10_tony.sh +++ b/dev-support/mini-submarine/submarine/run_submarine_mxnet_cifar10_tony.sh @@ -39,7 +39,7 @@ else JAVA_CMD="java" fi -SUBMARINE_VERSION=0.5.0 +SUBMARINE_VERSION=0.6.0-SNAPSHOT HADOOP_VERSION=2.9 SUBMARINE_PATH=/opt/submarine-current HADOOP_CONF_PATH=/usr/local/hadoop/etc/hadoop diff --git a/dev-support/mini-submarine/submarine/run_submarine_pytorch_mnist_tony.sh b/dev-support/mini-submarine/submarine/run_submarine_pytorch_mnist_tony.sh index b57dd56697..15d36cf65b 100755 --- a/dev-support/mini-submarine/submarine/run_submarine_pytorch_mnist_tony.sh +++ b/dev-support/mini-submarine/submarine/run_submarine_pytorch_mnist_tony.sh @@ -39,7 +39,7 @@ else JAVA_CMD="java" fi -SUBMARINE_VERSION=0.5.0 +SUBMARINE_VERSION=0.6.0-SNAPSHOT HADOOP_VERSION=2.9 SUBMARINE_PATH=/opt/submarine-current HADOOP_CONF_PATH=/usr/local/hadoop/etc/hadoop diff --git a/dev-support/pysubmarine/openapi.json b/dev-support/pysubmarine/openapi.json index 9ab79b23ff..22694e99c4 100644 --- a/dev-support/pysubmarine/openapi.json +++ b/dev-support/pysubmarine/openapi.json @@ -11,7 +11,7 @@ "name" : "Apache 2.0", "url" : "http://www.apache.org/licenses/LICENSE-2.0.html" }, - "version" : "0.5.0" + "version" : "0.6.0-SNAPSHOT" }, "servers" : [ { "url" : "/api" diff --git a/dev-support/pysubmarine/swagger_config.json b/dev-support/pysubmarine/swagger_config.json index d7e0772f1a..abf9205e6a 100644 --- a/dev-support/pysubmarine/swagger_config.json +++ b/dev-support/pysubmarine/swagger_config.json @@ -1,5 +1,5 @@ { "packageName" : "submarine.experiment", "projectName" : "submarine.experiment", - "packageVersion": "0.5.0" + "packageVersion": "0.6.0-SNAPSHOT" } diff --git a/docs/development/QuickDevTips.md b/docs/development/QuickDevTips.md index e614a46d9c..dbd714b91c 100644 --- a/docs/development/QuickDevTips.md +++ b/docs/development/QuickDevTips.md @@ -10,7 +10,7 @@ You can run each module individually and only need to re-package the submarine-s 1. Run db docker ``` -docker run -it -p 3306:3306 -d --name submarine-database -e MYSQL_ROOT_PASSWORD=password apache/submarine:database-0.5.0-SNAPSHOT +docker run -it -p 3306:3306 -d --name submarine-database -e MYSQL_ROOT_PASSWORD=password apache/submarine:database-0.6.0-SNAPSHOT ``` 2. Run k8s @@ -20,7 +20,7 @@ minikube start # or other alternatives, such as kind kubectl apply -f ./dev-support/k8s/tfjob/crd.yaml kubectl kustomize ./dev-support/k8s/tfjob/operator | kubectl apply -f - kubectl apply -f ./dev-support/k8s/pytorchjob/ -export KUBECONFIG=/home//.kube/config # (in ~/.bashrc) +export KUBECONFIG=/home//.kube/config # (in ~/.bashrc) ``` 3. Package server @@ -30,7 +30,7 @@ mvn clean package -DskipTests 4. Start server -cd submarine-dist/target/submarine-dist-0.5.0-SNAPSHOT-hadoop-2.9/submarine-dist-0.5.0-SNAPSHOT-hadoop-2.9/ +cd submarine-dist/target/submarine-dist-0.6.0-SNAPSHOT-hadoop-2.9/submarine-dist-0.6.0-SNAPSHOT-hadoop-2.9/ ./bin/submarine-daemon.sh start getMysqlJar ``` -``` \ No newline at end of file +``` diff --git a/helm-charts/submarine/Chart.yaml b/helm-charts/submarine/Chart.yaml index 9f7c49b513..9dc38ddf0d 100644 --- a/helm-charts/submarine/Chart.yaml +++ b/helm-charts/submarine/Chart.yaml @@ -19,7 +19,7 @@ apiVersion: v2 appVersion: "0.5.0" description: Submarine is Cloud Native Machine Learning Platform. name: submarine -version: 0.5.0 +version: 0.6.0-SNAPSHOT icon: https://submarine.apache.org/assets/themes/submarine/img/submarine_white_logo.png dependencies: - name: tfjob diff --git a/submarine-sdk/pysubmarine/github-actions/test-requirements.txt b/submarine-sdk/pysubmarine/github-actions/test-requirements.txt index cc618b469d..0bd15e4c7a 100644 --- a/submarine-sdk/pysubmarine/github-actions/test-requirements.txt +++ b/submarine-sdk/pysubmarine/github-actions/test-requirements.txt @@ -21,7 +21,7 @@ scipy==1.2.1 attrdict==2.0.0 pytest==3.2.1 pytest-cov==2.6.0 -pytest-localserver==0.5.0 +pytest-localserver==0.6.0-SNAPSHOT pylint==2.5.2 sqlalchemy==1.3.0 PyMySQL==0.9.3 diff --git a/submarine-sdk/pysubmarine/submarine/experiment/__init__.py b/submarine-sdk/pysubmarine/submarine/experiment/__init__.py index ec7f96e1ca..1fc462299e 100644 --- a/submarine-sdk/pysubmarine/submarine/experiment/__init__.py +++ b/submarine-sdk/pysubmarine/submarine/experiment/__init__.py @@ -21,7 +21,7 @@ The Submarine REST API allows you to create, list, and get experiments. The API is hosted under the /v1/experiment route on the Submarine server. For example, to list experiments on a server hosted at http://localhost:8080, access http://localhost:8080/api/v1/experiment/ # noqa: E501 - The version of the OpenAPI document: 0.5.0 + The version of the OpenAPI document: 0.6.0-SNAPSHOT Contact: dev@submarine.apache.org Generated by: https://openapi-generator.tech """ @@ -45,4 +45,4 @@ from submarine.experiment.models.json_response import JsonResponse from submarine.experiment.models.kernel_spec import KernelSpec -__version__ = "0.5.0" +__version__ = "0.6.0-SNAPSHOT" diff --git a/submarine-sdk/pysubmarine/submarine/experiment/api/experiment_api.py b/submarine-sdk/pysubmarine/submarine/experiment/api/experiment_api.py index 2035345167..46336e917b 100644 --- a/submarine-sdk/pysubmarine/submarine/experiment/api/experiment_api.py +++ b/submarine-sdk/pysubmarine/submarine/experiment/api/experiment_api.py @@ -20,7 +20,7 @@ The Submarine REST API allows you to create, list, and get experiments. The API is hosted under the /v1/experiment route on the Submarine server. For example, to list experiments on a server hosted at http://localhost:8080, access http://localhost:8080/api/v1/experiment/ # noqa: E501 - The version of the OpenAPI document: 0.5.0 + The version of the OpenAPI document: 0.6.0-SNAPSHOT Contact: dev@submarine.apache.org Generated by: https://openapi-generator.tech """ diff --git a/submarine-sdk/pysubmarine/submarine/experiment/api_client.py b/submarine-sdk/pysubmarine/submarine/experiment/api_client.py index d6321ebbe9..e2f3d0a94d 100644 --- a/submarine-sdk/pysubmarine/submarine/experiment/api_client.py +++ b/submarine-sdk/pysubmarine/submarine/experiment/api_client.py @@ -19,7 +19,7 @@ The Submarine REST API allows you to create, list, and get experiments. The API is hosted under the /v1/experiment route on the Submarine server. For example, to list experiments on a server hosted at http://localhost:8080, access http://localhost:8080/api/v1/experiment/ # noqa: E501 - The version of the OpenAPI document: 0.5.0 + The version of the OpenAPI document: 0.6.0-SNAPSHOT Contact: dev@submarine.apache.org Generated by: https://openapi-generator.tech """ @@ -98,7 +98,7 @@ def __init__(self, self.default_headers[header_name] = header_value self.cookie = cookie # Set default User-Agent. - self.user_agent = 'OpenAPI-Generator/0.5.0/python' + self.user_agent = 'OpenAPI-Generator/0.6.0-SNAPSHOT/python' self.client_side_validation = configuration.client_side_validation def __enter__(self): diff --git a/submarine-sdk/pysubmarine/submarine/experiment/configuration.py b/submarine-sdk/pysubmarine/submarine/experiment/configuration.py index 57745378e7..7243663534 100644 --- a/submarine-sdk/pysubmarine/submarine/experiment/configuration.py +++ b/submarine-sdk/pysubmarine/submarine/experiment/configuration.py @@ -19,7 +19,7 @@ The Submarine REST API allows you to create, list, and get experiments. The API is hosted under the /v1/experiment route on the Submarine server. For example, to list experiments on a server hosted at http://localhost:8080, access http://localhost:8080/api/v1/experiment/ # noqa: E501 - The version of the OpenAPI document: 0.5.0 + The version of the OpenAPI document: 0.6.0-SNAPSHOT Contact: dev@submarine.apache.org Generated by: https://openapi-generator.tech """ @@ -342,8 +342,8 @@ def to_debug_report(self): return "Python SDK Debug Report:\n"\ "OS: {env}\n"\ "Python Version: {pyversion}\n"\ - "Version of the API: 0.5.0\n"\ - "SDK Package Version: 0.5.0".\ + "Version of the API: 0.6.0-SNAPSHOT\n"\ + "SDK Package Version: 0.6.0-SNAPSHOT".\ format(env=sys.platform, pyversion=sys.version) def get_host_settings(self): diff --git a/submarine-sdk/pysubmarine/submarine/experiment/exceptions.py b/submarine-sdk/pysubmarine/submarine/experiment/exceptions.py index a275f96b81..87f283ee06 100644 --- a/submarine-sdk/pysubmarine/submarine/experiment/exceptions.py +++ b/submarine-sdk/pysubmarine/submarine/experiment/exceptions.py @@ -19,7 +19,7 @@ The Submarine REST API allows you to create, list, and get experiments. The API is hosted under the /v1/experiment route on the Submarine server. For example, to list experiments on a server hosted at http://localhost:8080, access http://localhost:8080/api/v1/experiment/ # noqa: E501 - The version of the OpenAPI document: 0.5.0 + The version of the OpenAPI document: 0.6.0-SNAPSHOT Contact: dev@submarine.apache.org Generated by: https://openapi-generator.tech """ diff --git a/submarine-sdk/pysubmarine/submarine/experiment/models/__init__.py b/submarine-sdk/pysubmarine/submarine/experiment/models/__init__.py index 892a716b46..d4455521a3 100644 --- a/submarine-sdk/pysubmarine/submarine/experiment/models/__init__.py +++ b/submarine-sdk/pysubmarine/submarine/experiment/models/__init__.py @@ -21,7 +21,7 @@ The Submarine REST API allows you to create, list, and get experiments. The API is hosted under the /v1/experiment route on the Submarine server. For example, to list experiments on a server hosted at http://localhost:8080, access http://localhost:8080/api/v1/experiment/ # noqa: E501 - The version of the OpenAPI document: 0.5.0 + The version of the OpenAPI document: 0.6.0-SNAPSHOT Contact: dev@submarine.apache.org Generated by: https://openapi-generator.tech """ diff --git a/submarine-sdk/pysubmarine/submarine/experiment/models/code_spec.py b/submarine-sdk/pysubmarine/submarine/experiment/models/code_spec.py index b311c4a6b3..3d4a4b9295 100644 --- a/submarine-sdk/pysubmarine/submarine/experiment/models/code_spec.py +++ b/submarine-sdk/pysubmarine/submarine/experiment/models/code_spec.py @@ -20,7 +20,7 @@ The Submarine REST API allows you to create, list, and get experiments. The API is hosted under the /v1/experiment route on the Submarine server. For example, to list experiments on a server hosted at http://localhost:8080, access http://localhost:8080/api/v1/experiment/ # noqa: E501 - The version of the OpenAPI document: 0.5.0 + The version of the OpenAPI document: 0.6.0-SNAPSHOT Contact: dev@submarine.apache.org Generated by: https://openapi-generator.tech """ diff --git a/submarine-sdk/pysubmarine/submarine/experiment/models/environment_spec.py b/submarine-sdk/pysubmarine/submarine/experiment/models/environment_spec.py index eb3f0acccb..2f976b93b3 100644 --- a/submarine-sdk/pysubmarine/submarine/experiment/models/environment_spec.py +++ b/submarine-sdk/pysubmarine/submarine/experiment/models/environment_spec.py @@ -20,7 +20,7 @@ The Submarine REST API allows you to create, list, and get experiments. The API is hosted under the /v1/experiment route on the Submarine server. For example, to list experiments on a server hosted at http://localhost:8080, access http://localhost:8080/api/v1/experiment/ # noqa: E501 - The version of the OpenAPI document: 0.5.0 + The version of the OpenAPI document: 0.6.0-SNAPSHOT Contact: dev@submarine.apache.org Generated by: https://openapi-generator.tech """ diff --git a/submarine-sdk/pysubmarine/submarine/experiment/models/experiment_meta.py b/submarine-sdk/pysubmarine/submarine/experiment/models/experiment_meta.py index bd5eaa2553..9a70d807d2 100644 --- a/submarine-sdk/pysubmarine/submarine/experiment/models/experiment_meta.py +++ b/submarine-sdk/pysubmarine/submarine/experiment/models/experiment_meta.py @@ -20,7 +20,7 @@ The Submarine REST API allows you to create, list, and get experiments. The API is hosted under the /v1/experiment route on the Submarine server. For example, to list experiments on a server hosted at http://localhost:8080, access http://localhost:8080/api/v1/experiment/ # noqa: E501 - The version of the OpenAPI document: 0.5.0 + The version of the OpenAPI document: 0.6.0-SNAPSHOT Contact: dev@submarine.apache.org Generated by: https://openapi-generator.tech """ diff --git a/submarine-sdk/pysubmarine/submarine/experiment/models/experiment_spec.py b/submarine-sdk/pysubmarine/submarine/experiment/models/experiment_spec.py index cb27882323..e83865de7a 100644 --- a/submarine-sdk/pysubmarine/submarine/experiment/models/experiment_spec.py +++ b/submarine-sdk/pysubmarine/submarine/experiment/models/experiment_spec.py @@ -20,7 +20,7 @@ The Submarine REST API allows you to create, list, and get experiments. The API is hosted under the /v1/experiment route on the Submarine server. For example, to list experiments on a server hosted at http://localhost:8080, access http://localhost:8080/api/v1/experiment/ # noqa: E501 - The version of the OpenAPI document: 0.5.0 + The version of the OpenAPI document: 0.6.0-SNAPSHOT Contact: dev@submarine.apache.org Generated by: https://openapi-generator.tech """ diff --git a/submarine-sdk/pysubmarine/submarine/experiment/models/experiment_task_spec.py b/submarine-sdk/pysubmarine/submarine/experiment/models/experiment_task_spec.py index 4f946256eb..813a6069e3 100644 --- a/submarine-sdk/pysubmarine/submarine/experiment/models/experiment_task_spec.py +++ b/submarine-sdk/pysubmarine/submarine/experiment/models/experiment_task_spec.py @@ -20,7 +20,7 @@ The Submarine REST API allows you to create, list, and get experiments. The API is hosted under the /v1/experiment route on the Submarine server. For example, to list experiments on a server hosted at http://localhost:8080, access http://localhost:8080/api/v1/experiment/ # noqa: E501 - The version of the OpenAPI document: 0.5.0 + The version of the OpenAPI document: 0.6.0-SNAPSHOT Contact: dev@submarine.apache.org Generated by: https://openapi-generator.tech """ diff --git a/submarine-sdk/pysubmarine/submarine/experiment/models/json_response.py b/submarine-sdk/pysubmarine/submarine/experiment/models/json_response.py index 214f723298..5e3e4a815a 100644 --- a/submarine-sdk/pysubmarine/submarine/experiment/models/json_response.py +++ b/submarine-sdk/pysubmarine/submarine/experiment/models/json_response.py @@ -20,7 +20,7 @@ The Submarine REST API allows you to create, list, and get experiments. The API is hosted under the /v1/experiment route on the Submarine server. For example, to list experiments on a server hosted at http://localhost:8080, access http://localhost:8080/api/v1/experiment/ # noqa: E501 - The version of the OpenAPI document: 0.5.0 + The version of the OpenAPI document: 0.6.0-SNAPSHOT Contact: dev@submarine.apache.org Generated by: https://openapi-generator.tech """ diff --git a/submarine-sdk/pysubmarine/submarine/experiment/models/kernel_spec.py b/submarine-sdk/pysubmarine/submarine/experiment/models/kernel_spec.py index b438536ba9..9cc7897a50 100644 --- a/submarine-sdk/pysubmarine/submarine/experiment/models/kernel_spec.py +++ b/submarine-sdk/pysubmarine/submarine/experiment/models/kernel_spec.py @@ -20,7 +20,7 @@ The Submarine REST API allows you to create, list, and get experiments. The API is hosted under the /v1/experiment route on the Submarine server. For example, to list experiments on a server hosted at http://localhost:8080, access http://localhost:8080/api/v1/experiment/ # noqa: E501 - The version of the OpenAPI document: 0.5.0 + The version of the OpenAPI document: 0.6.0-SNAPSHOT Contact: dev@submarine.apache.org Generated by: https://openapi-generator.tech """ diff --git a/submarine-sdk/pysubmarine/submarine/experiment/rest.py b/submarine-sdk/pysubmarine/submarine/experiment/rest.py index c61611aa5f..dccfb8e8f0 100644 --- a/submarine-sdk/pysubmarine/submarine/experiment/rest.py +++ b/submarine-sdk/pysubmarine/submarine/experiment/rest.py @@ -19,7 +19,7 @@ The Submarine REST API allows you to create, list, and get experiments. The API is hosted under the /v1/experiment route on the Submarine server. For example, to list experiments on a server hosted at http://localhost:8080, access http://localhost:8080/api/v1/experiment/ # noqa: E501 - The version of the OpenAPI document: 0.5.0 + The version of the OpenAPI document: 0.6.0-SNAPSHOT Contact: dev@submarine.apache.org Generated by: https://openapi-generator.tech """ diff --git a/submarine-server/server-core/src/main/java/org/apache/submarine/server/Bootstrap.java b/submarine-server/server-core/src/main/java/org/apache/submarine/server/Bootstrap.java index e96ae62eb3..64df9a0e4a 100644 --- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/Bootstrap.java +++ b/submarine-server/server-core/src/main/java/org/apache/submarine/server/Bootstrap.java @@ -49,7 +49,7 @@ public void init(ServletConfig config) throws ServletException { .termsOfService("http://swagger.io/terms/") .contact(new Contact() .email("dev@submarine.apache.org")) - .version("0.5.0") + .version("0.6.0-SNAPSHOT") .license(new License() .name("Apache 2.0") .url("http://www.apache.org/licenses/LICENSE-2.0.html")); @@ -70,7 +70,7 @@ public void init(ServletConfig config) throws ServletException { .termsOfService("http://swagger.io/terms/") .contact( new Contact().email("dev@submarine.apache.org")) - .version("0.5.0") + .version("0.6.0-SNAPSHOT") .license( new License().name("Apache 2.0"). url("http://www.apache.org/licenses/LICENSE-2.0.html")); diff --git a/submarine-workbench/interpreter/interpreter-core/pom.xml b/submarine-workbench/interpreter/interpreter-core/pom.xml index 5113ea927b..c4f53c0b4b 100644 --- a/submarine-workbench/interpreter/interpreter-core/pom.xml +++ b/submarine-workbench/interpreter/interpreter-core/pom.xml @@ -26,12 +26,12 @@ org.apache.submarine submarine-interpreter - 0.5.0 + 0.6.0-SNAPSHOT ../pom.xml submarine-interpreter-core - 0.5.0 + 0.6.0-SNAPSHOT Submarine: Interpreter Core Submarine Interpreter Core diff --git a/submarine-workbench/interpreter/pom.xml b/submarine-workbench/interpreter/pom.xml index 7b2794e3b2..e05ec7dc22 100644 --- a/submarine-workbench/interpreter/pom.xml +++ b/submarine-workbench/interpreter/pom.xml @@ -26,12 +26,12 @@ org.apache.submarine submarine-workbench - 0.5.0 + 0.6.0-SNAPSHOT ../pom.xml submarine-interpreter - 0.5.0 + 0.6.0-SNAPSHOT pom Submarine: Interpreter Submarine Interpreter Parent diff --git a/submarine-workbench/interpreter/python-interpreter/pom.xml b/submarine-workbench/interpreter/python-interpreter/pom.xml index 262148f54f..48ceee4200 100644 --- a/submarine-workbench/interpreter/python-interpreter/pom.xml +++ b/submarine-workbench/interpreter/python-interpreter/pom.xml @@ -26,12 +26,12 @@ org.apache.submarine submarine-interpreter - 0.5.0 + 0.6.0-SNAPSHOT ../pom.xml submarine-python-interpreter - 0.5.0 + 0.6.0-SNAPSHOT Submarine: Interpreter Python Submarine Python Interpreter diff --git a/submarine-workbench/interpreter/spark-interpreter/pom.xml b/submarine-workbench/interpreter/spark-interpreter/pom.xml index f129a93ea8..3bbd5fa2b3 100644 --- a/submarine-workbench/interpreter/spark-interpreter/pom.xml +++ b/submarine-workbench/interpreter/spark-interpreter/pom.xml @@ -26,12 +26,12 @@ org.apache.submarine submarine-interpreter - 0.5.0 + 0.6.0-SNAPSHOT ../pom.xml submarine-spark-interpreter - 0.5.0 + 0.6.0-SNAPSHOT Submarine: Interpreter Spark Submarine spark Interpreter From 9303fdfe7af640c0d8811f651caeb726dec48464 Mon Sep 17 00:00:00 2001 From: HUAN-PING SU Date: Thu, 17 Dec 2020 15:58:18 -0800 Subject: [PATCH 12/12] Update test-requirements.txt --- submarine-sdk/pysubmarine/github-actions/test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submarine-sdk/pysubmarine/github-actions/test-requirements.txt b/submarine-sdk/pysubmarine/github-actions/test-requirements.txt index 0bd15e4c7a..cc618b469d 100644 --- a/submarine-sdk/pysubmarine/github-actions/test-requirements.txt +++ b/submarine-sdk/pysubmarine/github-actions/test-requirements.txt @@ -21,7 +21,7 @@ scipy==1.2.1 attrdict==2.0.0 pytest==3.2.1 pytest-cov==2.6.0 -pytest-localserver==0.6.0-SNAPSHOT +pytest-localserver==0.5.0 pylint==2.5.2 sqlalchemy==1.3.0 PyMySQL==0.9.3