From aecbaaed0c1a0d7da99a8d3deb9328ad2b5c601d Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Mon, 1 Jul 2013 13:58:04 -0400 Subject: [1.6.x] Fixed #19196 -- Added test/requirements Backport of 4d92a0bd86 from master. --- tests/requirements/base.txt | 6 ++++++ tests/requirements/mysql.txt | 1 + tests/requirements/oracle.txt | 1 + tests/requirements/postgres.txt | 1 + tests/requirements/py2.txt | 2 ++ tests/requirements/py3.txt | 2 ++ tests/runtests.py | 1 + 7 files changed, 14 insertions(+) create mode 100644 tests/requirements/base.txt create mode 100644 tests/requirements/mysql.txt create mode 100644 tests/requirements/oracle.txt create mode 100644 tests/requirements/postgres.txt create mode 100644 tests/requirements/py2.txt create mode 100644 tests/requirements/py3.txt (limited to 'tests') diff --git a/tests/requirements/base.txt b/tests/requirements/base.txt new file mode 100644 index 0000000000..89bd8230b2 --- /dev/null +++ b/tests/requirements/base.txt @@ -0,0 +1,6 @@ +bcrypt +docutils +Pillow +PyYAML +pytz +selenium diff --git a/tests/requirements/mysql.txt b/tests/requirements/mysql.txt new file mode 100644 index 0000000000..c7a2347407 --- /dev/null +++ b/tests/requirements/mysql.txt @@ -0,0 +1 @@ +MySQL-python diff --git a/tests/requirements/oracle.txt b/tests/requirements/oracle.txt new file mode 100644 index 0000000000..ae5b7349cd --- /dev/null +++ b/tests/requirements/oracle.txt @@ -0,0 +1 @@ +cx_oracle diff --git a/tests/requirements/postgres.txt b/tests/requirements/postgres.txt new file mode 100644 index 0000000000..658130bb2c --- /dev/null +++ b/tests/requirements/postgres.txt @@ -0,0 +1 @@ +psycopg2 diff --git a/tests/requirements/py2.txt b/tests/requirements/py2.txt new file mode 100644 index 0000000000..a9f6804039 --- /dev/null +++ b/tests/requirements/py2.txt @@ -0,0 +1,2 @@ +-r base.txt +python-memcached diff --git a/tests/requirements/py3.txt b/tests/requirements/py3.txt new file mode 100644 index 0000000000..ced3eed101 --- /dev/null +++ b/tests/requirements/py3.txt @@ -0,0 +1,2 @@ +-r base.txt +python3-memcached diff --git a/tests/runtests.py b/tests/runtests.py index da4592ecc0..0d8df30bf7 100755 --- a/tests/runtests.py +++ b/tests/runtests.py @@ -22,6 +22,7 @@ TEMP_DIR = tempfile.mkdtemp(prefix='django_') os.environ['DJANGO_TEST_TEMP_DIR'] = TEMP_DIR SUBDIRS_TO_SKIP = [ + 'requirements', 'templates', 'test_discovery_sample', 'test_discovery_sample2', -- cgit v1.3