This is an automated email from the ASF dual-hosted git repository.
fgreg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git
The following commit(s) were added to refs/heads/master by this push:
new 6b3e24f SDAP-157 Bump nexusproto to 1.0.0 (#46)
6b3e24f is described below
commit 6b3e24fd921b258529d027b7fda0a73351890b36
Author: fgreg <[email protected]>
AuthorDate: Wed Oct 17 17:21:40 2018 -0700
SDAP-157 Bump nexusproto to 1.0.0 (#46)
* updated version dependencies.
* update dockerfiles
---
analysis/setup.py | 2 +-
data-access/requirements.txt | 2 +-
data-access/setup.py | 4 ++--
docker/nexus-webapp/Dockerfile | 1 +
docker/spark-mesos-base/Dockerfile | 1 +
5 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/analysis/setup.py b/analysis/setup.py
index 70a9f4d..1a9f845 100644
--- a/analysis/setup.py
+++ b/analysis/setup.py
@@ -16,7 +16,7 @@
import setuptools
-__version__ = '1.5'
+__version__ = '1.6'
setuptools.setup(
name="nexusanalysis",
diff --git a/data-access/requirements.txt b/data-access/requirements.txt
index 1901db2..651f776 100644
--- a/data-access/requirements.txt
+++ b/data-access/requirements.txt
@@ -14,7 +14,7 @@ futures==3.1.1
ipython==5.3.0
ipython-genutils==0.2.0
jmespath==0.9.3
-nexusproto==1.0.0-SNAPSHOT
+nexusproto==1.0.0
numpy==1.11.1
pathlib2==2.2.1
pexpect==4.2.1
diff --git a/data-access/setup.py b/data-access/setup.py
index 532dede..031ccb0 100644
--- a/data-access/setup.py
+++ b/data-access/setup.py
@@ -16,7 +16,7 @@
import setuptools
from Cython.Build import cythonize
-__version__ = '0.32'
+__version__ = '0.33'
setuptools.setup(
name="nexus-data-access",
@@ -36,7 +36,7 @@ setuptools.setup(
'cassandra-driver==3.5.0',
'pysolr==3.7.0',
'requests',
- 'nexusproto==1.0.0-SNAPSHOT',
+ 'nexusproto==1.0.0',
'shapely'
],
diff --git a/docker/nexus-webapp/Dockerfile b/docker/nexus-webapp/Dockerfile
index 3b2d5f9..94ea293 100644
--- a/docker/nexus-webapp/Dockerfile
+++ b/docker/nexus-webapp/Dockerfile
@@ -82,6 +82,7 @@ ARG
APACHE_NEXUSPROTO=https://github.com/apache/incubator-sdap-nexusproto.git
ARG APACHE_NEXUSPROTO_BRANCH=master
ARG APACHE_NEXUS=https://github.com/apache/incubator-sdap-nexus.git
ARG APACHE_NEXUS_BRANCH=master
+ARG REBUILD_CODE=1
RUN /tmp/install_nexusproto.sh $APACHE_NEXUSPROTO $APACHE_NEXUSPROTO_BRANCH &&
\
/tmp/install_nexus.sh $APACHE_NEXUS $APACHE_NEXUS_BRANCH $NEXUS_SRC
diff --git a/docker/spark-mesos-base/Dockerfile
b/docker/spark-mesos-base/Dockerfile
index 784f56c..4c27bd6 100644
--- a/docker/spark-mesos-base/Dockerfile
+++ b/docker/spark-mesos-base/Dockerfile
@@ -125,6 +125,7 @@ RUN yum install -y mesa-libGL.x86_64
# Install nexusproto
ARG APACHE_NEXUSPROTO=https://github.com/apache/incubator-sdap-nexusproto.git
ARG APACHE_NEXUSPROTO_BRANCH=master
+ARG REBUILD_CODE=1
COPY install_nexusproto.sh ./install_nexusproto.sh
RUN ./install_nexusproto.sh $APACHE_NEXUSPROTO $APACHE_NEXUSPROTO_BRANCH
