Skip to content

Commit

Permalink
Merge a8119db into 699e270
Browse files Browse the repository at this point in the history
  • Loading branch information
nouiz committed Jan 22, 2017
2 parents 699e270 + a8119db commit 0e5f9c0
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 22 deletions.
6 changes: 3 additions & 3 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.10.0
pyyaml==3.11
progressbar2==3.12.0
pyyaml==3.12
six==1.10.0
toolz==0.8.0
toolz==0.8.2

--allow-external theano
--allow-unverified theano
Expand Down
14 changes: 7 additions & 7 deletions req-travis-conda.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
coverage==4.2
coverage==4.3.4
h5py==2.6.0
mock==2.0.0
nose==1.3.7
numpy==1.11.1
pillow==3.3.0 # rq.filter: >=3.3.0,<3.4.0
numpy==1.12.0
pillow==3.3.3 # rq.filter: >=3.3.0,<3.4.0
pytables==3.2.2
pyyaml==3.11
pyzmq==15.4.0
scipy==0.18.0
pyyaml==3.12
pyzmq==16.0.2
scipy==0.18.1
six==1.10.0
toolz==0.8.0
toolz==0.8.2
14 changes: 7 additions & 7 deletions req-travis-docs-pip.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
sphinx==1.4.5
Pygments==2.1.3
docutils==0.12
mkdocs==0.15.3
sphinx==1.5.2
Pygments==2.2.0
docutils==0.13.1
mkdocs==0.16.1
mock==2.0.0
pillow==3.3.0 # rq.filter: >=3.3.0,<3.4.0
pillow==3.3.3 # 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.7.2
commonmark==0.7.3
recommonmark==0.4.0
pyyaml==3.11
pyyaml==3.12
six==1.10.0
2 changes: 1 addition & 1 deletion 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.5
picklable-itertools==0.1.1
progressbar2==3.10.0
progressbar2==3.12.0

--allow-external theano
--allow-unverified theano
Expand Down
8 changes: 4 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
numpy==1.11.1
numpy==1.12.0
picklable-itertools==0.1.1
progressbar2==3.10.0
pyyaml==3.11
progressbar2==3.12.0
pyyaml==3.12
six==1.10.0
toolz==0.8.0
toolz==0.8.2

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

0 comments on commit 0e5f9c0

Please sign in to comment.