Skip to content

Commit

Permalink
Merge 3331294 into 3668c6c
Browse files Browse the repository at this point in the history
  • Loading branch information
nouiz committed Feb 18, 2018
2 parents 3668c6c + 3331294 commit d21e659
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 27 deletions.
8 changes: 4 additions & 4 deletions req-rtd.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
picklable-itertools==0.1.1
progressbar2==3.6.2
pyyaml==3.11
requests==2.9.1
six==1.10.0
progressbar2==3.35.2
pyyaml==3.12
requests==2.18.4
six==1.11.0
20 changes: 10 additions & 10 deletions req-travis-conda.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
coverage==4.0.3
h5py==2.5.0
mock==1.3.0
coverage==4.5.1
h5py==2.7.1
mock==2.0.0
nose==1.3.7
numpy==1.10.4
pillow==3.1.1
numpy==1.14.0
pillow==5.0.0
pytables==3.2.2
pyyaml==3.11
pyzmq==15.2.0
requests==2.9.1
scipy==0.17.0
six==1.10.0
pyyaml==3.12
pyzmq==17.0.0
requests==2.18.4
scipy==1.0.0
six==1.11.0
6 changes: 3 additions & 3 deletions req-travis-pip.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
nose2[coverage_plugin]==0.6.4
coveralls==1.1
nose2[coverage_plugin]==0.7.4
coveralls==1.2.0
picklable-itertools==0.1.1
progressbar2==3.6.2
progressbar2==3.35.2
20 changes: 10 additions & 10 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
h5py==2.5.0
numpy==1.10.4
tables==3.2.2
h5py==2.7.1
numpy==1.14.0
tables==3.4.2
picklable-itertools==0.1.1
pillow==3.1.1
progressbar2==3.6.2
pyyaml==3.11
pyzmq==15.2.0
requests==2.9.1
scipy==0.17.0
six==1.10.0
pillow==5.0.0
progressbar2==3.35.2
pyyaml==3.12
pyzmq==17.0.0
requests==2.18.4
scipy==1.0.0
six==1.11.0

0 comments on commit d21e659

Please sign in to comment.