Merge pull request #16 from apache/develop
[MARVIN-36] Release 0.0.5
diff --git a/.travis.yml b/.travis.yml
index 3628d48..63f9acc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,6 +58,7 @@
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mkvirtualenv marvin-env ; fi
install:
- travis_retry pip install codecov
+ - travis_retry pip install unidecode
- make marvin
script:
- marvin test
@@ -85,6 +86,7 @@
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mkvirtualenv marvin-env ; fi
install:
- travis_retry pip install codecov
+ - travis_retry pip install unidecode
- make marvin
script:
- marvin test
diff --git a/CONTRIBUTION.md b/CONTRIBUTION.md
new file mode 100644
index 0000000..7fd1506
--- /dev/null
+++ b/CONTRIBUTION.md
@@ -0,0 +1,54 @@
+# Contributing
+
+ When contributing to this repository, please discuss the change you wish to make via issue or
+ email list <dev@marvin.apache.org> with the members/administrators of this repository before.
+
+ ## Components
+
+ **Toolbox**: Set of CLI's, utilities, classes, specific libraries to each language, which supports the entire process of exploration, development, testing and delivery of an Engine.
+
+ **Engine-executor**: Implementation of architectural abstraction around the Engine, such as parallelism, distribution, version control, APIs, availability.
+
+ **Public-engines**: Engine examples.
+
+
+ ## Get started
+
+ Clone the repository, [install][installguide] and run "marvin" to confirm the installation.
+
+ Choose the issues that are labeled as "Good First Issue".
+
+ ## Unit test
+
+ The unit test is very important and of course it's required for this project, you can use "marvin test" command to run your tests.
+
+
+ ## New issue and pull request
+
+ The community discusses and tracks known bugs and potential features in the [Github Issue Tracker][tbissue]. If you have a new idea or have identified a bug then you should raise it there to start public discussion
+
+ This repository contains Issue Templates and Pull Request Templates, just follow the instructions described in templates.
+
+ ## Where to ask for help
+
+ 1. [Apache Jira Issue Tracker][aissue]: for discussions about new features or established bugs
+ 2. <dev@marvin.apache.org>: for general development discussions
+
+ ## Separate Code Repositories
+
+ [Marvin-AI][marvinai] maintains all your code and documentation in multiple repositories on the Github. This includes the primary repository and several others repositories for different components.
+
+ ## Standard procedure for contribution
+
+ 1. Fork the repository from [Here][marvinai].
+ 2. Create a new branch in the forked repository for new changes.
+ 3. Create pull request from your branch to the main repository using a name that start with issue ID.
+
+ # Code of Conduct
+
+ Our Code of Conduct is available at [Here][codepage]
+
+ [codepage]: https://github.com/apache/incubator-marvin/blob/master/python-toolbox/CODE_OF_CONDUCT.md
+ [installguide]: https://github.com/apache/incubator-marvin/blob/master/python-toolbox/README.md
+ [aissue]: https://issues.apache.org/jira/projects/MARVIN/issues?filter=allopenissues
+ [marvinai]: https://github.com/apache/incubator-marvin
diff --git a/engine-executor/LICENSE b/LICENSE
similarity index 100%
rename from engine-executor/LICENSE
rename to LICENSE
diff --git a/README.md b/README.md
index bc4dcf0..cf54949 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,10 @@
-[](https://travis-ci.org/apache/incubator-marvin)
+Branch | Status | CodeCov
+-|-|-
+[master](https://github.com/apache/incubator-marvin) | [](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.
@@ -39,9 +42,9 @@
## Contributing
-Please follow the [Contribution Guidelines](https://issues.apache.org/jira/projects/MARVIN/issues/MARVIN-8)
+Please follow the [Contribution Guidelines](CONTRIBUTION.md)
-For website and documentation contribution, check our [Website Repository](https://github.com/apache/incubator-marvin)
+For website and documentation contribution, check our [Website Repository](https://github.com/apache/incubator-marvin-website)
## License
diff --git a/engine-executor/CONTRIBUTING.md b/engine-executor/CONTRIBUTING.md
deleted file mode 100644
index b48bca0..0000000
--- a/engine-executor/CONTRIBUTING.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# Contributing
-
- When contributing to this repository, please discuss the change you wish to make via issue or
- Gitter with the members/administrators of this repository before.
-
- ## Get started
-
- Clone the repository, [install][installguide] and run "marvin test" to confirm the installation.
-
- Choose the issues that are labeled as "Good First Issue".
-
- ## Unit test
-
- The unit test is very important and of course it's required for this project, you can use "marvin test" command to run your tests.
-
-
- ## New issue and pull request
-
- The community discusses and tracks known bugs and potential features in the [Github Issue Tracker][tbissue]. If you have a new idea or have identified a bug then you should raise it there to start public discussion
-
- This repository contains Issue Templates and Pull Request Templates, just follow the instructions described in templates.
-
- ## Where to ask for help
-
- 1. [Github Issue Tracker][tbissue]: for discussions about new features or established bugs
- 2. [Gitter chat][gchat]: for real-time discussion
-
- ## Separate Code Repositories
-
- [Marvin-AI][marvinai] maintains all your code and documentation in multiple repositories on the Github. This includes the primary repository and several others repositories for different components.
-
- # Code of Conduct
-
- Our Code of Conduct is available at [Here][codepage]
-
- [codepage]: https://github.com/marvin-ai/marvin-python-toolbox/blob/master/CODE_OF_CONDUCT.md
- [installguide]: https://github.com/marvin-ai/marvin-python-toolbox/blob/master/README.md
- [tbissue]: https://github.com/marvin-ai/marvin-python-toolbox/issues
- [gchat]: https://gitter.im/marvin-ai
- [marvinai]: https://github.com/marvin-ai
\ No newline at end of file
diff --git a/engine-executor/README.md b/engine-executor/README.md
index 1c574e5..d31bb12 100644
--- a/engine-executor/README.md
+++ b/engine-executor/README.md
@@ -1,14 +1,12 @@
[](https://travis-ci.org/marvin-ai/marvin-engine-executor) [](https://codecov.io/gh/marvin-ai/marvin-engine-executor)
-[](https://gitter.im/marvin-ai)
-
# Marvin Engine Executor (Server)
This is the component responsable for coordinate execution of the steps (actions) in a Marvin engine. The engine-executor
is able to communicate with engines through gRPC protocol. More details about the contract can be found
on the protobuf file.
-The latest stable build can be downloaded from [here](https://s3.amazonaws.com/marvin-engine-executor/marvin-engine-executor-assembly-0.0.4.jar).
+Last stable build v0.0.4 can be downloaded from [here](https://s3.amazonaws.com/marvin-engine-executor/marvin-engine-executor-assembly-0.0.4.jar).
### install requirements
@@ -41,3 +39,4 @@
```
> Marvin is a project started at B2W Digital offices and released open source on September 2017.
+> The project is donated to Apache Software Foundation on August 2018.
diff --git a/engine-executor/build.sbt b/engine-executor/build.sbt
index af58722..d3a40a6 100644
--- a/engine-executor/build.sbt
+++ b/engine-executor/build.sbt
@@ -16,11 +16,11 @@
*/
name := "marvin-engine-executor"
-version := "0.0.4"
+version := "0.0.5"
scalaVersion := "2.12.3"
-organization := "com.github.marvin-ai"
+organization := "org.apache.marvin"
PB.targets in Compile := Seq(
scalapb.gen() -> (sourceManaged in Compile).value
@@ -81,4 +81,4 @@
publishArtifact in Test := false
-useGpg := true
\ No newline at end of file
+useGpg := true
diff --git a/python-toolbox/.bumpversion.cfg b/python-toolbox/.bumpversion.cfg
index dd72cce..2938b3c 100644
--- a/python-toolbox/.bumpversion.cfg
+++ b/python-toolbox/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 0.0.4
+current_version = 0.0.5
[bumpversion:file:marvin_python_toolbox/VERSION]
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/CHANGES.md b/python-toolbox/CHANGES.md
index f88edae..0cf8ca6 100644
--- a/python-toolbox/CHANGES.md
+++ b/python-toolbox/CHANGES.md
@@ -1,5 +1,22 @@
## Changes log
+### 0.0.5
+
+ - Artifact reload bug fix #3 #5
+ - Dependency Links Deprecation & Remove #14
+ - Dependencies version fix for MacOS env #17
+ - General contribution file update #10
+ - CI update
+ - Move Travis CI out from sub-directory #1 #5
+ - Travis CI retry #6
+ - Travis CI sbt batch mode #7 #8
+ - Pytest-Cov Version Requirement Update #9
+ - Readme update
+ - Tutorial book link update #2 #4 #11
+ - Install links update to Apache Website #12
+ - License Update
+ - Move License out for Github #13
+
### 0.0.4
- Docs.yaml file update for metrics api
diff --git a/python-toolbox/CONTRIBUTING.md b/python-toolbox/CONTRIBUTING.md
deleted file mode 100644
index 7b87e9a..0000000
--- a/python-toolbox/CONTRIBUTING.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# Contributing
-
- When contributing to this repository, please discuss the change you wish to make via issue or
- Gitter with the members/administrators of this repository before.
-
- ## Get started
-
- Clone the repository, [install][installguide] and run "marvin test" to confirm the installation.
-
- Choose the issues that are labeled as "Good First Issue".
-
- ## Unit test
-
- The unit test is very important and of course it's required for this project, you can use "marvin test" command to run your tests.
-
-
- ## New issue and pull request
-
- The community discusses and tracks known bugs and potential features in the [Github Issue Tracker][tbissue]. If you have a new idea or have identified a bug then you should raise it there to start public discussion
-
- This repository contains Issue Templates and Pull Request Templates, just follow the instructions described in templates.
-
- ## Where to ask for help
-
- 1. [Github Issue Tracker][tbissue]: for discussions about new features or established bugs
- 2. [Gitter chat][gchat]: for real-time discussion
-
- ## Separate Code Repositories
-
- [Marvin-AI][marvinai] maintains all your code and documentation in multiple repositories on the Github. This includes the primary repository and several others repositories for different components.
-
- # Code of Conduct
-
- Our Code of Conduct is available at [Here][codepage]
-
- [codepage]: https://github.com/marvin-ai/marvin-python-toolbox/blob/master/CODE_OF_CONDUCT.md
- [installguide]: https://github.com/marvin-ai/marvin-python-toolbox/blob/master/README.md
- [tbissue]: https://github.com/marvin-ai/marvin-python-toolbox/issues
- [gchat]: https://gitter.im/marvin-ai
- [marvinai]: https://github.com/marvin-ai
-
diff --git a/python-toolbox/LICENSE b/python-toolbox/LICENSE
deleted file mode 100644
index f49a4e1..0000000
--- a/python-toolbox/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
\ No newline at end of file
diff --git a/python-toolbox/Makefile b/python-toolbox/Makefile
index 84ce1ef..060af38 100644
--- a/python-toolbox/Makefile
+++ b/python-toolbox/Makefile
@@ -37,16 +37,16 @@
@echo " Build and upload the toolbox as a wheel package in pypi."
marvin:
- pip install -e ".[testing]" --process-dependency-links
+ pip install -e ".[testing]"
touch .dev
marvin --help
update:
- pip install -e . --process-dependency-links -U
+ pip install -e . -U
marvin-prod:
- pip install . --process-dependency-links
- rm -f .dev
+ pip install .
+ rm -f .dev
marvin --help
clean-pyc:
@@ -55,7 +55,7 @@
find . -name '*~' -exec rm -f {} +
clean-build:
- rm -f .prod
+ rm -f .prod
rm -rf *.egg-info
rm -rf .cache
rm -rf .eggs
diff --git a/python-toolbox/README.md b/python-toolbox/README.md
index eb1d459..6c18015 100644
--- a/python-toolbox/README.md
+++ b/python-toolbox/README.md
@@ -1,10 +1,8 @@
[](https://travis-ci.org/marvin-ai/marvin-python-toolbox) [](https://codecov.io/gh/marvin-ai/marvin-python-toolbox)
-[](https://gitter.im/marvin-ai)
+# Marvin Toolbox v0.0.5
-# Marvin Toolbox v0.0.4
-
-
+
# Quick Start
@@ -13,9 +11,9 @@
**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.
## Getting Started
-* [Installing Marvin (Ubuntu)](https://www.marvin-ai.org/book/overview-1/ubuntu)
-* [Installing Marvin (MacOS)](https://www.marvin-ai.org/book/overview-1/mac)
-* [Installing Marvin (Other OS) Vagrant](https://www.marvin-ai.org/book/overview-1/vagrant)
+* [Installing Marvin (Ubuntu)](https://marvin.apache.org/marvin-platform-book/ch2_toolbox_installation/ubuntu/)
+* [Installing Marvin (MacOS)](https://marvin.apache.org/marvin-platform-book/ch2_toolbox_installation/mac/)
+* [Installing Marvin (Other OS) Vagrant](https://marvin.apache.org/marvin-platform-book/ch2_toolbox_installation/vagrant/)
* [Creating a new engine](#creating-a-new-engine)
* [Working in an existing engine](#working-in-an-existing-engine)
* [Command line interface](#command-line-interface)
@@ -110,3 +108,4 @@
```
> Marvin is a project started at B2W Digital offices and released open source on September 2017.
+> The project is donated to Apache Software Foundation on August 2018.
diff --git a/python-toolbox/marvin_python_toolbox/VERSION b/python-toolbox/marvin_python_toolbox/VERSION
index 81340c7..bbdeab6 100644
--- a/python-toolbox/marvin_python_toolbox/VERSION
+++ b/python-toolbox/marvin_python_toolbox/VERSION
@@ -1 +1 @@
-0.0.4
+0.0.5
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/setup.py b/python-toolbox/marvin_python_toolbox/management/templates/python-engine/setup.py
index b4c128e..40d82f0 100644
--- a/python-toolbox/marvin_python_toolbox/management/templates/python-engine/setup.py
+++ b/python-toolbox/marvin_python_toolbox/management/templates/python-engine/setup.py
@@ -162,7 +162,7 @@
'numpy>=1.13.1',
'pandas>=0.20.3',
'matplotlib>=2.0.2',
- 'marvin-python-toolbox>=0.0.4',
+ 'marvin-python-toolbox>={{project.toolbox_version}}',
'Fabric>=1.14.0',
],
tests_require=REQUIREMENTS_TESTS,
diff --git a/python-toolbox/setup.py b/python-toolbox/setup.py
index fce8991..cfec315 100644
--- a/python-toolbox/setup.py
+++ b/python-toolbox/setup.py
@@ -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 = 'taka@apache.org'
PYTHON_2 = True
PYTHON_3 = True
@@ -80,7 +80,8 @@
'urllib3>=1.21.1',
'idna>=2.5',
'bleach>=1.5.0',
- 'numpy==1.13.3'
+ 'numpy>=1.16.2',
+ 'Unidecode==1.0.23',
]
# Test dependencies
@@ -88,7 +89,7 @@
'tox>=2.2.0',
'mock>=2.0.0',
'pytest>=2.9.2',
- 'pytest-cov>=1.8.1',
+ 'pytest-cov>=1.8.1,<2.6',
'pytest-watch>=4.1.0',
'pytest-testmon>=0.8.2',
'Keras>=2.2.0',
