Skip to content

Commit

Permalink
upgrade dependencies (#128)
Browse files Browse the repository at this point in the history
  • Loading branch information
nchammas authored Jul 18, 2016
1 parent 3c151ab commit 3ec0123
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 12 deletions.
4 changes: 2 additions & 2 deletions requirements/developer.pip
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
-r user.pip
pep8 >= 1.7.0
pytest >= 2.9.0
pytest-cov >= 2.2.1
pytest >= 2.9.2
pytest-cov >= 2.3.0
# PyYAML # requirement already covered by setup.py
6 changes: 3 additions & 3 deletions requirements/maintainer.pip
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
-r developer.pip
wheel >= 0.29.0
twine >= 1.6.5
pypandoc >= 1.1.3
PyInstaller >= 3.1.1
twine >= 1.7.4
pypandoc >= 1.2.0
PyInstaller >= 3.2
2 changes: 1 addition & 1 deletion requirements/user.pip
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# NOTE: Run pip from Flintrock's root directory, not from the directory containing
# this file.

setuptools >= 20.2.2
setuptools >= 24.0.2

# NOTE: The `-e .` syntax lets us reuse the requirements already specified under
# `install_requires` in setup.py.
Expand Down
13 changes: 7 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,16 @@
# totally break Flintrock.
# For example: https://github.com/paramiko/paramiko/issues/615
install_requires=[
'boto3 == 1.2.6',
'botocore == 1.4.1',
'click == 6.3',
'boto3 == 1.3.1',
'botocore == 1.4.37',
'click == 6.6',
'paramiko == 1.15.4',
'PyYAML == 3.11',
# This is to make PyInstaller work, since dateutil 2.5.0
# packaging appears to be broken.
# This is to ensure that PyInstaller works. dateutil is an
# indirect dependency of Flintrock, and PyInstaller chokes on
# dateutil 2.5.0.
# See: https://github.com/pyinstaller/pyinstaller/issues/1848
'python-dateutil == 2.4.2',
'python-dateutil >= 2.5.3',
],

entry_points={
Expand Down

0 comments on commit 3ec0123

Please sign in to comment.