Skip to content

Commit

Permalink
Merge branch 'master' into pyup-update-pytest-runner-2.11-to-2.11.1
Browse files Browse the repository at this point in the history
  • Loading branch information
delgadom committed Feb 8, 2017
2 parents 4498e40 + ea8e9e4 commit 6502229
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ PyYAML==3.12
Sphinx==1.5.2
sphinx_rtd_theme==0.1.10a0
boto==2.45.0
boto3==1.4.3
boto3==1.4.4
datafs==0.6.8
jinja2==2.9.4
jinja2==2.9.5
6 changes: 3 additions & 3 deletions requirements_test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ PyYAML==3.12
Sphinx==1.5.2
sphinx_rtd_theme==0.1.10a0
boto==2.45.0
boto3==1.4.3
boto3==1.4.4
datafs==0.6.8
jinja2==2.9.4
jinja2==2.9.5
pip==9.0.1
wheel==0.29.0
flake8==3.2.1
flake8==3.3.0
tox==2.6.0
coverage==4.3.4
pytest==3.0.6
Expand Down

0 comments on commit 6502229

Please sign in to comment.