From c540f1bd31d068996196144ee9a618b90f1b55bf Mon Sep 17 00:00:00 2001 From: Bertrand Bordage Date: Mon, 28 Dec 2015 00:38:37 +0100 Subject: [PATCH] Updates test requirements to the latest Python 3 compatible ones. --- .travis.yml | 39 ++++++++++++++++--- benchmark.py | 4 +- benchmark_requirements.txt | 4 ++ benchmark_requirements_py2.txt | 4 -- benchmark_requirements_py3.txt | 4 -- ...ments_py2.txt => runtests_requirements.txt | 2 +- runtests_requirements_py3.txt | 7 ---- tox.ini | 13 +++---- 8 files changed, 45 insertions(+), 32 deletions(-) create mode 100644 benchmark_requirements.txt delete mode 100644 benchmark_requirements_py2.txt delete mode 100644 benchmark_requirements_py3.txt rename runtests_requirements_py2.txt => runtests_requirements.txt (84%) delete mode 100644 runtests_requirements_py3.txt diff --git a/.travis.yml b/.travis.yml index b613254..97e38f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,142 +13,169 @@ addons: postgresql: 9.4 env: - - TOXENV=py2.7-django1.7-sqlite3-pylibmc - - TOXENV=py2.7-django1.7-postgresql-pylibmc - - TOXENV=py2.7-django1.7-mysql-pylibmc - - TOXENV=py2.7-django1.8-sqlite3-pylibmc - - TOXENV=py2.7-django1.8-postgresql-pylibmc - - TOXENV=py2.7-django1.8-mysql-pylibmc - TOXENV=py2.7-django1.7-sqlite3-redis - TOXENV=py2.7-django1.7-sqlite3-memcached + - TOXENV=py2.7-django1.7-sqlite3-pylibmc - TOXENV=py2.7-django1.7-sqlite3-locmem - TOXENV=py2.7-django1.7-sqlite3-filebased - TOXENV=py2.7-django1.7-postgresql-redis - TOXENV=py2.7-django1.7-postgresql-memcached + - TOXENV=py2.7-django1.7-postgresql-pylibmc - TOXENV=py2.7-django1.7-postgresql-locmem - TOXENV=py2.7-django1.7-postgresql-filebased - TOXENV=py2.7-django1.7-mysql-redis - TOXENV=py2.7-django1.7-mysql-memcached + - TOXENV=py2.7-django1.7-mysql-pylibmc - TOXENV=py2.7-django1.7-mysql-locmem - TOXENV=py2.7-django1.7-mysql-filebased - TOXENV=py2.7-django1.8-sqlite3-redis - TOXENV=py2.7-django1.8-sqlite3-memcached + - TOXENV=py2.7-django1.8-sqlite3-pylibmc - TOXENV=py2.7-django1.8-sqlite3-locmem - TOXENV=py2.7-django1.8-sqlite3-filebased - TOXENV=py2.7-django1.8-postgresql-redis - TOXENV=py2.7-django1.8-postgresql-memcached + - TOXENV=py2.7-django1.8-postgresql-pylibmc - TOXENV=py2.7-django1.8-postgresql-locmem - TOXENV=py2.7-django1.8-postgresql-filebased - TOXENV=py2.7-django1.8-mysql-redis - TOXENV=py2.7-django1.8-mysql-memcached + - TOXENV=py2.7-django1.8-mysql-pylibmc - TOXENV=py2.7-django1.8-mysql-locmem - TOXENV=py2.7-django1.8-mysql-filebased - TOXENV=py3.2-django1.7-sqlite3-redis - TOXENV=py3.2-django1.7-sqlite3-memcached + - TOXENV=py3.2-django1.7-sqlite3-pylibmc - TOXENV=py3.2-django1.7-sqlite3-locmem - TOXENV=py3.2-django1.7-sqlite3-filebased - TOXENV=py3.2-django1.7-postgresql-redis - TOXENV=py3.2-django1.7-postgresql-memcached + - TOXENV=py3.2-django1.7-postgresql-pylibmc - TOXENV=py3.2-django1.7-postgresql-locmem - TOXENV=py3.2-django1.7-postgresql-filebased - TOXENV=py3.2-django1.7-mysql-redis - TOXENV=py3.2-django1.7-mysql-memcached + - TOXENV=py3.2-django1.7-mysql-pylibmc - TOXENV=py3.2-django1.7-mysql-locmem - TOXENV=py3.2-django1.7-mysql-filebased - TOXENV=py3.2-django1.8-sqlite3-redis - TOXENV=py3.2-django1.8-sqlite3-memcached + - TOXENV=py3.2-django1.8-sqlite3-pylibmc - TOXENV=py3.2-django1.8-sqlite3-locmem - TOXENV=py3.2-django1.8-sqlite3-filebased - TOXENV=py3.2-django1.8-postgresql-redis - TOXENV=py3.2-django1.8-postgresql-memcached + - TOXENV=py3.2-django1.8-postgresql-pylibmc - TOXENV=py3.2-django1.8-postgresql-locmem - TOXENV=py3.2-django1.8-postgresql-filebased - TOXENV=py3.2-django1.8-mysql-redis - TOXENV=py3.2-django1.8-mysql-memcached + - TOXENV=py3.2-django1.8-mysql-pylibmc - TOXENV=py3.2-django1.8-mysql-locmem - TOXENV=py3.2-django1.8-mysql-filebased - TOXENV=py3.3-django1.7-sqlite3-redis - TOXENV=py3.3-django1.7-sqlite3-memcached + - TOXENV=py3.3-django1.7-sqlite3-pylibmc - TOXENV=py3.3-django1.7-sqlite3-locmem - TOXENV=py3.3-django1.7-sqlite3-filebased - TOXENV=py3.3-django1.7-postgresql-redis - TOXENV=py3.3-django1.7-postgresql-memcached + - TOXENV=py3.3-django1.7-postgresql-pylibmc - TOXENV=py3.3-django1.7-postgresql-locmem - TOXENV=py3.3-django1.7-postgresql-filebased - TOXENV=py3.3-django1.7-mysql-redis - TOXENV=py3.3-django1.7-mysql-memcached + - TOXENV=py3.3-django1.7-mysql-pylibmc - TOXENV=py3.3-django1.7-mysql-locmem - TOXENV=py3.3-django1.7-mysql-filebased - TOXENV=py3.3-django1.8-sqlite3-redis - TOXENV=py3.3-django1.8-sqlite3-memcached + - TOXENV=py3.3-django1.8-sqlite3-pylibmc - TOXENV=py3.3-django1.8-sqlite3-locmem - TOXENV=py3.3-django1.8-sqlite3-filebased - TOXENV=py3.3-django1.8-postgresql-redis - TOXENV=py3.3-django1.8-postgresql-memcached + - TOXENV=py3.3-django1.8-postgresql-pylibmc - TOXENV=py3.3-django1.8-postgresql-locmem - TOXENV=py3.3-django1.8-postgresql-filebased - TOXENV=py3.3-django1.8-mysql-redis - TOXENV=py3.3-django1.8-mysql-memcached + - TOXENV=py3.3-django1.8-mysql-pylibmc - TOXENV=py3.3-django1.8-mysql-locmem - TOXENV=py3.3-django1.8-mysql-filebased - TOXENV=py3.4-django1.7-sqlite3-redis - TOXENV=py3.4-django1.7-sqlite3-memcached + - TOXENV=py3.4-django1.7-sqlite3-pylibmc - TOXENV=py3.4-django1.7-sqlite3-locmem - TOXENV=py3.4-django1.7-sqlite3-filebased - TOXENV=py3.4-django1.7-postgresql-redis - TOXENV=py3.4-django1.7-postgresql-memcached + - TOXENV=py3.4-django1.7-postgresql-pylibmc - TOXENV=py3.4-django1.7-postgresql-locmem - TOXENV=py3.4-django1.7-postgresql-filebased - TOXENV=py3.4-django1.7-mysql-redis - TOXENV=py3.4-django1.7-mysql-memcached + - TOXENV=py3.4-django1.7-mysql-pylibmc - TOXENV=py3.4-django1.7-mysql-locmem - TOXENV=py3.4-django1.7-mysql-filebased - TOXENV=py3.4-django1.8-sqlite3-redis - TOXENV=py3.4-django1.8-sqlite3-memcached + - TOXENV=py3.4-django1.8-sqlite3-pylibmc - TOXENV=py3.4-django1.8-sqlite3-locmem - TOXENV=py3.4-django1.8-sqlite3-filebased - TOXENV=py3.4-django1.8-postgresql-redis - TOXENV=py3.4-django1.8-postgresql-memcached + - TOXENV=py3.4-django1.8-postgresql-pylibmc - TOXENV=py3.4-django1.8-postgresql-locmem - TOXENV=py3.4-django1.8-postgresql-filebased - TOXENV=py3.4-django1.8-mysql-redis - TOXENV=py3.4-django1.8-mysql-memcached + - TOXENV=py3.4-django1.8-mysql-pylibmc - TOXENV=py3.4-django1.8-mysql-locmem - TOXENV=py3.4-django1.8-mysql-filebased - TOXENV=py2.7-django1.9-sqlite3-redis - TOXENV=py2.7-django1.9-sqlite3-memcached + - TOXENV=py2.7-django1.9-sqlite3-pylibmc - TOXENV=py2.7-django1.9-sqlite3-locmem - TOXENV=py2.7-django1.9-sqlite3-filebased - TOXENV=py2.7-django1.9-postgresql-redis - TOXENV=py2.7-django1.9-postgresql-memcached + - TOXENV=py2.7-django1.9-postgresql-pylibmc - TOXENV=py2.7-django1.9-postgresql-locmem - TOXENV=py2.7-django1.9-postgresql-filebased - TOXENV=py2.7-django1.9-mysql-redis - TOXENV=py2.7-django1.9-mysql-memcached + - TOXENV=py2.7-django1.9-mysql-pylibmc - TOXENV=py2.7-django1.9-mysql-locmem - TOXENV=py2.7-django1.9-mysql-filebased - TOXENV=py3.4-django1.9-sqlite3-redis - TOXENV=py3.4-django1.9-sqlite3-memcached + - TOXENV=py3.4-django1.9-sqlite3-pylibmc - TOXENV=py3.4-django1.9-sqlite3-locmem - TOXENV=py3.4-django1.9-sqlite3-filebased - TOXENV=py3.4-django1.9-postgresql-redis - TOXENV=py3.4-django1.9-postgresql-memcached + - TOXENV=py3.4-django1.9-postgresql-pylibmc - TOXENV=py3.4-django1.9-postgresql-locmem - TOXENV=py3.4-django1.9-postgresql-filebased - TOXENV=py3.4-django1.9-mysql-redis - TOXENV=py3.4-django1.9-mysql-memcached + - TOXENV=py3.4-django1.9-mysql-pylibmc - TOXENV=py3.4-django1.9-mysql-locmem - TOXENV=py3.4-django1.9-mysql-filebased - TOXENV=py3.5-django1.9-sqlite3-redis - TOXENV=py3.5-django1.9-sqlite3-memcached + - TOXENV=py3.5-django1.9-sqlite3-pylibmc - TOXENV=py3.5-django1.9-sqlite3-locmem - TOXENV=py3.5-django1.9-sqlite3-filebased - TOXENV=py3.5-django1.9-postgresql-redis - TOXENV=py3.5-django1.9-postgresql-memcached + - TOXENV=py3.5-django1.9-postgresql-pylibmc - TOXENV=py3.5-django1.9-postgresql-locmem - TOXENV=py3.5-django1.9-postgresql-filebased - TOXENV=py3.5-django1.9-mysql-redis - TOXENV=py3.5-django1.9-mysql-memcached + - TOXENV=py3.5-django1.9-mysql-pylibmc - TOXENV=py3.5-django1.9-mysql-locmem - TOXENV=py3.5-django1.9-mysql-filebased diff --git a/benchmark.py b/benchmark.py index 8d31b48..b4d0fae 100755 --- a/benchmark.py +++ b/benchmark.py @@ -25,7 +25,7 @@ from django.db import connections, connection from django.test.utils import CaptureQueriesContext, override_settings from django.utils.encoding import force_text import matplotlib.pyplot as plt -import MySQLdb +import _mysql import pandas as pd import psycopg2 @@ -83,7 +83,7 @@ def write_conditions(): versions.update(( ('psycopg2', psycopg2.__version__.split()[0]), - ('MySQLdb', MySQLdb.__version__), + ('mysqlclient', _mysql.__version__), )) with io.open(os.path.join('benchmark', 'conditions.rst'), 'w') as f: diff --git a/benchmark_requirements.txt b/benchmark_requirements.txt new file mode 100644 index 0000000..606541e --- /dev/null +++ b/benchmark_requirements.txt @@ -0,0 +1,4 @@ +-r runtests_requirements.txt + +pandas +matplotlib diff --git a/benchmark_requirements_py2.txt b/benchmark_requirements_py2.txt deleted file mode 100644 index 7c1be62..0000000 --- a/benchmark_requirements_py2.txt +++ /dev/null @@ -1,4 +0,0 @@ --r runtests_requirements_py2.txt - -pandas -matplotlib diff --git a/benchmark_requirements_py3.txt b/benchmark_requirements_py3.txt deleted file mode 100644 index ff1fa95..0000000 --- a/benchmark_requirements_py3.txt +++ /dev/null @@ -1,4 +0,0 @@ --r runtests_requirements_py3.txt - -pandas -matplotlib diff --git a/runtests_requirements_py2.txt b/runtests_requirements.txt similarity index 84% rename from runtests_requirements_py2.txt rename to runtests_requirements.txt index a3fd0f6..ad6a1a3 100644 --- a/runtests_requirements_py2.txt +++ b/runtests_requirements.txt @@ -1,7 +1,7 @@ -r requirements.txt psycopg2 -MySQL-python +mysqlclient django-redis python-memcached pylibmc diff --git a/runtests_requirements_py3.txt b/runtests_requirements_py3.txt deleted file mode 100644 index 483ecef..0000000 --- a/runtests_requirements_py3.txt +++ /dev/null @@ -1,7 +0,0 @@ --r requirements.txt - -psycopg2 -https://github.com/clelland/MySQL-for-Python-3/tarball/master -django-redis -python3-memcached -pytz diff --git a/tox.ini b/tox.ini index 43ed13a..6e378ed 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,7 @@ [tox] envlist = - py2.7-django{1.7,1.8}-{sqlite3,postgresql,mysql}-pylibmc, - py{2.7,3.2,3.3,3.4}-django{1.7,1.8}-{sqlite3,postgresql,mysql}-{redis,memcached,locmem,filebased}, - py{2.7,3.4,3.5}-django1.9-{sqlite3,postgresql,mysql}-{redis,memcached,locmem,filebased}, + py{2.7,3.2,3.3,3.4}-django{1.7,1.8}-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased}, + py{2.7,3.4,3.5}-django1.9-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased}, [testenv] basepython = @@ -16,13 +15,11 @@ deps = django1.8: Django>=1.8,<1.9 django1.9: Django>=1.9,<1.10 psycopg2 + mysqlclient django-redis + python-memcached + pylibmc pytz - py2.7: MySQL-python - py2.7: python-memcached - py2.7: pylibmc - py{3.2,3.3,3.4,3.5}: https://github.com/clelland/MySQL-for-Python-3/tarball/master - py{3.2,3.3,3.4,3.5}: python3-memcached py3.2: coverage<4.0 py{2.7,3.3,3.4,3.5}: coverage setenv =