Commits

Francesco Banconi  committed 4ee9a85

Requirements unification.

  • Participants
  • Parent commits d308aa6

Comments (0)

Files changed (4)

 
 check: test lint
 
-$(VENV_ACTIVATE): tests/develop.py tests/test-requires.pip
+$(VENV_ACTIVATE): tests/develop.py tests/requirements.pip
 	@$(PYTHON) tests/develop.py
 	@touch $(VENV_ACTIVATE)
 

File tests/develop.py

 
 
 if sys.version_info[0] >= 3:
-    # FIXME: a different requirements file will no longer be required once
-    # Django 1.5 is released (bug #15).
-    REQUIREMENTS_FILE = 'test-requires3.pip'
     VENV_NAME = '.venv3'
     # FIXME: running 2to3 on django-nose will no longer be required once
     # the project supports Python 3 (bug #16).
     PATCH_DJANGO_NOSE = True
 else:
-    REQUIREMENTS_FILE = 'test-requires.pip'
     VENV_NAME = '.venv'
     PATCH_DJANGO_NOSE = False
 
 
 TESTS = os.path.abspath(os.path.dirname(__file__))
-REQUIREMENTS = os.path.join(TESTS, REQUIREMENTS_FILE)
+REQUIREMENTS = os.path.join(TESTS, 'requirements.pip')
 WITH_VENV = os.path.join(TESTS, 'with_venv.sh')
 VENV = os.path.abspath(os.path.join(TESTS, '..', VENV_NAME))
 

File tests/requirements.pip

+# Django Endless Pagination test requirements.
+# Dependencies are installed by the ``make`` command.
+
+coverage
+django
+django-nose==1.1
+flake8
+ipdb
+nose
+selenium
+sphinx
+xvfbwrapper

File tests/test-requires.pip

-# Django Endless Pagination test requirements.
-# Dependencies are installed by the ``make`` command.
-
-coverage
-django
-django-nose==1.1
-flake8
-ipdb
-nose
-selenium
-sphinx
-xvfbwrapper