Skip to content

Commit

Permalink
Merge pull request #1138 from dmitriy-serdyuk/requires-io-fix
Browse files Browse the repository at this point in the history
Rebased requires-io
  • Loading branch information
dmitriy-serdyuk committed Aug 18, 2016
2 parents 508344c + 331c9ca commit c3bf3a8
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions req-rtd.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
picklable-itertools==0.1.1
progressbar2==3.6.2
progressbar2==3.10.0
pyyaml==3.11
six==1.10.0
toolz==0.7.4
toolz==0.8.0

--allow-external theano
--allow-unverified theano
Expand Down
16 changes: 8 additions & 8 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.2
h5py==2.6.0
mock==2.0.0
nose==1.3.7
numpy==1.10.4
pillow==3.1.1
numpy==1.11.1
pillow==3.3.0 # rq.filter: >=3.3.0,<3.4.0
pytables==3.2.2
pyyaml==3.11
pyzmq==15.2.0
scipy==0.17.0
pyzmq==15.4.0
scipy==0.18.0
six==1.10.0
toolz==0.7.4
toolz==0.8.0
12 changes: 6 additions & 6 deletions req-travis-docs-pip.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
sphinx==1.3.5
sphinx==1.4.5
Pygments==2.1.3
docutils==0.12
mkdocs==0.15.0
mock==1.0.1
pillow==2.6.1
mkdocs==0.15.3
mock==2.0.0
pillow==3.3.0 # rq.filter: >=3.3.0,<3.4.0
git+https://github.com/rtfd/readthedocs-sphinx-ext.git@0.6-alpha#egg=readthedocs-sphinx-ext
sphinx-rtd-theme==0.1.9
alabaster>=0.7,<0.8,!=0.7.5
commonmark==0.5.4
recommonmark==0.1.1
commonmark==0.7.2
recommonmark==0.4.0
pyyaml==3.11
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,7 +1,7 @@
coveralls==1.1
nose2[coverage-plugin]==0.6.3
nose2[coverage_plugin]==0.6.5
picklable-itertools==0.1.1
progressbar2==3.6.2
progressbar2==3.10.0

--allow-external theano
--allow-unverified theano
Expand Down
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
numpy==1.10.4
numpy==1.11.1
picklable-itertools==0.1.1
progressbar2==3.6.2
progressbar2==3.10.0
pyyaml==3.11
six==1.10.0
toolz==0.7.4
toolz==0.8.0

--allow-external theano
--allow-unverified theano
Expand Down

0 comments on commit c3bf3a8

Please sign in to comment.