Merge pull request #4 from apache/develop
update develop branch from Apache repo
diff --git a/.travis.yml b/.travis.yml
index 63f9acc..46e7922 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-# Copyright [2018] Apache Marvin-AI
+# Copyright [2018] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..f0a548c
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,49 @@
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.PHONY: help docker-base docker-python docker-r toolbox engine-server
+
+help:
+ @echo " docker-base"
+ @echo " Builds the base docker image with common dependecies among languages."
+ @echo " docker-python"
+ @echo " Builds a docker image that can run engines in Python."
+ @echo " docker-r"
+ @echo " Builds a docker image that can run engines in R."
+ @echo " toolbox"
+ @echo " Builds the toolbox and make it available for be included into docker images."
+ @echo " engine-server"
+ @echo " Builds a jar with the engine interpreter server."
+
+docker-base:
+ docker build -t marvin-base -f engine-server/build/Dockerfile engine-server/build
+
+docker-python:
+ $(MAKE) engine-server
+ $(MAKE) toolbox
+ docker build -t marvin-python -f engine-server/build/docker-python/Dockerfile engine-server/build
+
+docker-r:
+ $(MAKE) engine-server
+ $(MAKE) toolbox
+ docker build -t marvin-r -f engine-server/build/docker-r/Dockerfile engine-server/build
+
+engine-server:
+ cd engine-server && $(MAKE) package
+ mv engine-server/target/scala-2.12/marvin-engine-server-assembly-*.jar engine-server/build/marvin-engine-server-assembly.jar
+
+toolbox:
+ tar -cf engine-server/build/python-toolbox.tgz python-toolbox
\ No newline at end of file
diff --git a/README.md b/README.md
index cf54949..f890222 100644
--- a/README.md
+++ b/README.md
@@ -15,13 +15,13 @@
limitations under the License.
-->
-# [Apache Marvin AI Platform](https://marvin.apache.org/)
+# [Apache Marvin AI Platform](https://marvin.apache.org)
Branch | Status | CodeCov
-|-|-
-[master](https://github.com/apache/incubator-marvin) | [](https://travis-ci.org/apache/incubator-marvin) | [](https://codecov.io/gh/apache/incubator-marvin)
+[master](https://github.com/apache/incubator-marvin/tree/master) | [](https://travis-ci.org/apache/incubator-marvin) | [](https://codecov.io/gh/apache/incubator-marvin)
[develop](https://github.com/apache/incubator-marvin/tree/develop) | [](https://travis-ci.org/apache/incubator-marvin/branches) | [](https://codecov.io/gh/apache/incubator-marvin/branch/develop)
**Marvin** is an open-source Artificial Intelligence platform that focuses on helping data scientists deliver meaningful solutions to complex problems. Supported by a standardized large-scale, language-agnostic architecture, Marvin simplifies the process of exploration and modeling.
diff --git a/engine-executor/CODE_OF_CONDUCT.md b/engine-executor/CODE_OF_CONDUCT.md
index 72ec3a7..d1ea5fa 100644
--- a/engine-executor/CODE_OF_CONDUCT.md
+++ b/engine-executor/CODE_OF_CONDUCT.md
@@ -34,7 +34,7 @@
## Enforcement
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at marvin-ai@googlegroups.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at dev@marvin.apache.org. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
diff --git a/engine-executor/Makefile b/engine-executor/Makefile
index 08f3d71..5a20eda 100644
--- a/engine-executor/Makefile
+++ b/engine-executor/Makefile
@@ -1,4 +1,4 @@
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/engine-executor/NOTICE b/engine-executor/NOTICE
index bf5c89e..45cc502 100644
--- a/engine-executor/NOTICE
+++ b/engine-executor/NOTICE
@@ -1,5 +1,5 @@
Marvin Artifical Intelligence Platform
-Copyright 2017 B2W Digital
+Copyright 2019 Apache Software Foundation
This product includes software developed at
-B2W Digital (http://www.b2w.digital)
\ No newline at end of file
+Apache Software Foundation https://www.apache.org/
\ No newline at end of file
diff --git a/engine-executor/PULL_REQUEST_TEMPLATE.md b/engine-executor/PULL_REQUEST_TEMPLATE.md
index 0334db7..82eda38 100644
--- a/engine-executor/PULL_REQUEST_TEMPLATE.md
+++ b/engine-executor/PULL_REQUEST_TEMPLATE.md
@@ -14,4 +14,4 @@
-
-
-@marvin-ai/marvin-core-team
+dev@marvin.apache.org
diff --git a/engine-executor/README.md b/engine-executor/README.md
index d31bb12..46800ee 100644
--- a/engine-executor/README.md
+++ b/engine-executor/README.md
@@ -1,4 +1,4 @@
-[](https://travis-ci.org/marvin-ai/marvin-engine-executor) [](https://codecov.io/gh/marvin-ai/marvin-engine-executor)
+[](https://travis-ci.org/apache/incubator-marvin) [](https://codecov.io/gh/apache/incubator-marvin/branch/develop)
# Marvin Engine Executor (Server)
diff --git a/engine-executor/build.sbt b/engine-executor/build.sbt
index d3a40a6..4ca3eab 100644
--- a/engine-executor/build.sbt
+++ b/engine-executor/build.sbt
@@ -1,5 +1,5 @@
/*
- * Copyright [2017] [B2W Digital]
+ * Copyright [2019] [Apache Software Foundation]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/engine-executor/build/Dockerfile b/engine-executor/build/Dockerfile
new file mode 100644
index 0000000..bbf5394
--- /dev/null
+++ b/engine-executor/build/Dockerfile
@@ -0,0 +1,89 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+##############################################################
+# Base docker image for Marvin
+##############################################################
+FROM ubuntu:16.04
+
+ENV SLEEP_MILLIS 0
+
+USER root
+
+##############################################################
+# Creates the marvin user
+##############################################################
+RUN groupadd marvin && \
+ useradd marvin -mg marvin
+
+##############################################################
+# Define all environment variables to be used
+##############################################################
+
+ENV MARVIN_HOME=/home/marvin
+ENV MARVIN_DATA_PATH=/home/marvin/marvin-data
+ENV MARVIN_ENGINE_HOME=$MARVIN_HOME/engine
+ENV MARVIN_ENGINE_ENV=marvin-engine-env
+
+
+##############################################################
+# Create all folders needed
+##############################################################
+
+RUN mkdir -p $MARVIN_HOME && \
+ mkdir -p $MARVIN_DATA_PATH && \
+ mkdir -p $MARVIN_ENGINE_HOME && \
+ mkdir -p /var/log/marvin/engines && \
+ mkdir -p /var/run/marvin/engines
+
+
+##############################################################
+# Install the system dependencies for default installation
+##############################################################
+
+RUN apt-get update -y && \
+ apt-get install -y build-essential && \
+ apt-get install -y maven git cmake software-properties-common curl libstdc++6 && \
+ apt-get install -y wget && \
+ apt-get install -y libffi-dev && \
+ apt-get install -y libssl-dev && \
+ apt-get install -y libxml2-dev && \
+ apt-get install -y libxslt1-dev && \
+ apt-get install -y libpng12-dev && \
+ apt-get install -y libfreetype6-dev && \
+ apt-get install -y libsasl2-dev && \
+ apt-get install -y graphviz && \
+ apt-get clean
+
+### Installs Open JDK 8
+RUN add-apt-repository ppa:openjdk-r/ppa && \
+ apt-get update && \
+ apt-get install -y openjdk-8-jdk
+
+## TODO - Think in a good way to make Spark an option as soon we implement docker supporting it
+##############################################################
+# Install Apache Spark
+#
+# Uncomment if you are using spark, note that is needed the
+# spark configuration files to the think works correctly.
+##############################################################
+
+# RUN curl https://d3kbcqa49mib13.cloudfront.net/spark-2.1.1-bin-hadoop2.6.tgz -o /tmp/spark-2.1.1-bin-hadoop2.6.tgz && \
+# tar -xf /tmp/spark-2.1.1-bin-hadoop2.6.tgz -C /opt/ && \
+# ln -s /opt/spark-2.1.1-bin-hadoop2.6 /opt/spark
+
+# Add the b2w datalake config for Spark
+# ADD spark-conf.tar $SPARK_CONF_DIR
+# RUN mkdir -p $SPARK_CONF_DIR
\ No newline at end of file
diff --git a/engine-executor/build/docker-python/Dockerfile b/engine-executor/build/docker-python/Dockerfile
new file mode 100644
index 0000000..695be4c
--- /dev/null
+++ b/engine-executor/build/docker-python/Dockerfile
@@ -0,0 +1,59 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ARG BASE_TAG=latest
+FROM marvin-base:${BASE_TAG}
+
+##############################################################
+# Define all environment variables to be used
+##############################################################
+ENV WORKON_HOME=$MARVIN_HOME/.virtualenvs
+
+##############################################################
+# Install python dependencies
+##############################################################
+
+RUN apt-get update -y && \
+ apt-get install -y python && \
+ apt-get install -y python2.7-dev && \
+ apt-get install -y python-pip && \
+ apt-get install -y ipython && \
+ # ??? apt-get install -y python-tk && \ ??? #
+ pip install --upgrade pip==9.0.1 && \
+ apt install -y libzmq3-dev libcurl4-openssl-dev libssl-dev && \
+ pip install jupyter && \
+ apt-get clean
+
+##############################################################
+# Copy and Install the marvin engine inside virtualenv
+##############################################################
+
+# adds the package containing the user-generated engine
+ADD python-toolbox.tgz $MARVIN_ENGINE_HOME
+
+# adds the freshly built engine server jar
+ADD marvin-engine-executor-assembly.jar $MARVIN_DATA_PATH
+
+##############################################################
+# Starts the jupyter http server
+##############################################################
+
+EXPOSE 8888
+
+USER marvin
+
+RUN /bin/bash -c "cd $MARVIN_ENGINE_HOME/python-toolbox && pip install . --user"
+
+CMD /bin/bash -c "marvin --help"
\ No newline at end of file
diff --git a/engine-executor/build/docker-r/Dockerfile b/engine-executor/build/docker-r/Dockerfile
new file mode 100644
index 0000000..f732aec
--- /dev/null
+++ b/engine-executor/build/docker-r/Dockerfile
@@ -0,0 +1,63 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ARG BASE_TAG=latest
+FROM marvin-base:${BASE_TAG}
+
+##############################################################
+# Create all folders needed
+##############################################################
+
+
+##############################################################
+# Install the system dependencies for default R installation
+##############################################################
+
+RUN apt install -y apt-transport-https &&\
+ apt update && \
+ apt install -y python2.7-dev && \
+ apt install -y python-pip && \
+ apt install -y ipython && \
+ pip install --upgrade pip==9.0.1 && \
+ apt install -y libzmq3-dev libcurl4-openssl-dev libssl-dev && \
+ pip install jupyter
+
+
+RUN apt install -y r-base && \
+ su -c "R -e \"install.packages(c('repr', 'IRdisplay', 'IRkernel'), type = 'source', repos='http://cran.rstudio.com/')\"" && \
+ su -c "R -e \"IRkernel::installspec(user = FALSE)\""
+
+
+##############################################################
+# Copy and Install the marvin engine inside virtualenv
+##############################################################
+
+### TODO - Uncomment this block once we have the common lib for R tested and we can run engines in R
+
+# adds the package containing the user-generated engine
+#ADD generated-engine $MARVIN_ENGINE_HOME
+
+# adds the freshly built engine server jar
+#ADD marvin-engine-executor-assembly.jar $MARVIN_DATA_PATH
+
+##############################################################
+# Starts the jupyter http server
+##############################################################
+
+EXPOSE 8888
+
+USER marvin
+
+CMD /bin/bash -c "jupyter notebook --ip=0.0.0.0 --notebook-dir=$MARVIN_HOME"
\ No newline at end of file
diff --git a/engine-executor/build/marvin-engine-server-assembly.jar b/engine-executor/build/marvin-engine-server-assembly.jar
new file mode 100644
index 0000000..ff8a8f4
--- /dev/null
+++ b/engine-executor/build/marvin-engine-server-assembly.jar
Binary files differ
diff --git a/engine-executor/build/python-toolbox.tgz b/engine-executor/build/python-toolbox.tgz
new file mode 100644
index 0000000..86b60d1
--- /dev/null
+++ b/engine-executor/build/python-toolbox.tgz
Binary files differ
diff --git a/engine-executor/sonatype.sbt b/engine-executor/sonatype.sbt
index f6eca49..74c8d2e 100644
--- a/engine-executor/sonatype.sbt
+++ b/engine-executor/sonatype.sbt
@@ -2,8 +2,8 @@
publishMavenStyle := true
-sonatypeProfileName := "com.github.marvin-ai"
+sonatypeProfileName := "com.github.apache"
-sonatypeProjectHosting := Some(GitHubHosting("marvin-ai", "daniel.takabayashi@b2wdigital.com", "marvin-engine-executor"))
+sonatypeProjectHosting := Some(GitHubHosting("incubator-marvin", "dev@marvin.apache.org", "marvin-engine-executor"))
licenses := Seq("APL2" -> url("http://www.apache.org/licenses/LICENSE-2.0.txt"))
diff --git a/engine-executor/src/main/protobuf/actions.proto b/engine-executor/src/main/protobuf/actions.proto
index 9bb5e01..114fa9c 100644
--- a/engine-executor/src/main/protobuf/actions.proto
+++ b/engine-executor/src/main/protobuf/actions.proto
@@ -1,4 +1,4 @@
-// Copyright [2017] [B2W Digital]
+// Copyright [2019] [Apache Software Foundation]
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/engine-executor/src/main/scala/org/marvin/artifact/manager/ArtifactFSSaver.scala b/engine-executor/src/main/scala/org/marvin/artifact/manager/ArtifactFSSaver.scala
index 49334a6..892b7ad 100644
--- a/engine-executor/src/main/scala/org/marvin/artifact/manager/ArtifactFSSaver.scala
+++ b/engine-executor/src/main/scala/org/marvin/artifact/manager/ArtifactFSSaver.scala
@@ -1,5 +1,5 @@
/*
- * Copyright [2017] [B2W Digital]
+ * Copyright [2019] [Apache Software Foundation]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/engine-executor/src/main/scala/org/marvin/artifact/manager/ArtifactHdfsSaver.scala b/engine-executor/src/main/scala/org/marvin/artifact/manager/ArtifactHdfsSaver.scala
index 8a7f037..33e2bfd 100644
--- a/engine-executor/src/main/scala/org/marvin/artifact/manager/ArtifactHdfsSaver.scala
+++ b/engine-executor/src/main/scala/org/marvin/artifact/manager/ArtifactHdfsSaver.scala
@@ -1,5 +1,5 @@
/*
- * Copyright [2017] [B2W Digital]
+ * Copyright [2019] [Apache Software Foundation]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/engine-executor/src/main/scala/org/marvin/artifact/manager/ArtifactS3Saver.scala b/engine-executor/src/main/scala/org/marvin/artifact/manager/ArtifactS3Saver.scala
index 0eb3a1b..1a66aae 100644
--- a/engine-executor/src/main/scala/org/marvin/artifact/manager/ArtifactS3Saver.scala
+++ b/engine-executor/src/main/scala/org/marvin/artifact/manager/ArtifactS3Saver.scala
@@ -1,5 +1,5 @@
/*
- * Copyright [2017] [B2W Digital]
+ * Copyright [2019] [Apache Software Foundation]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/engine-executor/src/main/scala/org/marvin/artifact/manager/ArtifactSaver.scala b/engine-executor/src/main/scala/org/marvin/artifact/manager/ArtifactSaver.scala
index 63a1c65..ce997cd 100644
--- a/engine-executor/src/main/scala/org/marvin/artifact/manager/ArtifactSaver.scala
+++ b/engine-executor/src/main/scala/org/marvin/artifact/manager/ArtifactSaver.scala
@@ -1,5 +1,5 @@
/*
- * Copyright [2017] [B2W Digital]
+ * Copyright [2019] [Apache Software Foundation]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/engine-executor/src/main/scala/org/marvin/exception/MarvinEExecutorException.scala b/engine-executor/src/main/scala/org/marvin/exception/MarvinEExecutorException.scala
index acbd114..778dec6 100644
--- a/engine-executor/src/main/scala/org/marvin/exception/MarvinEExecutorException.scala
+++ b/engine-executor/src/main/scala/org/marvin/exception/MarvinEExecutorException.scala
@@ -1,5 +1,5 @@
/*
- * Copyright [2017] [B2W Digital]
+ * Copyright [2019] [Apache Software Foundation]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/engine-executor/src/main/scala/org/marvin/executor/EngineExecutorApp.scala b/engine-executor/src/main/scala/org/marvin/executor/EngineExecutorApp.scala
index 170294d..7d1b38a 100644
--- a/engine-executor/src/main/scala/org/marvin/executor/EngineExecutorApp.scala
+++ b/engine-executor/src/main/scala/org/marvin/executor/EngineExecutorApp.scala
@@ -1,5 +1,5 @@
/*
- * Copyright [2017] [B2W Digital]
+ * Copyright [2019] [Apache Software Foundation]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/engine-executor/src/main/scala/org/marvin/executor/actions/BatchAction.scala b/engine-executor/src/main/scala/org/marvin/executor/actions/BatchAction.scala
index f4c6168..596f32b 100644
--- a/engine-executor/src/main/scala/org/marvin/executor/actions/BatchAction.scala
+++ b/engine-executor/src/main/scala/org/marvin/executor/actions/BatchAction.scala
@@ -1,5 +1,5 @@
/*
- * Copyright [2017] [B2W Digital]
+ * Copyright [2019] [Apache Software Foundation]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/engine-executor/src/main/scala/org/marvin/executor/actions/OnlineAction.scala b/engine-executor/src/main/scala/org/marvin/executor/actions/OnlineAction.scala
index 4c4e95d..35d8ec0 100644
--- a/engine-executor/src/main/scala/org/marvin/executor/actions/OnlineAction.scala
+++ b/engine-executor/src/main/scala/org/marvin/executor/actions/OnlineAction.scala
@@ -1,5 +1,5 @@
/*
- * Copyright [2017] [B2W Digital]
+ * Copyright [2019] [Apache Software Foundation]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/engine-executor/src/main/scala/org/marvin/executor/actions/PipelineAction.scala b/engine-executor/src/main/scala/org/marvin/executor/actions/PipelineAction.scala
index 271065d..10d5ec9 100644
--- a/engine-executor/src/main/scala/org/marvin/executor/actions/PipelineAction.scala
+++ b/engine-executor/src/main/scala/org/marvin/executor/actions/PipelineAction.scala
@@ -1,5 +1,5 @@
/*
- * Copyright [2017] [B2W Digital]
+ * Copyright [2019] [Apache Software Foundation]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/engine-executor/src/main/scala/org/marvin/executor/api/GenericAPI.scala b/engine-executor/src/main/scala/org/marvin/executor/api/GenericAPI.scala
index 6924700..a86e79f 100644
--- a/engine-executor/src/main/scala/org/marvin/executor/api/GenericAPI.scala
+++ b/engine-executor/src/main/scala/org/marvin/executor/api/GenericAPI.scala
@@ -1,5 +1,5 @@
/*
- * Copyright [2017] [B2W Digital]
+ * Copyright [2019] [Apache Software Foundation]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/engine-executor/src/main/scala/org/marvin/executor/api/GenericAPIHandlers.scala b/engine-executor/src/main/scala/org/marvin/executor/api/GenericAPIHandlers.scala
index f82db29..9bd39fe 100644
--- a/engine-executor/src/main/scala/org/marvin/executor/api/GenericAPIHandlers.scala
+++ b/engine-executor/src/main/scala/org/marvin/executor/api/GenericAPIHandlers.scala
@@ -1,5 +1,5 @@
/*
- * Copyright [2017] [B2W Digital]
+ * Copyright [2019] [Apache Software Foundation]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/engine-executor/src/main/scala/org/marvin/executor/manager/ExecutorManager.scala b/engine-executor/src/main/scala/org/marvin/executor/manager/ExecutorManager.scala
index e25732f..2e97a77 100644
--- a/engine-executor/src/main/scala/org/marvin/executor/manager/ExecutorManager.scala
+++ b/engine-executor/src/main/scala/org/marvin/executor/manager/ExecutorManager.scala
@@ -1,5 +1,5 @@
/*
- * Copyright [2017] [B2W Digital]
+ * Copyright [2019] [Apache Software Foundation]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/engine-executor/src/main/scala/org/marvin/executor/proxies/BatchActionProxy.scala b/engine-executor/src/main/scala/org/marvin/executor/proxies/BatchActionProxy.scala
index a7027f9..4b0624c 100644
--- a/engine-executor/src/main/scala/org/marvin/executor/proxies/BatchActionProxy.scala
+++ b/engine-executor/src/main/scala/org/marvin/executor/proxies/BatchActionProxy.scala
@@ -1,5 +1,5 @@
/*
- * Copyright [2017] [B2W Digital]
+ * Copyright [2019] [Apache Software Foundation]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/engine-executor/src/main/scala/org/marvin/executor/proxies/EngineProxy.scala b/engine-executor/src/main/scala/org/marvin/executor/proxies/EngineProxy.scala
index 018ff45..e21ad6a 100644
--- a/engine-executor/src/main/scala/org/marvin/executor/proxies/EngineProxy.scala
+++ b/engine-executor/src/main/scala/org/marvin/executor/proxies/EngineProxy.scala
@@ -1,5 +1,5 @@
/*
- * Copyright [2017] [B2W Digital]
+ * Copyright [2019] [Apache Software Foundation]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/engine-executor/src/main/scala/org/marvin/executor/proxies/OnlineActionProxy.scala b/engine-executor/src/main/scala/org/marvin/executor/proxies/OnlineActionProxy.scala
index 44bb0cd..7e8e92c 100644
--- a/engine-executor/src/main/scala/org/marvin/executor/proxies/OnlineActionProxy.scala
+++ b/engine-executor/src/main/scala/org/marvin/executor/proxies/OnlineActionProxy.scala
@@ -1,5 +1,5 @@
/*
- * Copyright [2017] [B2W Digital]
+ * Copyright [2019] [Apache Software Foundation]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/engine-executor/src/main/scala/org/marvin/executor/statemachine/PredictorFSM.scala b/engine-executor/src/main/scala/org/marvin/executor/statemachine/PredictorFSM.scala
index d031a41..1a57e74 100644
--- a/engine-executor/src/main/scala/org/marvin/executor/statemachine/PredictorFSM.scala
+++ b/engine-executor/src/main/scala/org/marvin/executor/statemachine/PredictorFSM.scala
@@ -1,5 +1,5 @@
/*
- * Copyright [2017] [B2W Digital]
+ * Copyright [2019] [Apache Software Foundation]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/engine-executor/src/main/scala/org/marvin/model/BatchExecution.scala b/engine-executor/src/main/scala/org/marvin/model/BatchExecution.scala
index 08b2f43..750567c 100644
--- a/engine-executor/src/main/scala/org/marvin/model/BatchExecution.scala
+++ b/engine-executor/src/main/scala/org/marvin/model/BatchExecution.scala
@@ -1,5 +1,5 @@
/*
- * Copyright [2017] [B2W Digital]
+ * Copyright [2019] [Apache Software Foundation]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/engine-executor/src/main/scala/org/marvin/model/Metadata.scala b/engine-executor/src/main/scala/org/marvin/model/Metadata.scala
index d064e88..a137546 100644
--- a/engine-executor/src/main/scala/org/marvin/model/Metadata.scala
+++ b/engine-executor/src/main/scala/org/marvin/model/Metadata.scala
@@ -1,5 +1,5 @@
/*
- * Copyright [2017] [B2W Digital]
+ * Copyright [2019] [Apache Software Foundation]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/engine-executor/src/main/scala/org/marvin/util/ConfigurationContext.scala b/engine-executor/src/main/scala/org/marvin/util/ConfigurationContext.scala
index 1333633..3f77b98 100644
--- a/engine-executor/src/main/scala/org/marvin/util/ConfigurationContext.scala
+++ b/engine-executor/src/main/scala/org/marvin/util/ConfigurationContext.scala
@@ -1,5 +1,5 @@
/*
- * Copyright [2017] [B2W Digital]
+ * Copyright [2019] [Apache Software Foundation]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/engine-executor/src/main/scala/org/marvin/util/JsonUtil.scala b/engine-executor/src/main/scala/org/marvin/util/JsonUtil.scala
index e0708d3..cb49ce5 100644
--- a/engine-executor/src/main/scala/org/marvin/util/JsonUtil.scala
+++ b/engine-executor/src/main/scala/org/marvin/util/JsonUtil.scala
@@ -1,5 +1,5 @@
/*
- * Copyright [2017] [B2W Digital]
+ * Copyright [2019] [Apache Software Foundation]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/engine-executor/src/main/scala/org/marvin/util/LocalCache.scala b/engine-executor/src/main/scala/org/marvin/util/LocalCache.scala
index b800d84..604b18c 100644
--- a/engine-executor/src/main/scala/org/marvin/util/LocalCache.scala
+++ b/engine-executor/src/main/scala/org/marvin/util/LocalCache.scala
@@ -1,5 +1,5 @@
/*
- * Copyright [2017] [B2W Digital]
+ * Copyright [2019] [Apache Software Foundation]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/engine-executor/src/main/scala/org/marvin/util/ProtocolUtil.scala b/engine-executor/src/main/scala/org/marvin/util/ProtocolUtil.scala
index 92ec7aa..9ffa042 100644
--- a/engine-executor/src/main/scala/org/marvin/util/ProtocolUtil.scala
+++ b/engine-executor/src/main/scala/org/marvin/util/ProtocolUtil.scala
@@ -1,5 +1,5 @@
/*
- * Copyright [2017] [B2W Digital]
+ * Copyright [2019] [Apache Software Foundation]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/engine-executor/src/test/resources/engine_home/docs.yaml b/engine-executor/src/test/resources/engine_home/docs.yaml
index 6d2cd9c..6bf6102 100644
--- a/engine-executor/src/test/resources/engine_home/docs.yaml
+++ b/engine-executor/src/test/resources/engine_home/docs.yaml
@@ -4,7 +4,7 @@
version: "1.0.0"
title: "Iris Species Engine"
contact:
- email: "marvin@marvin.org"
+ email: "dev@marvin.apache.org"
license:
name: "Apache 2.0"
url: "http://www.apache.org/licenses/LICENSE-2.0.html"
@@ -15,7 +15,7 @@
description: "Everything about your Prediction"
externalDocs:
description: "Find out more"
- url: "http://marvin-ai.org"
+ url: "https://marvin.apache.org"
schemes:
- "http"
paths:
@@ -35,4 +35,4 @@
description: "Invalid input"
externalDocs:
description: "Find out more about Marvin "
- url: "http://marvin-ai.org"
\ No newline at end of file
+ url: "https://marvin.apache.org"
\ No newline at end of file
diff --git a/engine-executor/src/test/scala/org/marvin/artifact/manager/ArtifactSaverTest.scala b/engine-executor/src/test/scala/org/marvin/artifact/manager/ArtifactSaverTest.scala
index ed98a5c..8f997a2 100644
--- a/engine-executor/src/test/scala/org/marvin/artifact/manager/ArtifactSaverTest.scala
+++ b/engine-executor/src/test/scala/org/marvin/artifact/manager/ArtifactSaverTest.scala
@@ -1,5 +1,5 @@
/*
- * Copyright [2017] [B2W Digital]
+ * Copyright [2019] [Apache Software Foundation]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/engine-executor/src/test/scala/org/marvin/executor/EngineExecutorAppTest.scala b/engine-executor/src/test/scala/org/marvin/executor/EngineExecutorAppTest.scala
index c85e8b0..d1ee0a4 100644
--- a/engine-executor/src/test/scala/org/marvin/executor/EngineExecutorAppTest.scala
+++ b/engine-executor/src/test/scala/org/marvin/executor/EngineExecutorAppTest.scala
@@ -1,5 +1,5 @@
/*
- * Copyright [2017] [B2W Digital]
+ * Copyright [2019] [Apache Software Foundation]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/engine-executor/src/test/scala/org/marvin/executor/actions/BatchActionTest.scala b/engine-executor/src/test/scala/org/marvin/executor/actions/BatchActionTest.scala
index 7d6d858..8505256 100644
--- a/engine-executor/src/test/scala/org/marvin/executor/actions/BatchActionTest.scala
+++ b/engine-executor/src/test/scala/org/marvin/executor/actions/BatchActionTest.scala
@@ -1,5 +1,5 @@
/*
- * Copyright [2017] [B2W Digital]
+ * Copyright [2019] [Apache Software Foundation]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/engine-executor/src/test/scala/org/marvin/executor/actions/OnlineActionTest.scala b/engine-executor/src/test/scala/org/marvin/executor/actions/OnlineActionTest.scala
index d7f1f02..3d3053d 100644
--- a/engine-executor/src/test/scala/org/marvin/executor/actions/OnlineActionTest.scala
+++ b/engine-executor/src/test/scala/org/marvin/executor/actions/OnlineActionTest.scala
@@ -1,5 +1,5 @@
/*
- * Copyright [2017] [B2W Digital]
+ * Copyright [2019] [Apache Software Foundation]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/engine-executor/src/test/scala/org/marvin/executor/api/GenericAPITest.scala b/engine-executor/src/test/scala/org/marvin/executor/api/GenericAPITest.scala
index 33add0b..cc57fc6 100644
--- a/engine-executor/src/test/scala/org/marvin/executor/api/GenericAPITest.scala
+++ b/engine-executor/src/test/scala/org/marvin/executor/api/GenericAPITest.scala
@@ -1,5 +1,5 @@
/*
- * Copyright [2017] [B2W Digital]
+ * Copyright [2019] [Apache Software Foundation]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/engine-executor/src/test/scala/org/marvin/executor/manager/ExecutorManagerTest.scala b/engine-executor/src/test/scala/org/marvin/executor/manager/ExecutorManagerTest.scala
index f84cee3..cd256bc 100644
--- a/engine-executor/src/test/scala/org/marvin/executor/manager/ExecutorManagerTest.scala
+++ b/engine-executor/src/test/scala/org/marvin/executor/manager/ExecutorManagerTest.scala
@@ -1,5 +1,5 @@
/*
- * Copyright [2017] [B2W Digital]
+ * Copyright [2019] [Apache Software Foundation]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/engine-executor/src/test/scala/org/marvin/executor/statemachine/PredictorFSMTest.scala b/engine-executor/src/test/scala/org/marvin/executor/statemachine/PredictorFSMTest.scala
index 4a3022b..abcae87 100644
--- a/engine-executor/src/test/scala/org/marvin/executor/statemachine/PredictorFSMTest.scala
+++ b/engine-executor/src/test/scala/org/marvin/executor/statemachine/PredictorFSMTest.scala
@@ -1,5 +1,5 @@
/*
- * Copyright [2017] [B2W Digital]
+ * Copyright [2019] [Apache Software Foundation]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/engine-executor/src/test/scala/org/marvin/fixtures/MetadataMock.scala b/engine-executor/src/test/scala/org/marvin/fixtures/MetadataMock.scala
index 54f9f10..4a50908 100644
--- a/engine-executor/src/test/scala/org/marvin/fixtures/MetadataMock.scala
+++ b/engine-executor/src/test/scala/org/marvin/fixtures/MetadataMock.scala
@@ -1,5 +1,5 @@
/*
- * Copyright [2017] [B2W Digital]
+ * Copyright [2019] [Apache Software Foundation]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/engine-executor/src/test/scala/org/marvin/util/JsonUtilTest.scala b/engine-executor/src/test/scala/org/marvin/util/JsonUtilTest.scala
index 22eab76..8d4fff6 100644
--- a/engine-executor/src/test/scala/org/marvin/util/JsonUtilTest.scala
+++ b/engine-executor/src/test/scala/org/marvin/util/JsonUtilTest.scala
@@ -1,5 +1,5 @@
/*
- * Copyright [2017] [B2W Digital]
+ * Copyright [2019] [Apache Software Foundation]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/engine-executor/src/test/scala/org/marvin/util/LocalCacheTest.scala b/engine-executor/src/test/scala/org/marvin/util/LocalCacheTest.scala
index 71cbecf..4a146b6 100644
--- a/engine-executor/src/test/scala/org/marvin/util/LocalCacheTest.scala
+++ b/engine-executor/src/test/scala/org/marvin/util/LocalCacheTest.scala
@@ -1,5 +1,5 @@
/*
- * Copyright [2017] [B2W Digital]
+ * Copyright [2019] [Apache Software Foundation]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/engine-executor/src/test/scala/org/marvin/util/ProtocolUtilTest.scala b/engine-executor/src/test/scala/org/marvin/util/ProtocolUtilTest.scala
index b1d1d28..8fb808a 100644
--- a/engine-executor/src/test/scala/org/marvin/util/ProtocolUtilTest.scala
+++ b/engine-executor/src/test/scala/org/marvin/util/ProtocolUtilTest.scala
@@ -1,5 +1,5 @@
/*
- * Copyright [2017] [B2W Digital]
+ * Copyright [2019] [Apache Software Foundation]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/public-engines/image-classification-engine/Makefile b/public-engines/image-classification-engine/Makefile
index cfbedd5..0768697 100644
--- a/public-engines/image-classification-engine/Makefile
+++ b/public-engines/image-classification-engine/Makefile
@@ -1,4 +1,4 @@
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/public-engines/image-classification-engine/README.md b/public-engines/image-classification-engine/README.md
index 8fd12a1..4425eb1 100644
--- a/public-engines/image-classification-engine/README.md
+++ b/public-engines/image-classification-engine/README.md
@@ -42,4 +42,5 @@
### Contact
-danilo.nunes@b2wdigital.com
+name: danilo.nunes
+email: dev@marvin.apache.org
\ No newline at end of file
diff --git a/public-engines/image-classification-engine/docs.yaml b/public-engines/image-classification-engine/docs.yaml
index 676069a..ae0c71c 100644
--- a/public-engines/image-classification-engine/docs.yaml
+++ b/public-engines/image-classification-engine/docs.yaml
@@ -4,8 +4,8 @@
title: marvin_image_classification_engine API Doc
contact:
name: mantainer Daniel Takabayashi
- email: daniel.takabayashi@b2wdigital.com
- url:
+ email: dev@marvin.apache.org
+ url: https://marvin.apache.org
license:
name: Apache License 2.0
servers:
diff --git a/public-engines/image-classification-engine/htmlcov/marvin_image_classification_engine_prediction_feedback_py.html b/public-engines/image-classification-engine/htmlcov/marvin_image_classification_engine_prediction_feedback_py.html
index 3cfd58a..2c8c9db 100644
--- a/public-engines/image-classification-engine/htmlcov/marvin_image_classification_engine_prediction_feedback_py.html
+++ b/public-engines/image-classification-engine/htmlcov/marvin_image_classification_engine_prediction_feedback_py.html
@@ -117,7 +117,7 @@
<p id="t1" class="pln"><span class="com">#!/usr/bin/env python</span><span class="strut"> </span></p>
<p id="t2" class="pln"><span class="com"># coding=utf-8</span><span class="strut"> </span></p>
<p id="t3" class="pln"><span class="strut"> </span></p>
-<p id="t4" class="pln"><span class="com"># Copyright [2017] [B2W Digital]</span><span class="strut"> </span></p>
+<p id="t4" class="pln"><span class="com"># Copyright [2019] [Apache Software Foundation]</span><span class="strut"> </span></p>
<p id="t5" class="pln"><span class="com">#</span><span class="strut"> </span></p>
<p id="t6" class="pln"><span class="com"># Licensed under the Apache License, Version 2.0 (the "License");</span><span class="strut"> </span></p>
<p id="t7" class="pln"><span class="com"># you may not use this file except in compliance with the License.</span><span class="strut"> </span></p>
diff --git a/public-engines/image-classification-engine/marvin_image_classification_engine/prediction/feedback.py b/public-engines/image-classification-engine/marvin_image_classification_engine/prediction/feedback.py
index bed51c1..4f926b1 100644
--- a/public-engines/image-classification-engine/marvin_image_classification_engine/prediction/feedback.py
+++ b/public-engines/image-classification-engine/marvin_image_classification_engine/prediction/feedback.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/public-engines/image-classification-engine/setup.py b/public-engines/image-classification-engine/setup.py
index e028d22..8afc4fe 100644
--- a/public-engines/image-classification-engine/setup.py
+++ b/public-engines/image-classification-engine/setup.py
@@ -57,8 +57,8 @@
description='Image Classification',
long_description=open(join(dirname(__file__), 'README.md')).read(),
author='Marvin AI Researcher',
- maintainer='B2W Labs Team',
- maintainer_email='@b2wdigital.com',
+ maintainer='Apache Software Foundation',
+ maintainer_email='dev@marvin.apache.org',
packages=find_packages(exclude=('tests', 'tests.*')),
include_package_data=True,
zip_safe=False,
@@ -86,7 +86,7 @@
'tensorflow==1.3.0',
'h5py==2.7.1',
],
- dependency_links=['git+https://github.com/marvin-ai/marvin-python-toolbox.git/@master#egg=marvin_python_toolbox-0'],
+ dependency_links=['git+https://github.com/apache/incubator-marvin@master#subdirectory=python-toolbox#egg=marvin_python_toolbox-0'],
tests_require=REQUIREMENT_TESTS,
extras_require={
'testing': REQUIREMENT_TESTS,
diff --git a/public-engines/iris-species-engine/Makefile b/public-engines/iris-species-engine/Makefile
index 984ac42..0869661 100644
--- a/public-engines/iris-species-engine/Makefile
+++ b/public-engines/iris-species-engine/Makefile
@@ -1,4 +1,4 @@
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/public-engines/iris-species-engine/docs.yaml b/public-engines/iris-species-engine/docs.yaml
index 0d1116f..546d3ec 100644
--- a/public-engines/iris-species-engine/docs.yaml
+++ b/public-engines/iris-species-engine/docs.yaml
@@ -4,8 +4,8 @@
title: marvin_iris_species_engine API Doc
contact:
name: mantainer Daniel Takabayashi
- email: daniel.takabayashi@b2wdigital.com
- url: https://github.com/marvin-ai
+ email: dev@marvin.apache.org
+ url: https://marvin.apache.org
license:
name: Apache License 2.0
servers:
diff --git a/public-engines/iris-species-engine/marvin_iris_species_engine/prediction/feedback.py b/public-engines/iris-species-engine/marvin_iris_species_engine/prediction/feedback.py
index bed51c1..4f926b1 100644
--- a/public-engines/iris-species-engine/marvin_iris_species_engine/prediction/feedback.py
+++ b/public-engines/iris-species-engine/marvin_iris_species_engine/prediction/feedback.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/public-engines/iris-species-engine/setup.py b/public-engines/iris-species-engine/setup.py
index 2d86e4c..bd2da8a 100644
--- a/public-engines/iris-species-engine/setup.py
+++ b/public-engines/iris-species-engine/setup.py
@@ -58,7 +58,7 @@
long_description=open(join(dirname(__file__), 'README.md')).read(),
author='Marvin AI Researcher',
maintainer='Daniel Takabayashi',
- maintainer_email='daniel.takabayashi@gmail.com',
+ maintainer_email='dev@marvin.apache.org',
packages=find_packages(exclude=('tests', 'tests.*')),
include_package_data=True,
zip_safe=False,
@@ -83,7 +83,7 @@
'marvin-python-toolbox==0',
'seaborn==0.8.1'
],
- dependency_links=['git+https://github.com/marvin-ai/marvin-python-toolbox.git/@master#egg=marvin_python_toolbox-0'],
+ dependency_links=['git+https://github.com/apache/incubator-marvin@master#subdirectory=python-toolbox#egg=marvin_python_toolbox-0'],
tests_require=REQUIREMENT_TESTS,
extras_require={
'testing': REQUIREMENT_TESTS,
diff --git a/public-engines/kaggle-titanic-engine/Dockerfile b/public-engines/kaggle-titanic-engine/Dockerfile
index 3f7107d..4f0a31e 100644
--- a/public-engines/kaggle-titanic-engine/Dockerfile
+++ b/public-engines/kaggle-titanic-engine/Dockerfile
@@ -1,6 +1,7 @@
FROM ubuntu:16.04
-MAINTAINER jeremy.elster@b2wdigital.com
+MAINTAINER dev@marvin.apache.org
+LABEL authors="jeremy.elster"
ENV SLEEP_MILLIS 0
@@ -74,12 +75,6 @@
# spark configuration files to the think works correctly.
##############################################################
-# RUN curl https://d3kbcqa49mib13.cloudfront.net/spark-2.1.1-bin-hadoop2.6.tgz -o /tmp/spark-2.1.1-bin-hadoop2.6.tgz && \
-# tar -xf /tmp/spark-2.1.1-bin-hadoop2.6.tgz -C /opt/ && \
-# ln -s /opt/spark-2.1.1-bin-hadoop2.6 /opt/spark
-
-# Add the b2w datalake config for Spark
-# ADD spark-conf.tar $SPARK_CONF_DIR
RUN mkdir -p $SPARK_CONF_DIR
##############################################################
diff --git a/public-engines/kaggle-titanic-engine/docs.yaml b/public-engines/kaggle-titanic-engine/docs.yaml
index 993e8c8..2941f51 100644
--- a/public-engines/kaggle-titanic-engine/docs.yaml
+++ b/public-engines/kaggle-titanic-engine/docs.yaml
@@ -4,8 +4,8 @@
title: marvin_titanic_engine API Doc
contact:
name: mantainer jeremy.elster
- email: jeremy.elster@b2wdigital.com
- url: https://github.com/marvin-ai
+ email: dev@marvin.apache.org
+ url: https://marvin.apache.org
license:
name: Apache License 2.0
servers:
diff --git a/public-engines/kaggle-titanic-engine/marvin_titanic_engine/prediction/feedback.py b/public-engines/kaggle-titanic-engine/marvin_titanic_engine/prediction/feedback.py
index ca42364..085808b 100644
--- a/public-engines/kaggle-titanic-engine/marvin_titanic_engine/prediction/feedback.py
+++ b/public-engines/kaggle-titanic-engine/marvin_titanic_engine/prediction/feedback.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/public-engines/kaggle-titanic-engine/setup.py b/public-engines/kaggle-titanic-engine/setup.py
index 9a74b3f..04a7da1 100644
--- a/public-engines/kaggle-titanic-engine/setup.py
+++ b/public-engines/kaggle-titanic-engine/setup.py
@@ -58,8 +58,8 @@
description='a look at the kaggle data fr the titanic',
long_description=open(join(dirname(__file__), 'README.md')).read(),
author='jeremy.elster',
- maintainer='jeremy.elster',
- maintainer_email='jeremy.elster@b2wdigital.com',
+ maintainer='Apache Software Foundation',
+ maintainer_email='dev@marvin.apache.org',
packages=find_packages(exclude=('tests', 'tests.*')),
include_package_data=True,
zip_safe=False,
@@ -84,7 +84,7 @@
'marvin-python-toolbox==0',
'Fabric==1.14.0',
],
- dependency_links=['git+https://github.com/marvin-ai/marvin-python-toolbox.git/@master#egg=marvin_python_toolbox-0'],
+ dependency_links=['git+https://github.com/apache/incubator-marvin@master#subdirectory=python-toolbox#egg=marvin_python_toolbox-0'],
tests_require=REQUIREMENT_TESTS,
extras_require={
'testing': REQUIREMENT_TESTS,
diff --git a/public-engines/mnist-keras-engine/Dockerfile b/public-engines/mnist-keras-engine/Dockerfile
index 9ba1140..ed27aaf 100644
--- a/public-engines/mnist-keras-engine/Dockerfile
+++ b/public-engines/mnist-keras-engine/Dockerfile
@@ -1,6 +1,6 @@
FROM ubuntu:16.04
-MAINTAINER marvin-ai@googlegroups.com
+MAINTAINER dev@marvin.apache.org
ENV SLEEP_MILLIS 0
@@ -74,12 +74,6 @@
# spark configuration files to the think works correctly.
##############################################################
-# RUN curl https://d3kbcqa49mib13.cloudfront.net/spark-2.1.1-bin-hadoop2.6.tgz -o /tmp/spark-2.1.1-bin-hadoop2.6.tgz && \
-# tar -xf /tmp/spark-2.1.1-bin-hadoop2.6.tgz -C /opt/ && \
-# ln -s /opt/spark-2.1.1-bin-hadoop2.6 /opt/spark
-
-# Add the b2w datalake config for Spark
-# ADD spark-conf.tar $SPARK_CONF_DIR
RUN mkdir -p $SPARK_CONF_DIR
##############################################################
diff --git a/public-engines/mnist-keras-engine/docs.yaml b/public-engines/mnist-keras-engine/docs.yaml
index 6e5b065..7f42a05 100644
--- a/public-engines/mnist-keras-engine/docs.yaml
+++ b/public-engines/mnist-keras-engine/docs.yaml
@@ -4,8 +4,8 @@
title: marvin_mnist_keras_engine API Doc
contact:
name: mantainer Marvin AI Community
- email: marvin-ai@googlegroups.com
- url: https://github.com/marvin-ai
+ email: dev@marvin.apache.org
+ url: https://marvin.apache.org
license:
name: Apache License 2.0
servers:
diff --git a/public-engines/mnist-keras-engine/marvin_mnist_keras_engine/prediction/feedback.py b/public-engines/mnist-keras-engine/marvin_mnist_keras_engine/prediction/feedback.py
index ca42364..085808b 100644
--- a/public-engines/mnist-keras-engine/marvin_mnist_keras_engine/prediction/feedback.py
+++ b/public-engines/mnist-keras-engine/marvin_mnist_keras_engine/prediction/feedback.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/public-engines/mnist-keras-engine/setup.py b/public-engines/mnist-keras-engine/setup.py
index 5dab442..d846a35 100644
--- a/public-engines/mnist-keras-engine/setup.py
+++ b/public-engines/mnist-keras-engine/setup.py
@@ -59,7 +59,7 @@
long_description=open(join(dirname(__file__), 'README.md')).read(),
author='Marvin AI Community',
maintainer='Marvin AI Community',
- maintainer_email='marvin-ai@googlegroups.com',
+ maintainer_email='dev@marvin.apache.org',
packages=find_packages(exclude=('tests', 'tests.*')),
include_package_data=True,
zip_safe=False,
@@ -90,7 +90,7 @@
'pluggy==0.3.1',
'opencv-python==3.4.0.12'
],
- dependency_links=['git+https://github.com/marvin-ai/marvin-python-toolbox.git/@master#egg=marvin_python_toolbox-0'],
+ dependency_links=['git+https://github.com/apache/incubator-marvin@master#subdirectory=python-toolbox#egg=marvin_python_toolbox-0'],
tests_require=REQUIREMENT_TESTS,
extras_require={
'testing': REQUIREMENT_TESTS,
diff --git a/public-engines/nlp-ner-engine/Dockerfile b/public-engines/nlp-ner-engine/Dockerfile
index 8229e40..edcaba6 100644
--- a/public-engines/nlp-ner-engine/Dockerfile
+++ b/public-engines/nlp-ner-engine/Dockerfile
@@ -1,6 +1,6 @@
FROM ubuntu:16.04
-MAINTAINER marvin-ai@googlegroups.com
+MAINTAINER dev@marvin.apache.org
ENV SLEEP_MILLIS 0
@@ -74,12 +74,6 @@
# spark configuration files to the think works correctly.
##############################################################
-# RUN curl https://d3kbcqa49mib13.cloudfront.net/spark-2.1.1-bin-hadoop2.6.tgz -o /tmp/spark-2.1.1-bin-hadoop2.6.tgz && \
-# tar -xf /tmp/spark-2.1.1-bin-hadoop2.6.tgz -C /opt/ && \
-# ln -s /opt/spark-2.1.1-bin-hadoop2.6 /opt/spark
-
-# Add the b2w datalake config for Spark
-# ADD spark-conf.tar $SPARK_CONF_DIR
RUN mkdir -p $SPARK_CONF_DIR
##############################################################
diff --git a/public-engines/nlp-ner-engine/docs.yaml b/public-engines/nlp-ner-engine/docs.yaml
index c08d924..1b5062f 100644
--- a/public-engines/nlp-ner-engine/docs.yaml
+++ b/public-engines/nlp-ner-engine/docs.yaml
@@ -4,8 +4,8 @@
title: marvin_nlp_ner_engine API Doc
contact:
name: mantainer Marvin AI Community
- email: marvin-ai@googlegroups.com
- url: https://github.com/marvin-ai
+ email: dev@marvin.apache.org
+ url: https://marvin.apache.org
license:
name: Apache License 2.0
servers:
diff --git a/public-engines/nlp-ner-engine/marvin_nlp_ner_engine/prediction/feedback.py b/public-engines/nlp-ner-engine/marvin_nlp_ner_engine/prediction/feedback.py
index ca42364..085808b 100644
--- a/public-engines/nlp-ner-engine/marvin_nlp_ner_engine/prediction/feedback.py
+++ b/public-engines/nlp-ner-engine/marvin_nlp_ner_engine/prediction/feedback.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/public-engines/nlp-ner-engine/setup.py b/public-engines/nlp-ner-engine/setup.py
index 845e26d..8223d7b 100644
--- a/public-engines/nlp-ner-engine/setup.py
+++ b/public-engines/nlp-ner-engine/setup.py
@@ -75,7 +75,7 @@
'Programming Language :: Python :: 3.5',
'Topic :: Software Development :: Libraries :: Python Modules',
],
- dependency_links=['git+https://github.com/marvin-ai/marvin-python-toolbox.git/@master#egg=marvin_python_toolbox-0'],
+ dependency_links=['git+https://github.com/apache/incubator-marvin@master#subdirectory=python-toolbox#egg=marvin_python_toolbox-0'],
install_requires=[
'scikit-learn==0.18.2',
'scipy==0.19.1',
diff --git a/public-engines/product-classifier-engine/Dockerfile b/public-engines/product-classifier-engine/Dockerfile
index 9ba1140..ed27aaf 100644
--- a/public-engines/product-classifier-engine/Dockerfile
+++ b/public-engines/product-classifier-engine/Dockerfile
@@ -1,6 +1,6 @@
FROM ubuntu:16.04
-MAINTAINER marvin-ai@googlegroups.com
+MAINTAINER dev@marvin.apache.org
ENV SLEEP_MILLIS 0
@@ -74,12 +74,6 @@
# spark configuration files to the think works correctly.
##############################################################
-# RUN curl https://d3kbcqa49mib13.cloudfront.net/spark-2.1.1-bin-hadoop2.6.tgz -o /tmp/spark-2.1.1-bin-hadoop2.6.tgz && \
-# tar -xf /tmp/spark-2.1.1-bin-hadoop2.6.tgz -C /opt/ && \
-# ln -s /opt/spark-2.1.1-bin-hadoop2.6 /opt/spark
-
-# Add the b2w datalake config for Spark
-# ADD spark-conf.tar $SPARK_CONF_DIR
RUN mkdir -p $SPARK_CONF_DIR
##############################################################
diff --git a/public-engines/product-classifier-engine/docs.yaml b/public-engines/product-classifier-engine/docs.yaml
index 9e7e4ac..46ae8d6 100644
--- a/public-engines/product-classifier-engine/docs.yaml
+++ b/public-engines/product-classifier-engine/docs.yaml
@@ -4,8 +4,8 @@
title: marvin_product_classifier_engine API Doc
contact:
name: mantainer Marvin AI Community
- email: marvin-ai@googlegroups.com
- url: https://github.com/marvin-ai
+ email: dev@marvin.apache.org
+ url: https://marvin.apache.org
license:
name: Apache License 2.0
servers:
diff --git a/public-engines/product-classifier-engine/marvin_product_classifier_engine/prediction/feedback.py b/public-engines/product-classifier-engine/marvin_product_classifier_engine/prediction/feedback.py
index ca42364..085808b 100644
--- a/public-engines/product-classifier-engine/marvin_product_classifier_engine/prediction/feedback.py
+++ b/public-engines/product-classifier-engine/marvin_product_classifier_engine/prediction/feedback.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/public-engines/product-classifier-engine/setup.py b/public-engines/product-classifier-engine/setup.py
index 544dfac..1ad8daa 100644
--- a/public-engines/product-classifier-engine/setup.py
+++ b/public-engines/product-classifier-engine/setup.py
@@ -59,7 +59,7 @@
long_description=open(join(dirname(__file__), 'README.md')).read(),
author='Marvin AI Community',
maintainer='Marvin AI Community',
- maintainer_email='marvin-ai@googlegroups.com',
+ maintainer_email='dev@marvin.apache.org',
packages=find_packages(exclude=('tests', 'tests.*')),
include_package_data=True,
zip_safe=False,
@@ -84,7 +84,7 @@
'marvin-python-toolbox==0',
'Fabric==1.14.0',
],
- dependency_links=['git+https://github.com/marvin-ai/marvin-python-toolbox.git/@master#egg=marvin_python_toolbox-0'],
+ dependency_links=['git+https://github.com/apache/incubator-marvin@master#subdirectory=python-toolbox#egg=marvin_python_toolbox-0'],
tests_require=REQUIREMENT_TESTS,
extras_require={
'testing': REQUIREMENT_TESTS,
diff --git a/public-engines/sample-engine/Makefile b/public-engines/sample-engine/Makefile
index e18ffb8..396df8d 100644
--- a/public-engines/sample-engine/Makefile
+++ b/public-engines/sample-engine/Makefile
@@ -1,4 +1,4 @@
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/public-engines/sample-engine/marvin_sample_engine/__init__.py b/public-engines/sample-engine/marvin_sample_engine/__init__.py
index e073afc..b209757 100644
--- a/public-engines/sample-engine/marvin_sample_engine/__init__.py
+++ b/public-engines/sample-engine/marvin_sample_engine/__init__.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/public-engines/sample-engine/marvin_sample_engine/_compatibility.py b/public-engines/sample-engine/marvin_sample_engine/_compatibility.py
index 4414bd1..caa3fab 100644
--- a/public-engines/sample-engine/marvin_sample_engine/_compatibility.py
+++ b/public-engines/sample-engine/marvin_sample_engine/_compatibility.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/public-engines/sample-engine/marvin_sample_engine/_logging.py b/public-engines/sample-engine/marvin_sample_engine/_logging.py
index 2a63460..2944beb 100644
--- a/public-engines/sample-engine/marvin_sample_engine/_logging.py
+++ b/public-engines/sample-engine/marvin_sample_engine/_logging.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/public-engines/sample-engine/marvin_sample_engine/data_handler/__init__.py b/public-engines/sample-engine/marvin_sample_engine/data_handler/__init__.py
index 79b921b..084bf14 100644
--- a/public-engines/sample-engine/marvin_sample_engine/data_handler/__init__.py
+++ b/public-engines/sample-engine/marvin_sample_engine/data_handler/__init__.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/public-engines/sample-engine/marvin_sample_engine/data_handler/acquisitor_and_cleaner.py b/public-engines/sample-engine/marvin_sample_engine/data_handler/acquisitor_and_cleaner.py
index 8ac2381..50a7555 100644
--- a/public-engines/sample-engine/marvin_sample_engine/data_handler/acquisitor_and_cleaner.py
+++ b/public-engines/sample-engine/marvin_sample_engine/data_handler/acquisitor_and_cleaner.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/public-engines/sample-engine/marvin_sample_engine/data_handler/training_preparator.py b/public-engines/sample-engine/marvin_sample_engine/data_handler/training_preparator.py
index 8d2e878..f0ebb2b 100644
--- a/public-engines/sample-engine/marvin_sample_engine/data_handler/training_preparator.py
+++ b/public-engines/sample-engine/marvin_sample_engine/data_handler/training_preparator.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/public-engines/sample-engine/marvin_sample_engine/prediction/__init__.py b/public-engines/sample-engine/marvin_sample_engine/prediction/__init__.py
index fddd35e..89f2380 100644
--- a/public-engines/sample-engine/marvin_sample_engine/prediction/__init__.py
+++ b/public-engines/sample-engine/marvin_sample_engine/prediction/__init__.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/public-engines/sample-engine/marvin_sample_engine/prediction/prediction_preparator.py b/public-engines/sample-engine/marvin_sample_engine/prediction/prediction_preparator.py
index 2076ef1..3c1e602 100644
--- a/public-engines/sample-engine/marvin_sample_engine/prediction/prediction_preparator.py
+++ b/public-engines/sample-engine/marvin_sample_engine/prediction/prediction_preparator.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/public-engines/sample-engine/marvin_sample_engine/prediction/predictor.py b/public-engines/sample-engine/marvin_sample_engine/prediction/predictor.py
index 17c23a3..00f2991 100644
--- a/public-engines/sample-engine/marvin_sample_engine/prediction/predictor.py
+++ b/public-engines/sample-engine/marvin_sample_engine/prediction/predictor.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/public-engines/sample-engine/marvin_sample_engine/training/__init__.py b/public-engines/sample-engine/marvin_sample_engine/training/__init__.py
index 804382b..8bda353 100644
--- a/public-engines/sample-engine/marvin_sample_engine/training/__init__.py
+++ b/public-engines/sample-engine/marvin_sample_engine/training/__init__.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/public-engines/sample-engine/marvin_sample_engine/training/metrics_evaluator.py b/public-engines/sample-engine/marvin_sample_engine/training/metrics_evaluator.py
index bb19159..5abca15 100644
--- a/public-engines/sample-engine/marvin_sample_engine/training/metrics_evaluator.py
+++ b/public-engines/sample-engine/marvin_sample_engine/training/metrics_evaluator.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/public-engines/sample-engine/marvin_sample_engine/training/trainer.py b/public-engines/sample-engine/marvin_sample_engine/training/trainer.py
index 4abb1f9..e8e80a4 100644
--- a/public-engines/sample-engine/marvin_sample_engine/training/trainer.py
+++ b/public-engines/sample-engine/marvin_sample_engine/training/trainer.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/public-engines/sample-engine/setup.py b/public-engines/sample-engine/setup.py
index 91f84c1..dd5742c 100644
--- a/public-engines/sample-engine/setup.py
+++ b/public-engines/sample-engine/setup.py
@@ -1,5 +1,5 @@
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -64,8 +64,8 @@
description='Marvin engine',
long_description=open(join(dirname(__file__), 'README.md')).read(),
author='Marvin AI Researcher',
- maintainer='B2W Labs Team',
- maintainer_email='@b2wdigital.com',
+ maintainer='Apache Software Foundation',
+ maintainer_email='dev@marvin.apache.org',
packages=find_packages(exclude=('tests', 'tests.*')),
include_package_data=True,
zip_safe=False,
@@ -90,7 +90,7 @@
'matplotlib==2.0.2',
'marvin-python-toolbox==0',
],
- dependency_links=['git+https://github.com/marvin-ai/marvin-python-toolbox.git/@master#egg=marvin_python_toolbox-0'],
+ dependency_links=['git+https://github.com/apache/incubator-marvin@master#subdirectory=python-toolbox#egg=marvin_python_toolbox-0'],
tests_require=[
'pytest>=2.6.4',
'pytest-cov>=1.8.1',
diff --git a/public-engines/sample-engine/tests/conftest.py b/public-engines/sample-engine/tests/conftest.py
index 88fdff1..0817cc5 100644
--- a/public-engines/sample-engine/tests/conftest.py
+++ b/public-engines/sample-engine/tests/conftest.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/public-engines/sample-engine/tests/data_handler/test_acquisitor_and_cleaner.py b/public-engines/sample-engine/tests/data_handler/test_acquisitor_and_cleaner.py
index 894f70c..0137c2a 100644
--- a/public-engines/sample-engine/tests/data_handler/test_acquisitor_and_cleaner.py
+++ b/public-engines/sample-engine/tests/data_handler/test_acquisitor_and_cleaner.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/public-engines/sample-engine/tests/data_handler/test_training_preparator.py b/public-engines/sample-engine/tests/data_handler/test_training_preparator.py
index a547441..d7b13bf 100644
--- a/public-engines/sample-engine/tests/data_handler/test_training_preparator.py
+++ b/public-engines/sample-engine/tests/data_handler/test_training_preparator.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/public-engines/sample-engine/tests/prediction/test_prediction_preparator.py b/public-engines/sample-engine/tests/prediction/test_prediction_preparator.py
index 500f2d1..8db7075 100644
--- a/public-engines/sample-engine/tests/prediction/test_prediction_preparator.py
+++ b/public-engines/sample-engine/tests/prediction/test_prediction_preparator.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/public-engines/sample-engine/tests/prediction/test_predictor.py b/public-engines/sample-engine/tests/prediction/test_predictor.py
index ae0c10b..f83ed62 100644
--- a/public-engines/sample-engine/tests/prediction/test_predictor.py
+++ b/public-engines/sample-engine/tests/prediction/test_predictor.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/public-engines/sample-engine/tests/training/test_metrics_evaluator.py b/public-engines/sample-engine/tests/training/test_metrics_evaluator.py
index a79a516..628ed7c 100644
--- a/public-engines/sample-engine/tests/training/test_metrics_evaluator.py
+++ b/public-engines/sample-engine/tests/training/test_metrics_evaluator.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/public-engines/sample-engine/tests/training/test_trainer.py b/public-engines/sample-engine/tests/training/test_trainer.py
index 1acfeef..1e5c6e5 100644
--- a/public-engines/sample-engine/tests/training/test_trainer.py
+++ b/public-engines/sample-engine/tests/training/test_trainer.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/public-engines/sms-spam-engine/Dockerfile b/public-engines/sms-spam-engine/Dockerfile
index 9ba1140..ed27aaf 100644
--- a/public-engines/sms-spam-engine/Dockerfile
+++ b/public-engines/sms-spam-engine/Dockerfile
@@ -1,6 +1,6 @@
FROM ubuntu:16.04
-MAINTAINER marvin-ai@googlegroups.com
+MAINTAINER dev@marvin.apache.org
ENV SLEEP_MILLIS 0
@@ -74,12 +74,6 @@
# spark configuration files to the think works correctly.
##############################################################
-# RUN curl https://d3kbcqa49mib13.cloudfront.net/spark-2.1.1-bin-hadoop2.6.tgz -o /tmp/spark-2.1.1-bin-hadoop2.6.tgz && \
-# tar -xf /tmp/spark-2.1.1-bin-hadoop2.6.tgz -C /opt/ && \
-# ln -s /opt/spark-2.1.1-bin-hadoop2.6 /opt/spark
-
-# Add the b2w datalake config for Spark
-# ADD spark-conf.tar $SPARK_CONF_DIR
RUN mkdir -p $SPARK_CONF_DIR
##############################################################
diff --git a/public-engines/sms-spam-engine/docs.yaml b/public-engines/sms-spam-engine/docs.yaml
index 1470529..b9630fd 100644
--- a/public-engines/sms-spam-engine/docs.yaml
+++ b/public-engines/sms-spam-engine/docs.yaml
@@ -4,8 +4,8 @@
title: marvin_sms_spam_engine API Doc
contact:
name: mantainer Marvin AI Community
- email: marvin-ai@googlegroups.com
- url: https://github.com/marvin-ai
+ email: dev@marvin.apache.org
+ url: https://marvin.apache.org
license:
name: Apache License 2.0
servers:
diff --git a/public-engines/sms-spam-engine/marvin_sms_spam_engine/prediction/feedback.py b/public-engines/sms-spam-engine/marvin_sms_spam_engine/prediction/feedback.py
index d7a0ea6..c47bfff 100644
--- a/public-engines/sms-spam-engine/marvin_sms_spam_engine/prediction/feedback.py
+++ b/public-engines/sms-spam-engine/marvin_sms_spam_engine/prediction/feedback.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/public-engines/sms-spam-engine/setup.py b/public-engines/sms-spam-engine/setup.py
index a43196f..38dcbed 100644
--- a/public-engines/sms-spam-engine/setup.py
+++ b/public-engines/sms-spam-engine/setup.py
@@ -59,7 +59,7 @@
long_description=open(join(dirname(__file__), 'README.md')).read(),
author='Marvin AI Community',
maintainer='Marvin AI Community',
- maintainer_email='marvin-ai@googlegroups.com',
+ maintainer_email='dev@marvin.apache.org',
packages=find_packages(exclude=('tests', 'tests.*')),
include_package_data=True,
zip_safe=False,
@@ -84,7 +84,7 @@
'marvin-python-toolbox==0',
'Fabric==1.14.0',
],
- dependency_links=['git+https://github.com/marvin-ai/marvin-python-toolbox.git/@master#egg=marvin_python_toolbox-0'],
+ dependency_links=['git+https://github.com/apache/incubator-marvin@master#subdirectory=python-toolbox#egg=marvin_python_toolbox-0'],
tests_require=REQUIREMENT_TESTS,
extras_require={
'testing': REQUIREMENT_TESTS,
diff --git a/python-toolbox/.dev b/python-toolbox/.dev
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/python-toolbox/.dev
diff --git a/python-toolbox/.gitignore b/python-toolbox/.gitignore
index 7f355d0..5b5eb4a 100644
--- a/python-toolbox/.gitignore
+++ b/python-toolbox/.gitignore
@@ -16,3 +16,4 @@
python-toolbox
.profiling
dist
+.dev
diff --git a/python-toolbox/CODE_OF_CONDUCT.md b/python-toolbox/CODE_OF_CONDUCT.md
index 72ec3a7..d1ea5fa 100644
--- a/python-toolbox/CODE_OF_CONDUCT.md
+++ b/python-toolbox/CODE_OF_CONDUCT.md
@@ -34,7 +34,7 @@
## Enforcement
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at marvin-ai@googlegroups.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at dev@marvin.apache.org. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
diff --git a/python-toolbox/Makefile b/python-toolbox/Makefile
index 060af38..d0417d4 100644
--- a/python-toolbox/Makefile
+++ b/python-toolbox/Makefile
@@ -1,4 +1,4 @@
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/NOTICE b/python-toolbox/NOTICE
index bf5c89e..45cc502 100644
--- a/python-toolbox/NOTICE
+++ b/python-toolbox/NOTICE
@@ -1,5 +1,5 @@
Marvin Artifical Intelligence Platform
-Copyright 2017 B2W Digital
+Copyright 2019 Apache Software Foundation
This product includes software developed at
-B2W Digital (http://www.b2w.digital)
\ No newline at end of file
+Apache Software Foundation https://www.apache.org/
\ No newline at end of file
diff --git a/python-toolbox/PULL_REQUEST_TEMPLATE.md b/python-toolbox/PULL_REQUEST_TEMPLATE.md
index 0334db7..82eda38 100644
--- a/python-toolbox/PULL_REQUEST_TEMPLATE.md
+++ b/python-toolbox/PULL_REQUEST_TEMPLATE.md
@@ -14,4 +14,4 @@
-
-
-@marvin-ai/marvin-core-team
+dev@marvin.apache.org
diff --git a/python-toolbox/README.md b/python-toolbox/README.md
index 6c18015..ef81a72 100644
--- a/python-toolbox/README.md
+++ b/python-toolbox/README.md
@@ -1,4 +1,4 @@
-[](https://travis-ci.org/marvin-ai/marvin-python-toolbox) [](https://codecov.io/gh/marvin-ai/marvin-python-toolbox)
+[](https://travis-ci.org/apache/incubator-marvin) [](https://codecov.io/gh/apache/incubator-marvin/branch/develop)
# Marvin Toolbox v0.0.5
@@ -92,7 +92,8 @@
1. Clone the example engine from the repository
```
-git clone https://github.com/marvin-ai/engines.git
+git clone https://github.com/apache/incubator-marvin.git
+cd public-engines
```
2. Generate a new Marvin engine environment for the Iris species engine
diff --git a/python-toolbox/bin/marvin b/python-toolbox/bin/marvin
index 80c2f6a..ac87ad5 100644
--- a/python-toolbox/bin/marvin
+++ b/python-toolbox/bin/marvin
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/marvin_python_toolbox/__init__.py b/python-toolbox/marvin_python_toolbox/__init__.py
index cdde2f0..9ba50c3 100644
--- a/python-toolbox/marvin_python_toolbox/__init__.py
+++ b/python-toolbox/marvin_python_toolbox/__init__.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/marvin_python_toolbox/_compatibility.py b/python-toolbox/marvin_python_toolbox/_compatibility.py
index c796f4e..0e4e321 100644
--- a/python-toolbox/marvin_python_toolbox/_compatibility.py
+++ b/python-toolbox/marvin_python_toolbox/_compatibility.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/marvin_python_toolbox/_logging.py b/python-toolbox/marvin_python_toolbox/_logging.py
index 45635a8..ed999de 100644
--- a/python-toolbox/marvin_python_toolbox/_logging.py
+++ b/python-toolbox/marvin_python_toolbox/_logging.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/marvin_python_toolbox/common/__init__.py b/python-toolbox/marvin_python_toolbox/common/__init__.py
index ba979d3..efb0a92 100644
--- a/python-toolbox/marvin_python_toolbox/common/__init__.py
+++ b/python-toolbox/marvin_python_toolbox/common/__init__.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/marvin_python_toolbox/common/config.py b/python-toolbox/marvin_python_toolbox/common/config.py
index c91bfd5..9aa86c2 100644
--- a/python-toolbox/marvin_python_toolbox/common/config.py
+++ b/python-toolbox/marvin_python_toolbox/common/config.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/marvin_python_toolbox/common/data.py b/python-toolbox/marvin_python_toolbox/common/data.py
index d86bd5b..12b905a 100644
--- a/python-toolbox/marvin_python_toolbox/common/data.py
+++ b/python-toolbox/marvin_python_toolbox/common/data.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/marvin_python_toolbox/common/data_source_provider.py b/python-toolbox/marvin_python_toolbox/common/data_source_provider.py
index 2a2e78e..17f982b 100644
--- a/python-toolbox/marvin_python_toolbox/common/data_source_provider.py
+++ b/python-toolbox/marvin_python_toolbox/common/data_source_provider.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/marvin_python_toolbox/common/exceptions.py b/python-toolbox/marvin_python_toolbox/common/exceptions.py
index 309f21e..3801298 100644
--- a/python-toolbox/marvin_python_toolbox/common/exceptions.py
+++ b/python-toolbox/marvin_python_toolbox/common/exceptions.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/marvin_python_toolbox/common/http_client.py b/python-toolbox/marvin_python_toolbox/common/http_client.py
index a198c04..ad73f49 100644
--- a/python-toolbox/marvin_python_toolbox/common/http_client.py
+++ b/python-toolbox/marvin_python_toolbox/common/http_client.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/marvin_python_toolbox/common/profiling.py b/python-toolbox/marvin_python_toolbox/common/profiling.py
index 1ed4e6b..5528427 100644
--- a/python-toolbox/marvin_python_toolbox/common/profiling.py
+++ b/python-toolbox/marvin_python_toolbox/common/profiling.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/marvin_python_toolbox/common/utils.py b/python-toolbox/marvin_python_toolbox/common/utils.py
index 3799d61..9979f65 100644
--- a/python-toolbox/marvin_python_toolbox/common/utils.py
+++ b/python-toolbox/marvin_python_toolbox/common/utils.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/marvin_python_toolbox/config.py b/python-toolbox/marvin_python_toolbox/config.py
index 99654c8..025ad3d 100644
--- a/python-toolbox/marvin_python_toolbox/config.py
+++ b/python-toolbox/marvin_python_toolbox/config.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/marvin_python_toolbox/decorators.py b/python-toolbox/marvin_python_toolbox/decorators.py
index 976b4a2..fab885e 100644
--- a/python-toolbox/marvin_python_toolbox/decorators.py
+++ b/python-toolbox/marvin_python_toolbox/decorators.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/marvin_python_toolbox/engine_base/__init__.py b/python-toolbox/marvin_python_toolbox/engine_base/__init__.py
index 2fc12f0..70dd9f9 100644
--- a/python-toolbox/marvin_python_toolbox/engine_base/__init__.py
+++ b/python-toolbox/marvin_python_toolbox/engine_base/__init__.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/marvin_python_toolbox/engine_base/engine_base_action.py b/python-toolbox/marvin_python_toolbox/engine_base/engine_base_action.py
index fcabdb1..bb2eda1 100644
--- a/python-toolbox/marvin_python_toolbox/engine_base/engine_base_action.py
+++ b/python-toolbox/marvin_python_toolbox/engine_base/engine_base_action.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/marvin_python_toolbox/engine_base/engine_base_data_handler.py b/python-toolbox/marvin_python_toolbox/engine_base/engine_base_data_handler.py
index df0a011..3c798fb 100644
--- a/python-toolbox/marvin_python_toolbox/engine_base/engine_base_data_handler.py
+++ b/python-toolbox/marvin_python_toolbox/engine_base/engine_base_data_handler.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/marvin_python_toolbox/engine_base/engine_base_prediction.py b/python-toolbox/marvin_python_toolbox/engine_base/engine_base_prediction.py
index 1761c3b..af27228 100644
--- a/python-toolbox/marvin_python_toolbox/engine_base/engine_base_prediction.py
+++ b/python-toolbox/marvin_python_toolbox/engine_base/engine_base_prediction.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/marvin_python_toolbox/engine_base/engine_base_training.py b/python-toolbox/marvin_python_toolbox/engine_base/engine_base_training.py
index 7df7d9f..5ff8e84 100644
--- a/python-toolbox/marvin_python_toolbox/engine_base/engine_base_training.py
+++ b/python-toolbox/marvin_python_toolbox/engine_base/engine_base_training.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/marvin_python_toolbox/engine_base/protos/actions.proto b/python-toolbox/marvin_python_toolbox/engine_base/protos/actions.proto
index 4ab7f60..4a63daf 100644
--- a/python-toolbox/marvin_python_toolbox/engine_base/protos/actions.proto
+++ b/python-toolbox/marvin_python_toolbox/engine_base/protos/actions.proto
@@ -1,4 +1,4 @@
-/** Copyright [2017] [B2W Digital]
+/** Copyright [2019] [Apache Software Foundation]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/python-toolbox/marvin_python_toolbox/engine_base/serializers/__init__.py b/python-toolbox/marvin_python_toolbox/engine_base/serializers/__init__.py
index 73f7796..eef28de 100644
--- a/python-toolbox/marvin_python_toolbox/engine_base/serializers/__init__.py
+++ b/python-toolbox/marvin_python_toolbox/engine_base/serializers/__init__.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/marvin_python_toolbox/engine_base/serializers/keras_serializer.py b/python-toolbox/marvin_python_toolbox/engine_base/serializers/keras_serializer.py
index 1407960..467d573 100644
--- a/python-toolbox/marvin_python_toolbox/engine_base/serializers/keras_serializer.py
+++ b/python-toolbox/marvin_python_toolbox/engine_base/serializers/keras_serializer.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/marvin_python_toolbox/engine_base/stubs/__init__.py b/python-toolbox/marvin_python_toolbox/engine_base/stubs/__init__.py
index 613c8bc..1ede8e4 100644
--- a/python-toolbox/marvin_python_toolbox/engine_base/stubs/__init__.py
+++ b/python-toolbox/marvin_python_toolbox/engine_base/stubs/__init__.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/marvin_python_toolbox/extras/notebook_extensions/jupyter_notebook_config.py b/python-toolbox/marvin_python_toolbox/extras/notebook_extensions/jupyter_notebook_config.py
index b5f7de0..5b44b9a 100644
--- a/python-toolbox/marvin_python_toolbox/extras/notebook_extensions/jupyter_notebook_config.py
+++ b/python-toolbox/marvin_python_toolbox/extras/notebook_extensions/jupyter_notebook_config.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/marvin_python_toolbox/extras/notebook_extensions/main.js b/python-toolbox/marvin_python_toolbox/extras/notebook_extensions/main.js
index dea722b..efcc59b 100644
--- a/python-toolbox/marvin_python_toolbox/extras/notebook_extensions/main.js
+++ b/python-toolbox/marvin_python_toolbox/extras/notebook_extensions/main.js
@@ -1,4 +1,4 @@
-// Copyright [2017] [B2W Digital]
+// Copyright [2019] [Apache Software Foundation]
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/python-toolbox/marvin_python_toolbox/loader.py b/python-toolbox/marvin_python_toolbox/loader.py
index 7e54db3..e82be7a 100644
--- a/python-toolbox/marvin_python_toolbox/loader.py
+++ b/python-toolbox/marvin_python_toolbox/loader.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/marvin_python_toolbox/manage.py b/python-toolbox/marvin_python_toolbox/manage.py
index 2fc817a..753794f 100644
--- a/python-toolbox/marvin_python_toolbox/manage.py
+++ b/python-toolbox/marvin_python_toolbox/manage.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/marvin_python_toolbox/management/__init__.py b/python-toolbox/marvin_python_toolbox/management/__init__.py
index a4ce0ca..8e3cb04 100644
--- a/python-toolbox/marvin_python_toolbox/management/__init__.py
+++ b/python-toolbox/marvin_python_toolbox/management/__init__.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/marvin_python_toolbox/management/engine.py b/python-toolbox/marvin_python_toolbox/management/engine.py
index f15dbeb..5930f78 100644
--- a/python-toolbox/marvin_python_toolbox/management/engine.py
+++ b/python-toolbox/marvin_python_toolbox/management/engine.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -368,7 +368,7 @@
@click.option('--name', '-n', prompt='Project name', help='Project name')
@click.option('--description', '-d', prompt='Short description', default='Marvin engine', help='Library short description')
@click.option('--mantainer', '-m', prompt='Mantainer name', default='Marvin AI Community', help='Mantainer name')
-@click.option('--email', '-e', prompt='Mantainer email', default='marvin-ai@googlegroups.com', help='Mantainer email')
+@click.option('--email', '-e', prompt='Mantainer email', default='dev@marvin.apache.org', help='Mantainer email')
@click.option('--package', '-p', default='', help='Package name')
@click.option('--dest', '-d', envvar='MARVIN_HOME', type=click.Path(exists=True), help='Root folder path for the creation')
@click.option('--no-env', is_flag=True, default=False, help='Don\'t create the virtual enviroment')
diff --git a/python-toolbox/marvin_python_toolbox/management/hive.py b/python-toolbox/marvin_python_toolbox/management/hive.py
index b137846..3d828b2 100644
--- a/python-toolbox/marvin_python_toolbox/management/hive.py
+++ b/python-toolbox/marvin_python_toolbox/management/hive.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/marvin_python_toolbox/management/notebook.py b/python-toolbox/marvin_python_toolbox/management/notebook.py
index eb4e761..3e748d2 100644
--- a/python-toolbox/marvin_python_toolbox/management/notebook.py
+++ b/python-toolbox/marvin_python_toolbox/management/notebook.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/marvin_python_toolbox/management/pkg.py b/python-toolbox/marvin_python_toolbox/management/pkg.py
index d126f68..a283390 100644
--- a/python-toolbox/marvin_python_toolbox/management/pkg.py
+++ b/python-toolbox/marvin_python_toolbox/management/pkg.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/marvin_python_toolbox/management/templates/python-engine/Dockerfile b/python-toolbox/marvin_python_toolbox/management/templates/python-engine/Dockerfile
index 08deb81..bb77140 100644
--- a/python-toolbox/marvin_python_toolbox/management/templates/python-engine/Dockerfile
+++ b/python-toolbox/marvin_python_toolbox/management/templates/python-engine/Dockerfile
@@ -74,12 +74,6 @@
# spark configuration files to the think works correctly.
##############################################################
-# RUN curl https://d3kbcqa49mib13.cloudfront.net/spark-2.1.1-bin-hadoop2.6.tgz -o /tmp/spark-2.1.1-bin-hadoop2.6.tgz && \
-# tar -xf /tmp/spark-2.1.1-bin-hadoop2.6.tgz -C /opt/ && \
-# ln -s /opt/spark-2.1.1-bin-hadoop2.6 /opt/spark
-
-# Add the b2w datalake config for Spark
-# ADD spark-conf.tar $SPARK_CONF_DIR
RUN mkdir -p $SPARK_CONF_DIR
##############################################################
diff --git a/python-toolbox/marvin_python_toolbox/management/templates/python-engine/Makefile b/python-toolbox/marvin_python_toolbox/management/templates/python-engine/Makefile
index ba3aac7..e734143 100644
--- a/python-toolbox/marvin_python_toolbox/management/templates/python-engine/Makefile
+++ b/python-toolbox/marvin_python_toolbox/management/templates/python-engine/Makefile
@@ -31,15 +31,15 @@
@echo " Runs the docker run command with marvin env default parameters."
marvin:
- pip install -e ".[testing]" --process-dependency-links
+ pip install -e ".[testing]"
marvin --help
marvin-prod:
- pip install . --process-dependency-links
+ pip install .
marvin --help
update:
- pip install -e . -U --process-dependency-links
+ pip install -e . -U
clean-pyc:
find . -name '*.pyc' -exec rm -f {} +
diff --git a/python-toolbox/marvin_python_toolbox/management/templates/python-engine/docs.yaml b/python-toolbox/marvin_python_toolbox/management/templates/python-engine/docs.yaml
index 6983f8d..d701870 100644
--- a/python-toolbox/marvin_python_toolbox/management/templates/python-engine/docs.yaml
+++ b/python-toolbox/marvin_python_toolbox/management/templates/python-engine/docs.yaml
@@ -5,7 +5,7 @@
contact:
name: mantainer {{mantainer.name}}
email: {{mantainer.email}}
- url: https://github.com/marvin-ai
+ url: https://marvin.apache.org
license:
name: Apache License 2.0
servers:
diff --git a/python-toolbox/marvin_python_toolbox/management/templates/python-engine/project_package/prediction/feedback.py b/python-toolbox/marvin_python_toolbox/management/templates/python-engine/project_package/prediction/feedback.py
index d7a0ea6..c47bfff 100644
--- a/python-toolbox/marvin_python_toolbox/management/templates/python-engine/project_package/prediction/feedback.py
+++ b/python-toolbox/marvin_python_toolbox/management/templates/python-engine/project_package/prediction/feedback.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/marvin_python_toolbox/management/test.py b/python-toolbox/marvin_python_toolbox/management/test.py
index 741e4af..0f837a5 100644
--- a/python-toolbox/marvin_python_toolbox/management/test.py
+++ b/python-toolbox/marvin_python_toolbox/management/test.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/setup.py b/python-toolbox/setup.py
index 15ab5d1..29c479c 100644
--- a/python-toolbox/setup.py
+++ b/python-toolbox/setup.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -25,12 +25,12 @@
# Package basic info
PACKAGE_NAME = 'marvin_python_toolbox'
-PACKAGE_DESCRIPTION = 'Marvin Python Toolbox'
+PACKAGE_DESCRIPTION = 'Apache Marvin Python Toolbox'
-URL = 'https://github.com/marvin-ai/marvin-python-toolbox'
+URL = 'https://github.com/apache/incubator-marvin'
AUTHOR_NAME = 'Daniel Takabayashi'
-AUTHOR_EMAIL = 'daniel.takabayashi@gmail.com'
+AUTHOR_EMAIL = 'dev@marvin.apache.org'
PYTHON_2 = True
PYTHON_3 = True
@@ -77,7 +77,8 @@
'joblib>=0.11',
'autopep8>=1.3.3',
'progressbar2>=3.34.3',
- 'urllib3>=1.21.1',
+ 'urllib3==1.21.1',
+ 'unidecode==1.0.23',
'idna>=2.5',
'bleach>=1.5.0',
'numpy>=1.16.2',
diff --git a/python-toolbox/tests/common/test_config.py b/python-toolbox/tests/common/test_config.py
index 6cdcda5..5baf001 100644
--- a/python-toolbox/tests/common/test_config.py
+++ b/python-toolbox/tests/common/test_config.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/tests/common/test_data.py b/python-toolbox/tests/common/test_data.py
index c244e81..99b34ef 100644
--- a/python-toolbox/tests/common/test_data.py
+++ b/python-toolbox/tests/common/test_data.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/tests/common/test_data_source_provider.py b/python-toolbox/tests/common/test_data_source_provider.py
index ff5bce7..08a7633 100644
--- a/python-toolbox/tests/common/test_data_source_provider.py
+++ b/python-toolbox/tests/common/test_data_source_provider.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/tests/common/test_http_client.py b/python-toolbox/tests/common/test_http_client.py
index 2b92844..10971eb 100644
--- a/python-toolbox/tests/common/test_http_client.py
+++ b/python-toolbox/tests/common/test_http_client.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/tests/common/test_profiling.py b/python-toolbox/tests/common/test_profiling.py
index 62088ab..9ff5fc1 100644
--- a/python-toolbox/tests/common/test_profiling.py
+++ b/python-toolbox/tests/common/test_profiling.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/tests/common/test_utils.py b/python-toolbox/tests/common/test_utils.py
index 5845811..2bd0af4 100644
--- a/python-toolbox/tests/common/test_utils.py
+++ b/python-toolbox/tests/common/test_utils.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/tests/conftest.py b/python-toolbox/tests/conftest.py
index 30a578a..ebed059 100644
--- a/python-toolbox/tests/conftest.py
+++ b/python-toolbox/tests/conftest.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/tests/engine_base/serializers/test_keras_serializer.py b/python-toolbox/tests/engine_base/serializers/test_keras_serializer.py
index 7cd42cc..4b53983 100644
--- a/python-toolbox/tests/engine_base/serializers/test_keras_serializer.py
+++ b/python-toolbox/tests/engine_base/serializers/test_keras_serializer.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/tests/engine_base/test_engine_base_action.py b/python-toolbox/tests/engine_base/test_engine_base_action.py
index 3ac5647..b4d2010 100644
--- a/python-toolbox/tests/engine_base/test_engine_base_action.py
+++ b/python-toolbox/tests/engine_base/test_engine_base_action.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/tests/engine_base/test_engine_base_data_handler.py b/python-toolbox/tests/engine_base/test_engine_base_data_handler.py
index e89e8cb..03c1648 100644
--- a/python-toolbox/tests/engine_base/test_engine_base_data_handler.py
+++ b/python-toolbox/tests/engine_base/test_engine_base_data_handler.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/tests/engine_base/test_engine_base_prediction.py b/python-toolbox/tests/engine_base/test_engine_base_prediction.py
index 4e3c3fe..2a9d5e0 100644
--- a/python-toolbox/tests/engine_base/test_engine_base_prediction.py
+++ b/python-toolbox/tests/engine_base/test_engine_base_prediction.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/tests/engine_base/test_engine_base_training.py b/python-toolbox/tests/engine_base/test_engine_base_training.py
index f809b57..6102b14 100644
--- a/python-toolbox/tests/engine_base/test_engine_base_training.py
+++ b/python-toolbox/tests/engine_base/test_engine_base_training.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/tests/management/test_engine.py b/python-toolbox/tests/management/test_engine.py
index 91cb8ed..9daa4f4 100644
--- a/python-toolbox/tests/management/test_engine.py
+++ b/python-toolbox/tests/management/test_engine.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the 'License');
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/tests/management/test_hive.py b/python-toolbox/tests/management/test_hive.py
index a24e417..9d7ee7b 100644
--- a/python-toolbox/tests/management/test_hive.py
+++ b/python-toolbox/tests/management/test_hive.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the 'License');
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/tests/management/test_notebook.py b/python-toolbox/tests/management/test_notebook.py
index 2a31e0d..0c66eb7 100644
--- a/python-toolbox/tests/management/test_notebook.py
+++ b/python-toolbox/tests/management/test_notebook.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the 'License');
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/tests/management/test_pkg.py b/python-toolbox/tests/management/test_pkg.py
index de81226..2369967 100644
--- a/python-toolbox/tests/management/test_pkg.py
+++ b/python-toolbox/tests/management/test_pkg.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the 'License');
# you may not use this file except in compliance with the License.
diff --git a/python-toolbox/tests/test_loader.py b/python-toolbox/tests/test_loader.py
index 1cdc39e..d09ef0d 100644
--- a/python-toolbox/tests/test_loader.py
+++ b/python-toolbox/tests/test_loader.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding=utf-8
-# Copyright [2017] [B2W Digital]
+# Copyright [2019] [Apache Software Foundation]
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
