Merge pull request ethereum#864 from ldct/ldct-requirements

clean up [dev_]requirements.txt

Author: joeykrug

dev_requirements.txt

@@ -1,6 +1,7 @@
-tox
+bitcoin
 coveralls
-pytest>=2.9.0
-pytest-catchlog==1.2.2
-pytest-timeout==1.0.0
+ethereum-serpent
 py-ecc
+pytest-timeout==1.0.0
+pytest>=2.9.0
+tox

requirements.txt

@@ -1,11 +1,11 @@
+coincurve>=7.0.0
+future
+https://github.com/ethereum/ethash/tarball/master
+pbkdf2
+py_ecc
+pycryptodome>=3.4.7
 pysha3>=1.0.1
 PyYAML
 repoze.lru
-scrypt
-pbkdf2
-py_ecc
 rlp>=0.4.7
-https://github.com/ethereum/ethash/tarball/master
-pycryptodome>=3.4.7
-coincurve>=7.0.0
-future
+scrypt