Updates test requirements to the latest Python 3 compatible ones.

This commit is contained in:
Bertrand Bordage 2015-12-28 00:38:37 +01:00
parent 2ef0252e9a
commit c540f1bd31
8 changed files with 45 additions and 32 deletions

View File

@ -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

View File

@ -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:

View File

@ -0,0 +1,4 @@
-r runtests_requirements.txt
pandas
matplotlib

View File

@ -1,4 +0,0 @@
-r runtests_requirements_py2.txt
pandas
matplotlib

View File

@ -1,4 +0,0 @@
-r runtests_requirements_py3.txt
pandas
matplotlib

View File

@ -1,7 +1,7 @@
-r requirements.txt
psycopg2
MySQL-python
mysqlclient
django-redis
python-memcached
pylibmc

View File

@ -1,7 +0,0 @@
-r requirements.txt
psycopg2
https://github.com/clelland/MySQL-for-Python-3/tarball/master
django-redis
python3-memcached
pytz

13
tox.ini
View File

@ -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 =