From f795de1b4e92280be14596158feb8b0f09a95348 Mon Sep 17 00:00:00 2001 From: Vikas Gupta Date: Mon, 1 Jan 2024 18:15:16 +0530 Subject: [PATCH] added snapshot to release version --- Dockerfile | 10 +++++----- README.md | 4 ++-- .../src/main/java/zingg/common/client/Client.java | 2 +- .../java/zingg/common/core/executor/ZinggBase.java | 4 ++-- docs/stepbystep/installation/docker/README.md | 4 ++-- .../installation/docker/file-read-write-permissions.md | 2 +- .../docker/sharing-custom-data-and-config-files.md | 2 +- .../installing-from-release/installing-zingg.md | 6 +++--- pom.xml | 2 +- python/docs/conf.py | 2 +- python/zingg/client.py | 2 +- python/zingg/databricks.py | 2 +- scripts/zingg.sh | 2 +- test/run_tests.sh | 4 ++-- 14 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Dockerfile b/Dockerfile index 75a65bd08..00abbfeed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,17 +4,17 @@ USER 0 RUN apt-get update && \ apt install -y curl vim ENV SPARK_MASTER local[*] -ENV ZINGG_HOME /zingg-0.4.1 +ENV ZINGG_HOME /zingg-0.4.1-SNAPSHOT ENV PATH $ZINGG_HOME/scripts:$PATH ENV LANG C.UTF-8 WORKDIR / USER root -WORKDIR /zingg-0.4.1 -RUN curl --location https://github.com/zinggAI/zingg/releases/download/v0.4.1/zingg-0.4.1-spark-3.4.0.tar.gz | \ +WORKDIR /zingg-0.4.1-SNAPSHOT +RUN curl --location https://github.com/zinggAI/zingg/releases/download/v0.4.1-SNAPSHOT/zingg-0.4.1-SNAPSHOT-spark-3.5.0.tar.gz | \ tar --extract --gzip --strip=1 RUN pip install -r python/requirements.txt RUN pip install zingg -RUN chmod -R a+rwx /zingg-0.4.1/models -RUN chown -R 1001 /zingg-0.4.1/models +RUN chmod -R a+rwx /zingg-0.4.1-SNAPSHOT/models +RUN chown -R 1001 /zingg-0.4.1-SNAPSHOT/models USER 1001 diff --git a/README.md b/README.md index 2900fa693..44c6a5f36 100644 --- a/README.md +++ b/README.md @@ -60,8 +60,8 @@ See Zingg in action [here](https://www.youtube.com/watch?v=zOabyZxN9b0) The easiest way to get started with Zingg is through Docker and by running the prebuilt models. ``` -docker pull zingg/zingg:0.4.1 -docker run -it zingg/zingg:0.4.1 bash +docker pull zingg/zingg:0.4.1-SNAPSHOT +docker run -it zingg/zingg:0.4.1-SNAPSHOT bash ./scripts/zingg.sh --phase match --conf examples/febrl/config.json ``` diff --git a/common/client/src/main/java/zingg/common/client/Client.java b/common/client/src/main/java/zingg/common/client/Client.java index e86377577..7ac207c8a 100644 --- a/common/client/src/main/java/zingg/common/client/Client.java +++ b/common/client/src/main/java/zingg/common/client/Client.java @@ -120,7 +120,7 @@ else if (args.getJobId() != -1) { } public void printBanner() { - String versionStr = "0.4.1"; + String versionStr = "0.4.1-SNAPSHOT"; LOG.info(""); LOG.info("********************************************************"); LOG.info("* Zingg AI *"); diff --git a/common/core/src/main/java/zingg/common/core/executor/ZinggBase.java b/common/core/src/main/java/zingg/common/core/executor/ZinggBase.java index ca100d755..5a5229056 100644 --- a/common/core/src/main/java/zingg/common/core/executor/ZinggBase.java +++ b/common/core/src/main/java/zingg/common/core/executor/ZinggBase.java @@ -86,7 +86,7 @@ public void postMetrics() { Analytics.track(Metric.DATA_FORMAT, getPipeUtil().getPipesAsString(args.getData()), collectMetrics); Analytics.track(Metric.OUTPUT_FORMAT, getPipeUtil().getPipesAsString(args.getOutput()), collectMetrics); Analytics.track(Metric.MODEL_ID, args.getModelId(), collectMetrics); - Analytics.track(Metric.ZINGG_VERSION, "0.4.1", collectMetrics); + Analytics.track(Metric.ZINGG_VERSION, "0.4.1-SNAPSHOT", collectMetrics); Analytics.trackEnvProp(Metric.DATABRICKS_RUNTIME_VERSION, collectMetrics); Analytics.trackEnvProp(Metric.DB_INSTANCE_TYPE, collectMetrics); Analytics.trackEnvProp(Metric.JAVA_HOME, collectMetrics); @@ -96,7 +96,7 @@ public void postMetrics() { //Analytics.trackEnvProp(Metric.USER_NAME, collectMetrics); //Analytics.trackEnvProp(Metric.USER_HOME, collectMetrics); Analytics.trackDomain(Metric.DOMAIN, collectMetrics); - Analytics.track(Metric.ZINGG_VERSION, "0.4.1", collectMetrics); + Analytics.track(Metric.ZINGG_VERSION, "0.4.1-SNAPSHOT", collectMetrics); Analytics.postEvent(zinggOptions.getValue(), collectMetrics); } diff --git a/docs/stepbystep/installation/docker/README.md b/docs/stepbystep/installation/docker/README.md index 13c51de42..4cc395341 100644 --- a/docs/stepbystep/installation/docker/README.md +++ b/docs/stepbystep/installation/docker/README.md @@ -9,8 +9,8 @@ description: From pre-built Docker image with all dependencies included The easiest way to get started is to pull the Docker image with the last release of Zingg. ``` -docker pull zingg/zingg:0.4.1 -docker run -it zingg/zingg:0.4.1 bash +docker pull zingg/zingg:0.4.1-SNAPSHOT +docker run -it zingg/zingg:0.4.1-SNAPSHOT bash ``` To know more about Docker, please refer to the official [docker documentation](https://docs.docker.com/). diff --git a/docs/stepbystep/installation/docker/file-read-write-permissions.md b/docs/stepbystep/installation/docker/file-read-write-permissions.md index e7ec5e8b3..a422f3b6a 100644 --- a/docs/stepbystep/installation/docker/file-read-write-permissions.md +++ b/docs/stepbystep/installation/docker/file-read-write-permissions.md @@ -9,5 +9,5 @@ A docker image is preferred to run with a non-root user. By default, the Zingg c ``` $ id uid=1000(abc) gid=1000(abc) groups=1000(abc) -$ docker run -u -it zingg/zingg:0.4.1 bash +$ docker run -u -it zingg/zingg:0.4.1-SNAPSHOT bash ``` diff --git a/docs/stepbystep/installation/docker/sharing-custom-data-and-config-files.md b/docs/stepbystep/installation/docker/sharing-custom-data-and-config-files.md index f6e83648a..c81fd3c95 100644 --- a/docs/stepbystep/installation/docker/sharing-custom-data-and-config-files.md +++ b/docs/stepbystep/installation/docker/sharing-custom-data-and-config-files.md @@ -7,7 +7,7 @@ description: Using custom data to save data files on host machine However, note that once the docker container is stopped, all the work done in that session is lost. If we want to use custom data or persist the generated model or data files, we have to use **Volumes** or **Bind mount** to share files between the two. ``` -docker run -v : -it zingg/zingg:0.4.1 bash +docker run -v : -it zingg/zingg:0.4.1-SNAPSHOT bash ``` The **\** directory from host will get mounted inside container at **\**. Any file written inside this directory will persist on the host machine and can be reused in a new container instance later. diff --git a/docs/stepbystep/installation/installing-from-release/installing-zingg.md b/docs/stepbystep/installation/installing-from-release/installing-zingg.md index 0ba07e2e6..3308f6a47 100644 --- a/docs/stepbystep/installation/installing-from-release/installing-zingg.md +++ b/docs/stepbystep/installation/installing-from-release/installing-zingg.md @@ -6,13 +6,13 @@ description: Downloading and setting things up Download the tar zingg-version.tar.gz from the [Zingg releases page](https://github.com/zinggAI/zingg/releases) to a folder of your choice and run the following: -> gzip -d zingg-0.4.1.tar.gz ; tar xvf zingg-0.4.1.tar +> gzip -d zingg-0.4.1-SNAPSHOT.tar.gz ; tar xvf zingg-0.4.1-SNAPSHOT.tar -This will create a folder zingg-0.4.1 under the chosen folder. +This will create a folder zingg-0.4.1-SNAPSHOT under the chosen folder. Move the above folder to zingg. -> mv zingg-0.4.1 \~/zingg +> mv zingg-0.4.1-SNAPSHOT \~/zingg > export ZINGG\_HOME=path to zingg diff --git a/pom.xml b/pom.xml index cd60bffb5..955a17ffd 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ - 0.4.1 + 0.4.1-SNAPSHOT false false 8 diff --git a/python/docs/conf.py b/python/docs/conf.py index d96167f0c..a4d14e2c8 100644 --- a/python/docs/conf.py +++ b/python/docs/conf.py @@ -22,7 +22,7 @@ author = 'Zingg.AI' # The full version, including alpha/beta/rc tags -release = '0.4.1' +release = '0.4.1-SNAPSHOT' # -- General configuration --------------------------------------------------- diff --git a/python/zingg/client.py b/python/zingg/client.py index 7d613931a..7f4eee2f2 100644 --- a/python/zingg/client.py +++ b/python/zingg/client.py @@ -20,7 +20,7 @@ _spark_ctxt = None _sqlContext = None _spark = None -_zingg_jar = 'zingg-0.4.1.jar' +_zingg_jar = 'zingg-0.4.1-SNAPSHOT.jar' def initSparkClient(): global _spark_ctxt diff --git a/python/zingg/databricks.py b/python/zingg/databricks.py index 8d7eb47fa..54404f989 100644 --- a/python/zingg/databricks.py +++ b/python/zingg/databricks.py @@ -37,7 +37,7 @@ } }, { - "jar": "dbfs:/FileStore/jars/zingg_0_4_0.jar" + "jar": "dbfs:/FileStore/jars/zingg_0_4_1_SNAPSHOT.jar" } ], "timeout_seconds": 0, diff --git a/scripts/zingg.sh b/scripts/zingg.sh index 6932c7a7a..2ac64f852 100755 --- a/scripts/zingg.sh +++ b/scripts/zingg.sh @@ -1,6 +1,6 @@ #!/bin/bash #ZINGG_HOME=./assembly/target -ZINGG_JARS=$ZINGG_HOME/zingg-0.4.1.jar +ZINGG_JARS=$ZINGG_HOME/zingg-0.4.1-SNAPSHOT.jar EMAIL=zingg@zingg.ai LICENSE=zinggLicense.txt log4j_setting="-Dlog4j2.configurationFile=file:log4j2.properties" diff --git a/test/run_tests.sh b/test/run_tests.sh index 7fc1397d6..0bd396f5b 100755 --- a/test/run_tests.sh +++ b/test/run_tests.sh @@ -1,8 +1,8 @@ #!/bin/bash # Set the paths to your JAR files and Spark binaries -SPARK_HOME="/opt/spark-3.2.4-bin-hadoop3.2" -PY4J_JAR="../common/client/target/zingg-common-client-0.4.1.jar" +SPARK_HOME="/opt/spark-3.5.0-bin-hadoop3" +PY4J_JAR="../common/client/target/zingg-common-client-0.4.1-SNAPSHOT.jar" # Run Spark with the required JAR files and your test script $SPARK_HOME/bin/spark-submit --jars $PY4J_JAR testInfra.py