Merge branch 'release'

SeldonIO · Mar 28, 2017 · dbc425a · dbc425a
2 parents ad1fe18 + 72f66e0
commit dbc425a
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 11 deletions.
diff --git a/client/java-client/pom.xml b/client/java-client/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.seldon</groupId>
         <artifactId>seldon-parent</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>seldon-java-client</artifactId>

diff --git a/offline-jobs/spark/pom.xml b/offline-jobs/spark/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.seldon</groupId>
         <artifactId>seldon-parent</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>io.seldon</groupId>
     <artifactId>seldon-parent</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2</version>
     <packaging>pom</packaging>
     <name>Seldon Project Parent POM</name>
     <url>http://seldon.io/</url>

diff --git a/python/docs/Makefile b/python/docs/Makefile
@@ -53,7 +53,7 @@ clean:
 
 html:
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	cd $(BUILDDIR)/html ; sed -i 's/_modules/modules/g' seldon.html ; sed -i 's/_modules/modules/g' seldon.pipeline.html ; sed -i 's/_modules/modules/g' seldon.cli.html ; sed -i 's/_modules/modules/g' seldon.luigi.html ; sed -i 's/_modules/modules/g' seldon.microservice.html ; sed -i 's/_modules/modules/g' seldon.misc.html ; sed -i 's/_modules/modules/g' seldon.text.html 
+	cd $(BUILDDIR)/html ; sed -i 's/_modules/modules/g' seldon.html ; sed -i 's/_modules/modules/g' seldon.pipeline.html ; sed -i 's/_modules/modules/g' seldon.cli.html ; sed -i 's/_modules/modules/g' seldon.luigi.html ; sed -i 's/_modules/modules/g' seldon.microservice.html ; sed -i 's/_modules/modules/g' seldon.misc.html ; sed -i 's/_modules/modules/g' seldon.text.html ; sed -i 's/_modules/modules/g' seldon.anomaly.html 
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
 

diff --git a/python/docs/conf.py b/python/docs/conf.py
@@ -65,9 +65,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.0'
+version = '2.2.1'
 # The full version, including alpha/beta/rc tags.
-release = '1.0'
+release = '2.2.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/python/docs/seldon.rst b/python/docs/seldon.rst
@@ -6,13 +6,15 @@ Subpackages
 
 .. toctree::
 
+   seldon.anomaly
    seldon.cli
    seldon.luigi
    seldon.microservice
    seldon.misc
    seldon.pipeline
    seldon.text
 
+
 Submodules
 ----------
 

diff --git a/python/seldon/__init__.py b/python/seldon/__init__.py
@@ -2,7 +2,7 @@
 
 from .util import RecommenderWrapper,Recommender,Extension,ExtensionWrapper,Recommender_wrapper,Extension_wrapper
 
-__version__ = '2.2'
+__version__ = '2.2.1'
 
 class NullHandler(logging.Handler):
     def emit(self, record):

diff --git a/python/setup.py b/python/setup.py
@@ -14,7 +14,7 @@
       dependency_links = [
           'https://github.com/SeldonIO/wabbit_wappa/archive/3.0.2.zip#egg=wabbit-wappa-3.0.2'
       ],
-      packages=['seldon', 'seldon.pipeline', 'seldon.microservice', 'seldon.text', 'seldon.shell', 'seldon.cli','seldon.misc','seldon.luigi','seldon.rpc'],
+      packages=['seldon', 'seldon.pipeline', 'seldon.microservice', 'seldon.text', 'seldon.shell', 'seldon.cli','seldon.misc','seldon.luigi','seldon.rpc','seldon.anomaly'],
       package_dir={'seldon.shell': 'seldon/shell', 'seldon.cli': 'seldon/cli'},
       package_data={'seldon.shell': ['dbschema/mysql/api.sql', 'dbschema/mysql/client.sql'], 'seldon.cli': ['dbschema/mysql/api.sql', 'dbschema/mysql/client.sql', 'grafana/client-dashboard.json']},
       scripts=['bin/seldon-shell','bin/seldon-cli'],

diff --git a/server/pom.xml b/server/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.seldon</groupId>
         <artifactId>seldon-parent</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>seldon-server</artifactId>

diff --git a/stream/pom.xml b/stream/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.seldon</groupId>
         <artifactId>seldon-parent</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/web-item-importer/pom.xml b/web-item-importer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.seldon</groupId>
         <artifactId>seldon-parent</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>