You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marvin.apache.org by we...@apache.org on 2020/01/04 10:06:42 UTC
[incubator-marvin] branch develop updated (06c2138 -> 1ffab90)
This is an automated email from the ASF dual-hosted git repository.
weichen pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-marvin.git.
from 06c2138 Merge branch 'pr/33' into develop
new 8af5504 Update test dependencies
new 1ffab90 Fix CI dependency error
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 10 ++++++----
python-toolbox/setup.py | 4 ++--
2 files changed, 8 insertions(+), 6 deletions(-)
[incubator-marvin] 02/02: Fix CI dependency error
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weichen pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-marvin.git
commit 1ffab9080de688b42fa054a12b77ab9bf1cf02c2
Author: cardosolucas <ca...@gmail.com>
AuthorDate: Wed Jan 1 23:59:50 2020 -0300
Fix CI dependency error
---
.travis.yml | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 79b95ae..a28e24e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,10 +49,11 @@ matrix:
- export MARVIN_HOME=./marvin_home
- export MARVIN_DATA_PATH=./marvin_data
- export SPARK_HOME=./spark-2.1.1-bin-hadoop2.6
- - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py ; fi
- - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo python get-pip.py ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew unlink python@2 ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install openssl graphviz ; fi
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py ; fi
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo python get-pip.py ; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install libsasl2-dev python-pip graphviz -y ; fi
- travis_retry sudo pip install --upgrade pip
- travis_retry sudo pip install virtualenvwrapper --ignore-installed six
@@ -77,10 +78,11 @@ matrix:
- export MARVIN_HOME=./marvin_home
- export MARVIN_DATA_PATH=./marvin_data
- export SPARK_HOME=./spark-2.1.1-bin-hadoop2.6
- - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py ; fi
- - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo python get-pip.py ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew unlink python@2 ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install openssl graphviz ; fi
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py ; fi
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo python get-pip.py ; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install libsasl2-dev python-pip graphviz -y ; fi
- travis_retry sudo pip install --upgrade pip
- travis_retry sudo pip install virtualenvwrapper --ignore-installed six
[incubator-marvin] 01/02: Update test dependencies
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weichen pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-marvin.git
commit 8af550450a2a455f0e3ec5ec54ac907c6c71a371
Author: cardosolucas <ca...@gmail.com>
AuthorDate: Wed Jan 1 14:26:50 2020 -0300
Update test dependencies
---
python-toolbox/setup.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/python-toolbox/setup.py b/python-toolbox/setup.py
index cec9ce1..5f733d4 100644
--- a/python-toolbox/setup.py
+++ b/python-toolbox/setup.py
@@ -91,9 +91,9 @@ REQUIREMENTS_TESTS = [
'pytest>=2.9.2',
'pytest-cov>=1.8.1,<2.6',
'pytest-watch>=4.1.0',
- 'pytest-testmon>=0.8.2',
+ 'pytest-testmon==0.8.2',
'Keras>=2.2.0',
- 'tensorflow>=1.8.0',
+ 'tensorflow==2.0',
]
# This is normally an empty list
DEPENDENCY_LINKS_EXTERNAL = []