move requirements to dedicated file

Author: saxix

.travis.yml

@@ -18,26 +18,30 @@ services:
   - PostgreSQL
 
 env:
-   - py27-d18-pg
-   - py27-d18-sqlite
-   - py27-d18-mysql
-   - py27-d19-pg
-   - py27-d19-sqlite
-   - py27-d19-mysql
-   - py33-d18-pg
-   - py33-d18-sqlite
-   - py34-d18-pg
-   - py34-d18-sqlite
-   - py34-d19-pg
-   - py34-d19-sqlite
-   - py35-d18-pg
-   - py35-d18-sqlite
-   - py35-d19-pg
-   - py35-d19-sqlite
-   - pypy-d18-pg
-   - pypy-d18-sqlite
-   - pypy-d19-pg
-   - pypy-d19-sqlite
+   - TOXENV=py27-d18-pg
+   - TOXENV=py27-d18-sqlite
+   - TOXENV=py27-d18-mysql
+   - TOXENV=py27-d19-pg
+   - TOXENV=py27-d19-sqlite
+   - TOXENV=py27-d19-mysql
+
+   - TOXENV=py33-d18-pg
+   - TOXENV=py33-d18-sqlite
+
+   - TOXENV=py34-d18-pg
+   - TOXENV=py34-d18-sqlite
+   - TOXENV=py34-d19-pg
+   - TOXENV=py34-d19-sqlite
+
+   - TOXENV=py35-d18-pg
+   - TOXENV=py35-d18-sqlite
+   - TOXENV=py35-d19-pg
+   - TOXENV=py35-d19-sqlite
+
+   - TOXENV=pypy-d18-pg
+   - TOXENV=pypy-d18-sqlite
+   - TOXENV=pypy-d19-pg
+   - TOXENV=pypy-d19-sqlite
 
 
 install:

setup.py

@@ -15,25 +15,22 @@
 
 reqs = 'install.py%d.pip' % sys.version_info[0]
 
-# if sys.version_info[0] == 2:
-#     reqs = 'install.py2.pip'
-    # app = imp.load_source('concurrency', init)
-# elif sys.version_info[0] == 3:
-#     reqs = 'install.py3.pip'
-    # if sys.version_info[1] in [3,4]:
-    #     from importlib.machinery import SourceFileLoader
-    #     app = SourceFileLoader("adminactions", init).load_module()
-    # elif sys.version_info[1] in [5]:
-    #     import importlib.util
-    #     spec = importlib.util.spec_from_file_location("concurrency", init)
-    #     app = importlib.util.module_from_spec(spec)
-    #     spec.loader.exec_module(app)
+rel = lambda fname: os.path.join(os.path.dirname(__file__),
+                                 'src',
+                                 'requirements', fname)
+
+
+def fread(fname):
+    return open(rel(fname)).read()
+
+install_requires = fread('install.pip')
+test_requires = fread('testing.pip')
+dev_requires = fread('develop.pip')
 
 base_url = 'https://github.com/saxix/django-concurrency/'
 
 
 class PyTest(TestCommand):
-
     def finalize_options(self):
         TestCommand.finalize_options(self)
         self.test_args = ['tests']
@@ -43,6 +40,7 @@ def run_tests(self):
         # import here, cause outside the eggs aren't loaded
         import pytest
         import sys
+
         sys.path.insert(0, os.path.join(ROOT, 'tests', 'demoapp'))
         errno = pytest.main(self.test_args)
         sys.exit(errno)
@@ -74,27 +72,6 @@ def run(self):
             remove_tree(self.build_help, dry_run=self.dry_run)
         CleanCommand.run(self)
 
-install_requires = []
-test_requires = ["django-webtest>=1.7.5",
-                 "mock>=1.0.1",
-                 "check-manifest==0.30",
-                 "pytest-cache>=1.0",
-                 "pytest-cov>=1.6",
-                 "pytest-django>=2.8",
-                 "pytest-echo>=1.3",
-                 "pytest-pythonpath",
-                 "pytest>=2.8",
-                 "tox>=2.3",
-                 "WebTest>=2.0.11"]
-
-dev_requires = ["autopep8",
-                "coverage",
-                "django_extensions",
-                "flake8",
-                "ipython",
-                "pdbpp",
-                "psycopg2",
-                "sphinx"]
 
 setup(
     name=app.NAME,

src/requirements/develop.pip

@@ -0,0 +1,8 @@
+autopep8
+coverage
+django_extensions
+flake8
+ipython
+pdbpp
+psycopg2
+sphinx

src/requirements/install.pip

@@ -0,0 +1 @@
+six

src/requirements/testing.pip

@@ -0,0 +1,11 @@
+django-webtest>=1.7.5
+mock>=1.0.1
+check-manifest==0.30
+pytest-cache>=1.0
+pytest-cov>=1.6
+pytest-django>=2.8
+pytest-echo>=1.3
+pytest-pythonpath
+pytest>=2.8
+tox>=2.3
+WebTest>=2.0.11

tox.ini

@@ -1,8 +1,9 @@
 [tox]
-envlist = py{27}-d{18,19}-{pg,sqlite,mysql},
-          py{33}-d18-{pg,sqlite},
-          py{34,35}-d{18,19}-{pg,sqlite}
-          pypy-d{18,19}-{pg,sqlite}
+envlist = py{27}-d{18}-{pg}
+;envlist = py{27}-d{18,19}-{pg,sqlite,mysql},
+;          py{33}-d18-{pg,sqlite},
+;          py{34,35}-d{18,19}-{pg,sqlite}
+;          pypy-d{18,19}-{pg,sqlite}
 
 [pytest]
 python_paths=./tests/demoapp/
@@ -22,6 +23,7 @@ markers =
   functional: mark a test as functional
 
 [testenv]
+install_command=pip install {opts} {packages}
 pip_pre = True
 passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH PYTHONDONTWRITEBYTECODE
 
@@ -48,13 +50,12 @@ deps=
 
     d19: django>=1.9,<1.10
     d19: django-reversion==1.10
-    .[test]
+    -rsrc/requirements/testing.pip
 
 commands =
     mysql: - mysql -u root -e 'CREATE DATABASE IF NOT EXISTS concurrency;'
     pg: - psql -c 'DROP DATABASE "concurrency";' -U postgres
     pg: - psql -c 'CREATE DATABASE "concurrency";' -U postgres
-;    pip install -e .[test] -q --log={envlogdir}/pip-extra-install.log
     {posargs:py.test tests -v -rw --create-db}
 
 [testenv:clean]