changed version to 0.4.1

zinggAI · Jan 1, 2024 · 1f42386 · 1f42386
1 parent 26640dc
commit 1f42386
Show file tree

Hide file tree

Showing 18 changed files with 28 additions and 32 deletions.
diff --git 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.0
+ENV ZINGG_HOME /zingg-0.4.1
 ENV PATH $ZINGG_HOME/scripts:$PATH
 ENV LANG C.UTF-8
 WORKDIR /
 USER root
-WORKDIR /zingg-0.4.0
-RUN curl --location https://github.com/zinggAI/zingg/releases/download/v0.4.0/zingg-0.4.0-spark-3.4.0.tar.gz | \
+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 | \
 tar --extract --gzip --strip=1 
 RUN pip install -r python/requirements.txt
 RUN pip install zingg
-RUN chmod -R a+rwx /zingg-0.4.0/models
-RUN chown -R 1001 /zingg-0.4.0/models
+RUN chmod -R a+rwx /zingg-0.4.1/models
+RUN chown -R 1001 /zingg-0.4.1/models
 USER 1001
 
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-## On our way to 0.4.0 release of Zingg soon..............stay tuned!
+## On our way to 0.4.1 release of Zingg soon..............stay tuned!
 
 ## The Problem
 
@@ -60,13 +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.
 ```
-<<<<<<< HEAD
-docker pull zingg/zingg:0.4.0
-docker run -it zingg/zingg:0.4.0 bash
-=======
-docker pull zingg/zingg:0.3.4
-docker run -it zingg/zingg:0.3.4 bash
->>>>>>> main
+docker pull zingg/zingg:0.4.1
+docker run -it zingg/zingg:0.4.1 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
@@ -120,7 +120,7 @@ else if (args.getJobId() != -1) {
 	}
 
 	public void printBanner() {
-		String versionStr = "0.4.0";
+		String versionStr = "0.4.1";
 		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
@@ -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.0", collectMetrics);
+        Analytics.track(Metric.ZINGG_VERSION, "0.4.1", 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.0", collectMetrics);
+        Analytics.track(Metric.ZINGG_VERSION, "0.4.1", collectMetrics);
         Analytics.postEvent(zinggOptions.getValue(), collectMetrics);
 	}
 

diff --git a/docs/README.md b/docs/README.md
@@ -8,6 +8,7 @@ description: Hope you find us useful :-)
 
 This is the latest documentation for Zingg. Release wise documentation can be accessed through:
 
+* [v0.4.1 ](https://docs.zingg.ai/zingg0.4.1/)
 * [v0.4.0 ](https://docs.zingg.ai/zingg0.4.0/)
 * [v0.3.4 ](https://docs.zingg.ai/zingg0.3.4/)
 * [v0.3.3](https://docs.zingg.ai/zingg0.3.3/)

diff --git 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.0
-docker run -it zingg/zingg:0.4.0 bash
+docker pull zingg/zingg:0.4.1
+docker run -it zingg/zingg:0.4.1 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
@@ -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 <uid> -it zingg/zingg:0.4.0 bash
+$ docker run -u <uid> -it zingg/zingg:0.4.1 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
@@ -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 <local-location>:<container-location> -it zingg/zingg:0.4.0 bash
+docker run -v <local-location>:<container-location> -it zingg/zingg:0.4.1 bash
 ```
 
 The **\<local-location>** directory from host will get mounted inside container at **\<container-location>**. 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
@@ -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.0.tar.gz ; tar xvf zingg-0.4.0.tar
+> gzip -d zingg-0.4.1.tar.gz ; tar xvf zingg-0.4.1.tar
 
-This will create a folder zingg-0.4.0 under the chosen folder.
+This will create a folder zingg-0.4.1 under the chosen folder.
 
 Move the above folder to zingg.
 
-> mv zingg-0.4.0 \~/zingg
+> mv zingg-0.4.1 \~/zingg
 
 > export ZINGG\_HOME=path to zingg
 

diff --git a/pom.xml b/pom.xml
@@ -64,7 +64,7 @@
 		</profile>
 	</profiles>
 	<properties>
-		<zingg.version>0.4.0</zingg.version>
+		<zingg.version>0.4.1</zingg.version>
 		<skipTests>false</skipTests>
 		<failIfNoTests>false</failIfNoTests>
 		<maven.compiler.source>8</maven.compiler.source>

diff --git a/python/PKG-INFO b/python/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zingg
-Version: 0.4.0
+Version: 0.4.1
 Summary: Zingg.ai Entity Resolution
 Home-page: www.zingg.ai
 Author: Zingg.AI

diff --git 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.0'
+release = '0.4.1'
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/python/version.py b/python/version.py
@@ -1,4 +1,4 @@
 #!/usr/bin/env python3
 
 
-__version__: str = "0.4.0"
+__version__: str = "0.4.1"
diff --git 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.0.jar'
+_zingg_jar = 'zingg-0.4.1.jar'
 
 def initSparkClient():
     global _spark_ctxt

diff --git a/python/zingg/databricks.py b/python/zingg/databricks.py
@@ -29,7 +29,7 @@
                 "job_cluster_key": "_cluster",
                 "libraries": [
                     {
-                        "whl":"dbfs:/FileStore/py/zingg-0.4.0-py2.py3-none-any.whl"
+                        "whl":"dbfs:/FileStore/py/zingg-0.4.1-py2.py3-none-any.whl"
                     },
                     {
                         "pypi": {

diff --git 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.0.jar
+ZINGG_JARS=$ZINGG_HOME/zingg-0.4.1.jar
 [email protected]
 LICENSE=zinggLicense.txt
 log4j_setting="-Dlog4j2.configurationFile=file:log4j2.properties"

diff --git a/test/note.txt b/test/note.txt
@@ -5,7 +5,7 @@ To run it:
 1. cd test/
 2. pyspark < testInfraOwnGateway.py
 (or)
-2. /opt/spark-3.2.4-bin-hadoop3.2/bin/spark-submit --jars ../common/client/target/zingg-common-client-0.4.0-SNAPSHOT.jar testInfraOwnGateway.py
+2. /opt/spark-3.2.4-bin-hadoop3.2/bin/spark-submit --jars ../common/client/target/zingg-common-client-0.4.1-SNAPSHOT.jar testInfraOwnGateway.py
 
 
 If faced version mismatch issue:

diff --git a/test/run_tests.sh b/test/run_tests.sh
@@ -2,7 +2,7 @@
 
 # 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.0.jar"
+PY4J_JAR="../common/client/target/zingg-common-client-0.4.1.jar"
 
 # Run Spark with the required JAR files and your test script
 $SPARK_HOME/bin/spark-submit --jars $PY4J_JAR testInfra.py