Skip to content

Commit

Permalink
update requirements
Browse files Browse the repository at this point in the history
  • Loading branch information
manuphatak committed Jan 1, 2016
1 parent 8f83ad2 commit 24020f9
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 153 deletions.
57 changes: 41 additions & 16 deletions .requirements.diff
@@ -1,24 +1,49 @@
diff --git i/requirements_dev.txt w/requirements_dev.txt
index 13adb71..e2087c6 100644
index e2087c6..f4a1c4e 100644
--- i/requirements_dev.txt
+++ w/requirements_dev.txt
@@ -24,8 +24,10 @@ ipython==4.0.1 # via ipdb
jinja2==2.8 # via sphinx
markupsafe==0.23 # via jinja2
mccabe==0.3.1 # via flake8
+mock==1.3.0
path.py==8.1.2 # via pickleshare
pathtools==0.1.2 # via watchdog
+pbr==1.8.1 # via mock
pep8==1.5.7 # via flake8
pexpect==4.0.1 # via ipython
pickleshare==0.5 # via ipython
@@ -43,7 +45,7 @@ pytz==2015.7 # via babel
pyyaml==3.11
@@ -8,16 +8,13 @@ alabaster==0.7.7 # via sphinx
argh==0.26.1 # via watchdog
babel==2.1.1 # via sphinx
bumpversion==0.5.3
-cffi==1.4.2 # via cryptography
click==6.2 # via pip-tools
coverage==4.0.3
-cryptography==1.1.2
decorator==4.0.6 # via ipython, traitlets
docutils==0.12 # via restructuredtext-lint, sphinx
first==2.0.1 # via pip-tools
flake8==2.5.1
future==0.15.2
-idna==2.0 # via cryptography
ipdb==0.8.1
ipython-genutils==0.1.0 # via traitlets
ipython==4.0.1 # via ipdb
@@ -35,17 +32,15 @@ pip-tools==1.4.2
pluggy==0.3.1 # via tox
ptyprocess==0.5 # via pexpect
py==1.4.31 # via pytest, tox
-pyasn1==0.1.9 # via cryptography
-pycparser==2.14 # via cffi
pyflakes==1.0.0 # via flake8
pygments==2.0.2 # via sphinx
pytest-mock==0.9.0
pytest==2.8.5
pytz==2015.7 # via babel
-pyyaml==3.11
+pyyaml==3.11 # via watchdog
restructuredtext-lint==0.14.0
simplegeneric==0.8.1 # via ipython
-six==1.10.0 # via cryptography, pip-tools, sphinx
+six==1.10.0 # via cryptography, mock, pip-tools, sphinx
-six==1.10.0 # via cryptography, mock, pip-tools, sphinx
+six==1.10.0 # via mock, pip-tools, sphinx
snowballstemmer==1.2.1 # via sphinx
sphinx-rtd-theme==0.1.9 # via sphinx
sphinx==1.3.3
@@ -54,7 +49,3 @@ traitlets==4.0.0 # via ipython
virtualenv==13.1.2 # via tox
watchdog==0.8.3
wheel==0.26.0
-
-# The following packages are commented out because they are
-# considered to be unsafe in a requirements file:
-# setuptools==19.2 # via cryptography
7 changes: 0 additions & 7 deletions requirements_dev.in
Expand Up @@ -27,13 +27,6 @@ sphinx
watchdog
restructuredtext_lint

# DIST UTILITIES
# -------------------------------------
# required by `travis_pypi_setup.py`
cryptography
PyYAML


# DEV UTILITIES (Your stuff here)
# -------------------------------------
ipdb
13 changes: 2 additions & 11 deletions requirements_dev.txt
Expand Up @@ -8,16 +8,13 @@ alabaster==0.7.7 # via sphinx
argh==0.26.1 # via watchdog
babel==2.1.1 # via sphinx
bumpversion==0.5.3
cffi==1.4.2 # via cryptography
click==6.2 # via pip-tools
coverage==4.0.3
cryptography==1.1.2
decorator==4.0.6 # via ipython, traitlets
docutils==0.12 # via restructuredtext-lint, sphinx
first==2.0.1 # via pip-tools
flake8==2.5.1
future==0.15.2
idna==2.0 # via cryptography
ipdb==0.8.1
ipython-genutils==0.1.0 # via traitlets
ipython==4.0.1 # via ipdb
Expand All @@ -35,17 +32,15 @@ pip-tools==1.4.2
pluggy==0.3.1 # via tox
ptyprocess==0.5 # via pexpect
py==1.4.31 # via pytest, tox
pyasn1==0.1.9 # via cryptography
pycparser==2.14 # via cffi
pyflakes==1.0.0 # via flake8
pygments==2.0.2 # via sphinx
pytest-mock==0.9.0
pytest==2.8.5
pytz==2015.7 # via babel
pyyaml==3.11
pyyaml==3.11 # via watchdog
restructuredtext-lint==0.14.0
simplegeneric==0.8.1 # via ipython
six==1.10.0 # via cryptography, mock, pip-tools, sphinx
six==1.10.0 # via mock, pip-tools, sphinx
snowballstemmer==1.2.1 # via sphinx
sphinx-rtd-theme==0.1.9 # via sphinx
sphinx==1.3.3
Expand All @@ -54,7 +49,3 @@ traitlets==4.0.0 # via ipython
virtualenv==13.1.2 # via tox
watchdog==0.8.3
wheel==0.26.0

# The following packages are commented out because they are
# considered to be unsafe in a requirements file:
# setuptools==19.2 # via cryptography
119 changes: 0 additions & 119 deletions travis_pypi_setup.py

This file was deleted.

0 comments on commit 24020f9

Please sign in to comment.