From patchwork Sat Jun 8 17:36:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Finucane X-Patchwork-Id: 1112504 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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45Lmm92NgZz9sBb for ; Sun, 9 Jun 2019 03:36:41 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=that.guru Authentication-Results: ozlabs.org; dkim=fail reason="key not found in DNS" (0-bit key; unprotected) header.d=that.guru header.i=@that.guru header.b="LmdFxQyo"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 45Lmm90bvszDqwY for ; Sun, 9 Jun 2019 03:36:41 +1000 (AEST) X-Original-To: patchwork@lists.ozlabs.org Delivered-To: patchwork@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=none (mailfrom) smtp.mailfrom=that.guru (client-ip=199.181.239.132; helo=relay0132.mxlogin.com; envelope-from=stephen@that.guru; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=that.guru Authentication-Results: lists.ozlabs.org; dkim=fail reason="key not found in DNS" (0-bit key; unprotected) header.d=that.guru header.i=@that.guru header.b="LmdFxQyo"; dkim-atps=neutral Received: from relay0132.mxlogin.com (relay0132.mxlogin.com [199.181.239.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 45Lmm22xqRzDqf1 for ; Sun, 9 Jun 2019 03:36:33 +1000 (AEST) Received: from filter002.mxroute.com (unknown [94.130.183.33]) by relay0132.mxlogin.com (Postfix) with ESMTP id 3638ACC2030E for ; Sat, 8 Jun 2019 12:36:30 -0500 (CDT) Received: from one.mxroute.com (one.mxroute.com [195.201.59.211]) by filter002.mxroute.com (Postfix) with ESMTPS id EF1D63F01B for ; Sat, 8 Jun 2019 17:36:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=that.guru; s=default; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject: Cc:To:From:Sender:Reply-To:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=S1iK8KjBC16PsGFNUTYm0RNptlOdBCXtHPU7sP3JiYc=; b=LmdFxQyoFQQWS3I7CDHpaYvjaO P0mA5ynQqeDtwxAE7qo+3Ze0XK6dfz1qkXpTsHXST0e5+GZauSZLyKOzjiLVkHXgLVp9LqXTzczGs lXnHLkQv3Kyw4uVfZq5wgOWQl7es5NOsYc+iFiFEIZYfgsyqYpXbkloGllVFDplh3JiYORy7JQYjw AVoM+L6MTXeM2TDy7UtxeI3JiLw2KHnU7LiOY7PPQ+bzxzjuSFsQaDZj3GcpWtTKFvf83uMWgVez4 XHlTyoIZjkNxNvcRU8ijuDTXgQPVsRTdu2jyob1UBaTrAmBsQugYO0Ch0BkuBhOlJLpMioI6/Bj4J YDdECU7A==; From: Stephen Finucane To: patchwork@lists.ozlabs.org Subject: [PATCH v3 0/5] Integrate tox-docker Date: Sat, 8 Jun 2019 18:36:17 +0100 Message-Id: <20190608173622.6711-1-stephen@that.guru> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-AuthUser: stephen@that.guru X-BeenThere: patchwork@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Patchwork development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: patchwork-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Patchwork" Testing Patchwork is still way more difficult than it should be. Docker has massively simplified things but we're still unable to do things like run 'tox -e py27' like we can most other Python projects. Take another step towards this by integrating 'tox-docker' so we can do e.g. 'tox -e py27-django11-mysql' Changes since v2: - Fix issues with '-mysql' environments - Additional fixes to work around issues highlighted by MySQL 8.0 - General cleanup Changes since v1: - Don't switch to PyMySQL since performance is worse Stephen Finucane (5): forms: Don't attempt to evaluate State at startup migrations: Correct 'unique_together' order in '0015' docker: *Really* don't require rebuilding if unncessary tox: Integrate tox-docker docker-compose: Massively simplify docs/development/contributing.rst | 28 +++++-------------- docs/development/installation.rst | 6 ---- patchwork/forms.py | 3 +- .../migrations/0015_add_series_models.py | 2 +- patchwork/settings/dev.py | 12 ++++++++ tools/docker/Dockerfile | 27 +++--------------- tools/docker/entrypoint.sh | 6 ++-- tools/docker/trusty-ports.list | 3 -- tools/docker/trusty.list | 3 -- tools/docker/xenial-ports.list | 3 -- tools/docker/xenial.list | 3 -- tox.ini | 25 +++++++++++++---- 12 files changed, 50 insertions(+), 71 deletions(-) delete mode 100644 tools/docker/trusty-ports.list delete mode 100644 tools/docker/trusty.list delete mode 100644 tools/docker/xenial-ports.list delete mode 100644 tools/docker/xenial.list