Skip to content

Commit

Permalink
added snapshot to release version
Browse files Browse the repository at this point in the history
  • Loading branch information
vikasgupta78 committed Jan 1, 2024
1 parent 1f42386 commit f795de1
Show file tree
Hide file tree
Showing 14 changed files with 24 additions and 24 deletions.
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
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.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

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 *");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
}

Expand Down
4 changes: 2 additions & 2 deletions docs/stepbystep/installation/docker/README.md
Original file line number Diff line number Diff line change
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.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/).
Expand Down
Original file line number Diff line number Diff line change
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.4.1 bash
$ docker run -u <uid> -it zingg/zingg:0.4.1-SNAPSHOT bash
```
Original file line number Diff line number Diff line change
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.4.1 bash
docker run -v <local-location>:<container-location> -it zingg/zingg:0.4.1-SNAPSHOT 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.
Original file line number Diff line number Diff line change
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.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
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
</profile>
</profiles>
<properties>
<zingg.version>0.4.1</zingg.version>
<zingg.version>0.4.1-SNAPSHOT</zingg.version>
<skipTests>false</skipTests>
<failIfNoTests>false</failIfNoTests>
<maven.compiler.source>8</maven.compiler.source>
Expand Down
2 changes: 1 addition & 1 deletion python/docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 ---------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion python/zingg/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion python/zingg/databricks.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion scripts/zingg.sh
Original file line number Diff line number Diff line change
@@ -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 protected]
LICENSE=zinggLicense.txt
log4j_setting="-Dlog4j2.configurationFile=file:log4j2.properties"
Expand Down
4 changes: 2 additions & 2 deletions test/run_tests.sh
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit f795de1

Please sign in to comment.