Skip to content

Commit

Permalink
issue #548 bump up release version
Browse files Browse the repository at this point in the history
  • Loading branch information
vikasgupta78 authored and sonalgoyal committed Mar 29, 2023
1 parent 54e3589 commit df30f73
Show file tree
Hide file tree
Showing 16 changed files with 29 additions and 28 deletions.
10 changes: 5 additions & 5 deletions 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

4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -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
```

Expand Down
Expand Up @@ -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 *");
Expand Down
10 changes: 5 additions & 5 deletions docker/mac/Dockerfile
Expand Up @@ -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

1 change: 1 addition & 0 deletions docs/README.md
Expand Up @@ -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/)

Expand Down
4 changes: 2 additions & 2 deletions docs/stepbystep/installation/docker/README.md
Expand Up @@ -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/).
Expand Down
Expand Up @@ -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.3.4 bash
$ docker run -u <uid> -it zingg/zingg:0.3.5 bash
```
Expand Up @@ -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.3.4 bash
docker run -v <local-location>:<container-location> -it zingg/zingg:0.3.5 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.
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/databricks/runOnDatabricks.py
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Expand Up @@ -113,7 +113,7 @@
</profile>
</profiles>
<properties>
<zingg.version>0.3.4-SNAPSHOT</zingg.version>
<zingg.version>0.3.5-SNAPSHOT</zingg.version>
<skipTests>false</skipTests>
<failIfNoTests>false</failIfNoTests>
<maven.compiler.source>11</maven.compiler.source>
Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Down
2 changes: 1 addition & 1 deletion python/docs/conf.py
Expand Up @@ -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 ---------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion python/version.py
@@ -1,4 +1,4 @@
#!/usr/bin/env python3


__version__: str = "0.3.4"
__version__: str = "0.3.5"
4 changes: 2 additions & 2 deletions python/zingg/databricks.py
Expand Up @@ -30,15 +30,15 @@
"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": {
"package": "databricks-cli"
}
},
{
"jar": "dbfs:/FileStore/jars/zingg_0_3_4_SNAPSHOT.jar"
"jar": "dbfs:/FileStore/jars/zingg_0_3_5_SNAPSHOT.jar"
}
],
"timeout_seconds": 0,
Expand Down
2 changes: 1 addition & 1 deletion 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"
Expand Down

0 comments on commit df30f73

Please sign in to comment.