From patchwork Tue Jun 30 08:52:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Finucane X-Patchwork-Id: 489600 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 69FCE1402CD for ; Tue, 30 Jun 2015 18:54:25 +1000 (AEST) Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4F9FE1A2B3F for ; Tue, 30 Jun 2015 18:54:25 +1000 (AEST) X-Original-To: patchwork@lists.ozlabs.org Delivered-To: patchwork@lists.ozlabs.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lists.ozlabs.org (Postfix) with ESMTP id 549C61A1DA6 for ; Tue, 30 Jun 2015 18:52:23 +1000 (AEST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP; 30 Jun 2015 01:52:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,376,1432623600"; d="scan'208";a="755700180" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga002.jf.intel.com with ESMTP; 30 Jun 2015 01:52:13 -0700 Received: from sivswdev01.ir.intel.com (sivswdev01.ir.intel.com [10.237.217.45]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id t5U8qDci030619; Tue, 30 Jun 2015 09:52:13 +0100 Received: from sivswdev01.ir.intel.com (localhost [127.0.0.1]) by sivswdev01.ir.intel.com with ESMTP id t5U8qCKT020322; Tue, 30 Jun 2015 09:52:12 +0100 Received: (from sfinucan@localhost) by sivswdev01.ir.intel.com with id t5U8qCRp020317; Tue, 30 Jun 2015 09:52:12 +0100 From: Stephen Finucane To: patchwork@lists.ozlabs.org Subject: [PATCH 02/11] tox: Update versions of Django to be tested Date: Tue, 30 Jun 2015 09:52:00 +0100 Message-Id: <1435654329-19960-3-git-send-email-stephen.finucane@intel.com> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1435654329-19960-1-git-send-email-stephen.finucane@intel.com> References: <1435654329-19960-1-git-send-email-stephen.finucane@intel.com> X-BeenThere: patchwork@lists.ozlabs.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Patchwork development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stephen Finucane MIME-Version: 1.0 Errors-To: patchwork-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Patchwork" Since patchwork now supports Django 1.8 and no longer support 1.5, we should update the tox targets to validate this new subset of supported Django versions. In addition, the paths to the requirements.txt files were not updated as part of a rebase. Correct this oversight. Signed-off-by: Stephen Finucane --- docs/requirements-base.txt | 2 +- docs/requirements-prod.txt | 2 +- tox.ini | 38 ++++++++++++++++++-------------------- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/docs/requirements-base.txt b/docs/requirements-base.txt index 77dc829..58b34ec 100644 --- a/docs/requirements-base.txt +++ b/docs/requirements-base.txt @@ -1,2 +1,2 @@ +MySQL-python==1.2.5 python-dateutil==1.5 -Django<1.8,>=1.7 diff --git a/docs/requirements-prod.txt b/docs/requirements-prod.txt index 24f97ce..f2c440a 100644 --- a/docs/requirements-prod.txt +++ b/docs/requirements-prod.txt @@ -1,2 +1,2 @@ -MySQL-python==1.2.5 +Django<1.9,>=1.8 -r requirements-base.txt diff --git a/tox.ini b/tox.ini index 485f7c7..11d8b67 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,23 @@ [tox] -envlist = {py27}-django{15,16,17}, pep8 +envlist = {py27}-django{16,17,18} skipsdist = True +[testenv] +basepython = + py27: python2.7 +deps = + -r{toxinidir}/docs/requirements-dev.txt + django16: django<1.7,>=1.6 + django17: django<1.8,>=1.7 + django18: django<1.9,>=1.8 +setenv = + DJANGO_SETTINGS_MODULE = patchwork.settings.dev +commands = + {toxinidir}/manage.py test '{posargs:patchwork}' + [testenv:pep8] -deps = flake8 +basepython = python2.7 +deps = flake commands = flake8 {posargs} [flake8] @@ -14,33 +28,17 @@ exclude = ./patchwork/tests basepython = python2.7 deps = pylint - -r{toxinidir}/docs/requirements-django-1.7-mysql.txt + -r{toxinidir}/docs/requirements-prod.txt commands = pylint patchwork --rcfile=pylint.rc [testenv:coverage] basepython = python2.7 deps = coverage - -r{toxinidir}/docs/requirements-django-1.6-mysql.txt + -r{toxinidir}/docs/requirements-prod.txt setenv = DJANGO_SETTINGS_MODULE = patchwork.settings.dev commands = coverage erase - {toxinidir}/manage.py syncdb coverage run --omit=*tox* --branch {toxinidir}/manage.py test patchwork coverage report -m - -[testenv] -basepython = - py27: python2.7 -commands = - {toxinidir}/manage.py syncdb - {toxinidir}/manage.py test patchwork -deps = - python-dateutil==1.5 - MySQL-python==1.2.5 - django15: django<1.6,>=1.5 - django16: django<1.7,>=1.6 - django17: django<1.8,>=1.7 -setenv = - DJANGO_SETTINGS_MODULE = patchwork.settings.dev