Skip to content

Commit

Permalink
Merge b6ca3be into 42e21a2
Browse files Browse the repository at this point in the history
  • Loading branch information
nouiz committed Jul 23, 2017
2 parents 42e21a2 + b6ca3be commit ec46967
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 23 deletions.
6 changes: 3 additions & 3 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
progressbar2==3.31.1
pyyaml==3.12
requests==2.18.1
six==1.10.0
18 changes: 9 additions & 9 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.4.1
h5py==2.7.0
mock==2.0.0
nose==1.3.7
numpy==1.10.4
pillow==3.1.1
numpy==1.13.1
pillow==4.2.1
pytables==3.2.2
pyyaml==3.11
pyzmq==15.2.0
requests==2.9.1
scipy==0.17.0
pyyaml==3.12
pyzmq==16.0.2
requests==2.18.1
scipy==0.19.1
six==1.10.0
4 changes: 2 additions & 2 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
nose2[coverage_plugin]==0.6.5
coveralls==1.1
picklable-itertools==0.1.1
progressbar2==3.6.2
progressbar2==3.31.1
18 changes: 9 additions & 9 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.0
numpy==1.13.1
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
pillow==4.2.1
progressbar2==3.31.1
pyyaml==3.12
pyzmq==16.0.2
requests==2.18.1
scipy==0.19.1
six==1.10.0

0 comments on commit ec46967

Please sign in to comment.