Merge pull request #248 from ethereum/split_requirements

split requirements

Author: heikoheiko

.travis.yml

@@ -4,8 +4,8 @@ env:
   - TOX_ENV=py27
 
 install:
-  - pip install tox coveralls
   - pip install -r requirements.txt
+  - pip install -r dev_requirements.txt
 
 script:
 - coverage run --source ethereum setup.py test

dev_requirements.txt

@@ -0,0 +1,5 @@
+tox
+coveralls
+pytest
+pytest-timeout
+https://github.com/ethereum/serpent/tarball/develop

requirements.txt

@@ -1,10 +1,6 @@
 bitcoin
 pysha3
-pytest
-pytest-timeout
 repoze.lru
 structlog>=15.0.0
-coveralls
 https://github.com/ethereum/pyrlp/tarball/develop
-https://github.com/ethereum/serpent/tarball/develop
 https://github.com/ethereum/ethash/tarball/master

setup.py

@@ -29,21 +29,27 @@ def run_tests(self):
 
 cmdclass = dict(test=PyTest)
 
+# requirements
 install_requires = set(x.strip() for x in open('requirements.txt'))
-
 install_requires_replacements = {
     'https://github.com/ethereum/pyrlp/tarball/develop': 'rlp>=0.3.7',
-    'https://github.com/ethereum/serpent/tarball/develop': 'ethereum-serpent>=1.8.1',
     'https://github.com/ethereum/ethash/tarball/master': 'pyethash'}
-
 install_requires = [install_requires_replacements.get(r, r) for r in install_requires]
 
+# dev requirements
+tests_require = set(x.strip() for x in open('dev_requirements.txt'))
+tests_require_replacements = {
+    'https://github.com/ethereum/serpent/tarball/develop': 'ethereum-serpent>=1.8.1'}
+tests_require = [tests_require_replacements.get(r, r) for r in tests_require]
+
+
 setup(name="ethereum",
       packages=find_packages("."),
       description='Next generation cryptocurrency network',
       long_description=readme,
       url='https://github.com/ethereum/pyethereum/',
       install_requires=install_requires,
+      tests_require=tests_require,
       entry_points=dict(console_scripts=console_scripts),
       version='0.9.64',
       cmdclass=cmdclass

tox.ini

@@ -9,3 +9,4 @@ setenv =
 commands = coverage run --source=pyethereum setup.py test
 deps =
     -r{toxinidir}/requirements.txt
+    -r{toxinidir}/dev_requirements.txt