Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
FavioVazquez authored Jan 25, 2019
2 parents 1b9b0a9 + 506d0a0 commit 78ab677
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 23 deletions.
6 changes: 3 additions & 3 deletions requirements-docs.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
findspark==1.3.0
numpy==1.15.2
pytest==3.8.1
pytest==4.0.1
matplotlib==3.0.1
ipython==7.0.1
ipython==7.2.0
### pyspark==2.2.0 # it has no wheel
setuptools==40.5.0
setuptools==40.6.3
20 changes: 10 additions & 10 deletions requirements-test.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
mock==2.0.0
nose==1.3.7
pylint==2.1.1
pylint==2.2.2
fastnumbers==2.1.1
multipledispatch==0.6.0
python_dateutil==2.7.4
python_dateutil==2.7.5
numpy==1.15.2
matplotlib==3.0.1
pyspark==2.3.1
pytest==3.8.1
pytest==4.0.1
findspark==1.3.0
nose==1.3.7
seaborn==0.9.0
setuptools==40.5.0
deprecated==1.2.3
deprecated==1.2.4
setuptools==40.6.3
pyarrow==0.10.0
tabulate==0.8.2
Jinja2==2.10
Expand All @@ -23,14 +23,14 @@ pygments>=2.2.0
six>=1.10.0
h5py>=2.7.0
flask==1.0.2
ipython==7.0.1
ipython==7.2.0
humanize==0.5.1
pytest-cov==2.6.0
psutil==5.4.7
backoff==1.6.0
psutil==5.4.8
backoff==1.8.0
pymongo==3.7.2
ratelimit==2.2.0
h2o-pysparkling-2.4==2.4.4
ratelimit==2.2.1
tqdm==4.28.1
kombu==4.2.1
kombu==4.2.2.post1
pika==0.12.0
20 changes: 10 additions & 10 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
requests==2.20.0
requests==2.21.0
tqdm==4.28.1
pymongo==3.7.2
fastnumbers==2.1.1
multipledispatch==0.6.0
python_dateutil==2.7.4
python_dateutil==2.7.5
nose==1.3.7
numpy==1.15.2
matplotlib==3.0.1
pyspark==2.3.1
pytest==3.8.1
pytest==4.0.1
findspark==1.3.0
nose==1.3.7
seaborn==0.9.0
setuptools==40.5.0
deprecated==1.2.3
deprecated==1.2.4
setuptools==40.6.3
pyarrow==0.10.0
tabulate==0.8.2
Jinja2==2.10
Expand All @@ -24,13 +24,13 @@ pygments>=2.2.0
six>=1.10.0
h5py>=2.7.0
flask==1.0.2
ipython==7.0.1
ratelimit==2.2.0
ipython==7.2.0
ratelimit==2.2.1
humanize==0.5.1
psutil==5.4.7
backoff==1.6.0
h2o-pysparkling-2.4==2.4.4
psutil==5.4.8
backoff==1.8.0
pymongo==3.7.2
kombu==4.2.1
kombu==4.2.2.post1
pandas==0.23.4
pika==0.12.0

0 comments on commit 78ab677

Please sign in to comment.