moves requirements into setup.py

Author: saxix

Makefile

@@ -20,8 +20,7 @@ develop:
 	@sh -c "if [ '${DJANGO}' = '1.9.x' ]; then pip install 'django>=1.9,<1.10'; fi"
 	@sh -c "if [ '${DJANGO}' = 'last' ]; then pip install django; fi"
 	@sh -c "if [ '${DJANGO}' = 'dev' ]; then pip install git+git://github.com/django/django.git; fi"
-	@pip install -qr requirements/tests.pip
-	@pip install -qr requirements/develop.pip
+	@pip install -e .[dev]
 	$(MAKE) .init-db
 
 
@@ -36,7 +35,7 @@ test:
 	py.test -v
 
 clean:
-	rm -fr ${BUILDDIR} dist *.egg-info .coverage
+	rm -fr ${BUILDDIR} dist *.egg-info .coverage coverage.xml
 	find src -name __pycache__ -o -name "*.py?" -o -name "*.orig" -prune | xargs rm -rf
 	find src/concurrency/locale -name django.mo | xargs rm -f
 

requirements/develop.pip

@@ -17,6 +17,7 @@
 
 
 class PyTest(TestCommand):
+
     def finalize_options(self):
         TestCommand.finalize_options(self)
         self.test_args = ['tests']
@@ -57,6 +58,27 @@ def run(self):
             remove_tree(self.build_help, dry_run=self.dry_run)
         CleanCommand.run(self)
 
+install_requires = ["django"]
+test_requires = ["django-webtest>=1.7.5",
+                 "mock>=1.0.1",
+                 "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,
     version=app.get_version(),
@@ -71,6 +93,9 @@ def run(self):
     license='MIT License',
     keywords='django',
     install_requires=install_requires,
+    tests_require=test_requires,
+    extras_require={'test': test_requires,
+                    'dev': test_requires + dev_requires},
     cmdclass={'test': PyTest},
     classifiers=[
         'Development Status :: 5 - Production/Stable',

requirements/docs.pip

@@ -21,9 +21,13 @@ setenv =
     mysql: DBENGINE = mysql
     sqlite: DBENGINE = sqlite
 
+envdir =
+      py27: {toxworkdir}/27
+      py33: {toxworkdir}/33
+      py34: {toxworkdir}/34
+      py35: {toxworkdir}/35
+
 deps=
-    -rrequirements/tests.pip
-;    psycopg2>=2.6.1
     py{27,33,34,35}: psycopg2>=2.6.1
     py{py}-pg: psycopg2cffi
     mysql: MySQL-python
@@ -44,8 +48,8 @@ deps=
 commands =
     mysql: - mysql -u root -e 'CREATE DATABASE IF NOT EXISTS concurrency;'
     pg: - psql -c 'CREATE DATABASE "concurrency";' -U postgres
-    py.test tests -rw --create-db {posargs}
-
+    pip install -e .[test] -q --log={envlogdir}/pip-extra-install.log
+    py.test tests -v -rw --create-db {posargs}
 
 [testenv:clean]
 commands =