diff --git a/Dockerfile b/Dockerfile index 12bae7015..15a04e87e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,16 @@ FROM docker.io/bitnami/spark:3.1.2 ENV SPARK_MASTER local[*] -ENV ZINGG_HOME /zingg-0.3.4-SNAPSHOT +ENV ZINGG_HOME /zingg-0.3.5-SNAPSHOT ENV PATH $ZINGG_HOME/scripts:$PATH ENV LANG C.UTF-8 WORKDIR / USER root -WORKDIR /zingg-0.3.4-SNAPSHOT -RUN curl --location https://github.com/zinggAI/zingg/releases/download/v0.3.4/zingg-0.3.4-SNAPSHOT-spark-3.1.2.tar.gz | \ +WORKDIR /zingg-0.3.5-SNAPSHOT +RUN curl --location https://github.com/zinggAI/zingg/releases/download/v0.3.5/zingg-0.3.5-SNAPSHOT-spark-3.1.2.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.3.4-SNAPSHOT/models -RUN chown -R 1001 /zingg-0.3.4-SNAPSHOT/models +RUN chmod -R a+rwx /zingg-0.3.5-SNAPSHOT/models +RUN chown -R 1001 /zingg-0.3.5-SNAPSHOT/models USER 1001 diff --git a/README.md b/README.md index b5ca79c14..a583218b9 100644 --- a/README.md +++ b/README.md @@ -42,8 +42,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.3.4 -docker run -it zingg/zingg:0.3.4 bash +docker pull zingg/zingg:0.3.5 +docker run -it zingg/zingg:0.3.5 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 ce0d41bac..93f428565 100644 --- a/common/client/src/main/java/zingg/common/client/Client.java +++ b/common/client/src/main/java/zingg/common/client/Client.java @@ -116,7 +116,7 @@ else if (args.getJobId() != -1) { } public void printBanner() { - String versionStr = "0.3.4"; + String versionStr = "0.3.5"; LOG.info(""); LOG.info("********************************************************"); LOG.info("* Zingg AI *"); diff --git a/docker/mac/Dockerfile b/docker/mac/Dockerfile index ae69148f1..b7c0ae228 100644 --- a/docker/mac/Dockerfile +++ b/docker/mac/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.3.4-SNAPSHOT +ENV ZINGG_HOME /zingg-0.3.5-SNAPSHOT ENV PATH $ZINGG_HOME/scripts:$PATH ENV LANG C.UTF-8 WORKDIR / USER root -WORKDIR /zingg-0.3.4-SNAPSHOT -RUN curl --location https://github.com/zinggAI/zingg/releases/download/v0.3.4/zingg-0.3.4-SNAPSHOT-spark-3.1.2.tar.gz | \ +WORKDIR /zingg-0.3.5-SNAPSHOT +RUN curl --location https://github.com/zinggAI/zingg/releases/download/v0.3.5/zingg-0.3.5-SNAPSHOT-spark-3.1.2.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.3.4-SNAPSHOT/models -RUN chown -R 1001 /zingg-0.3.4-SNAPSHOT/models +RUN chmod -R a+rwx /zingg-0.3.5-SNAPSHOT/models +RUN chown -R 1001 /zingg-0.3.5-SNAPSHOT/models USER 1001 diff --git a/docs/README.md b/docs/README.md index bfea8cf13..d003d02df 100644 --- 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.3.5 ](https://docs.zingg.ai/zingg0.3.5/) * [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 index b4b11236d..2e1545fac 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.3.4 -docker run -it zingg/zingg:0.3.4 bash +docker pull zingg/zingg:0.3.5 +docker run -it zingg/zingg:0.3.5 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 24cb51523..a78dad147 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.3.4 bash +$ docker run -u -it zingg/zingg:0.3.5 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 5b77ebe9e..d3c6e0dcb 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.3.4 bash +docker run -v : -it zingg/zingg:0.3.5 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 7f9f6c302..5f09efc0d 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.3.4-SNAPSHOT-bin.tar.gz ; tar xvf zingg-0.3.4-SNAPSHOT-bin.tar +> gzip -d zingg-0.3.5-SNAPSHOT-bin.tar.gz ; tar xvf zingg-0.3.5-SNAPSHOT-bin.tar -This will create a folder zingg-0.3.4-SNAPSHOT under the chosen folder. +This will create a folder zingg-0.3.5-SNAPSHOT under the chosen folder. Move the above folder to zingg. -> mv zingg-0.3.4-SNAPSHOT-bin \~/zingg +> mv zingg-0.3.5-SNAPSHOT-bin \~/zingg > export ZINGG\_HOME=path to zingg diff --git a/examples/databricks/runOnDatabricks.py b/examples/databricks/runOnDatabricks.py index c4248dcbe..6fdd8264b 100644 --- a/examples/databricks/runOnDatabricks.py +++ b/examples/databricks/runOnDatabricks.py @@ -36,7 +36,7 @@ } }, { - "jar": "dbfs:/FileStore/zingg_0_3_4_SNAPSHOT.jar" + "jar": "dbfs:/FileStore/zingg_0_3_5_SNAPSHOT.jar" } ], "timeout_seconds": 0, diff --git a/pom.xml b/pom.xml index 8ae8546b9..500e249d8 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ - 0.3.4-SNAPSHOT + 0.3.5-SNAPSHOT false false 11 diff --git a/python/PKG-INFO b/python/PKG-INFO index e84045daa..74d2a5619 100644 --- a/python/PKG-INFO +++ b/python/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: zingg -Version: 0.3.4 +Version: 0.3.5 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 index 8351de75e..747136472 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.3.4' +release = '0.3.5' # -- General configuration --------------------------------------------------- diff --git a/python/version.py b/python/version.py index 40abbde2f..a20db2872 100644 --- a/python/version.py +++ b/python/version.py @@ -1,4 +1,4 @@ #!/usr/bin/env python3 -__version__: str = "0.3.4" \ No newline at end of file +__version__: str = "0.3.5" \ No newline at end of file diff --git a/python/zingg/databricks.py b/python/zingg/databricks.py index b1371cc1c..9e3ef8c9d 100644 --- a/python/zingg/databricks.py +++ b/python/zingg/databricks.py @@ -30,7 +30,7 @@ "job_cluster_key": "_cluster", "libraries": [ { - "whl":"dbfs:/FileStore/py/zingg-0.3.4-py2.py3-none-any.whl" + "whl":"dbfs:/FileStore/py/zingg-0.3.5-py2.py3-none-any.whl" }, { "pypi": { @@ -38,7 +38,7 @@ } }, { - "jar": "dbfs:/FileStore/jars/zingg_0_3_4_SNAPSHOT.jar" + "jar": "dbfs:/FileStore/jars/zingg_0_3_5_SNAPSHOT.jar" } ], "timeout_seconds": 0, diff --git a/scripts/zingg.sh b/scripts/zingg.sh index 7aed685de..36655d9c1 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.3.4-SNAPSHOT.jar +ZINGG_JARS=$ZINGG_HOME/zingg-0.3.5-SNAPSHOT.jar EMAIL=zingg@zingg.ai LICENSE=zinggLicense.txt log4j_setting="-Dlog4j.configuration=file:log4j.properties"