From patchwork Tue Sep 3 17:03:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Finucane X-Patchwork-Id: 1157169 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46NCw13hJLz9s00 for ; Wed, 4 Sep 2019 03:03:45 +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="qtvGfbWg"; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 46NCw12jqXzDqpy for ; Wed, 4 Sep 2019 03:03:45 +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=172.82.139.79; helo=qrelay79.mxroute.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="qtvGfbWg"; dkim-atps=neutral Received: from qrelay79.mxroute.com (qrelay79.mxroute.com [172.82.139.79]) (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 46NCvb5cGJzDqN8 for ; Wed, 4 Sep 2019 03:03:23 +1000 (AEST) Received: from filter002.mxroute.com (unknown [116.203.155.46]) by qrelay79.mxroute.com (Postfix) with ESMTP id B2611E07F1; Tue, 3 Sep 2019 13:03:20 -0400 (EDT) Received: from one.mxroute.com (one.mxroute.com [195.201.59.211]) by filter002.mxroute.com (Postfix) with ESMTPS id 1FE303F346; Tue, 3 Sep 2019 17:03:15 +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=fYl5bSlC40HaMTEfXfeP3e/joLnlxchM/8QZOZ8CCGU=; b=qtvGfbWgehq0YA8nCS/dRGAKCT hSM5WWomHI5fYQ94mep763e3lsXhry3hbC+hod8tmok5OmdsdIfIzeuTfvC0KdhqdkuGQHkAqhe8J 19+3KkM07P+EteYzckwy6qe1uFu3Uljhc5I0VJfiwFMxkQN7cKr6tfHlnuA6puVZ3ZPr9NoB7Pmft nv5L3AeWk8BRmDGahrePTdYf6AwTiKAOogWn1lnXKfPJjpJB5JVZ9ukSn1cPr+cUB3jKFqizabQiZ YQj//NSLRQwximv0rFANMn3lz/sRONDdDGGJLefRM2naMtFQG8UZ7ZZevLLLxuHK/GLbjXNXgRp6Q Gumc88lA==; From: Stephen Finucane To: patchwork@lists.ozlabs.org Subject: [PATCH 1/3] Drop support for Python 3.4, add Python 3.7 Date: Tue, 3 Sep 2019 18:03:02 +0100 Message-Id: <20190903170304.24325-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" It's no longer supported upstream and the *second* last Ubuntu LTS release provides something newer. Time to move on. Signed-off-by: Stephen Finucane --- README.rst | 4 ++-- docs/development/installation.rst | 6 +++--- requirements-dev.txt | 4 ++-- requirements-prod.txt | 4 ++-- tools/docker/Dockerfile | 5 ++--- tools/docker/trusty-ports.list | 3 --- tools/docker/trusty.list | 3 --- tox.ini | 4 ++-- 8 files changed, 13 insertions(+), 20 deletions(-) delete mode 100644 tools/docker/trusty-ports.list delete mode 100644 tools/docker/trusty.list diff --git a/README.rst b/README.rst index b45c3e6a..01da4196 100644 --- a/README.rst +++ b/README.rst @@ -41,9 +41,9 @@ of community projects. Requirements ------------ -- Python (2.7, 3.4 - 3.6) +- Python (2.7, 3.5 - 3.7) -- Django (1.11 - 2.0) +- Django (1.11 - 2.2) - Django REST Framework (3.6 - 3.9) diff --git a/docs/development/installation.rst b/docs/development/installation.rst index 0ab755f4..ed9ceb13 100644 --- a/docs/development/installation.rst +++ b/docs/development/installation.rst @@ -165,7 +165,7 @@ Python Requirements ^^^^^^^^^^^^^^^^^^^ To develop Python-based software you first need Python. Patchwork supports both -Python 2.7 and Python 3.4+. One of these will be installed by default on many +Python 2.7 and Python 3.5+. One of these will be installed by default on many installations, though they can also be installed manually using the ``python`` or ``python3`` packages. @@ -224,7 +224,7 @@ An example for installing all these packages and the MySQL RDBMS on Ubuntu python-tox mysql-server libmysqlclient-dev If you have an existing MariaDB/MySQL installation and have installed ``pip`` -already/are using Python 3.4+ then you can install all packages using ``pip``: +already/are using Python 3.5+ then you can install all packages using ``pip``: .. code-block:: shell @@ -254,7 +254,7 @@ virtual environment. This can be done like so: .. note:: If you installed a Python 3.x-based virtual environment package, adjust the - executable indicated above as necessary, e.g. ``virtualenv-3.4``. + executable indicated above as necessary, e.g. ``virtualenv-3.7``. Now install the packages. Patchwork provides three requirements files. diff --git a/requirements-dev.txt b/requirements-dev.txt index ce637549..ec539a6d 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,7 +1,7 @@ -Django==2.2.3; python_version >= '3.4' +Django==2.2.3; python_version >= '3.5' Django==1.11.22; python_version < '3.0' # pyup: ignore djangorestframework==3.9.2 -django-filter==2.1.0; python_version >= '3.4' +django-filter==2.1.0; python_version >= '3.5' django-filter==1.1.0; python_version < '3.0' # pyup: ignore django-debug-toolbar==1.11 django-dbbackup==3.2.0 diff --git a/requirements-prod.txt b/requirements-prod.txt index 13499785..c9bf1044 100644 --- a/requirements-prod.txt +++ b/requirements-prod.txt @@ -1,7 +1,7 @@ -Django==2.2.3; python_version >= '3.4' +Django==2.2.3; python_version >= '3.5' Django==1.11.22; python_version < '3.0' # pyup: ignore djangorestframework==3.9.2 -django-filter==2.1.0; python_version >= '3.4' +django-filter==2.1.0; python_version >= '3.5' django-filter==1.1.0; python_version < '3.0' # pyup: ignore psycopg2-binary==2.8.2 sqlparse==0.3.0 diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 76bb6b2b..81700711 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -17,14 +17,13 @@ ENV PYTHONUNBUFFERED 1 # System -# trusty and findutils is for python3.4; xenial is for python3.5 +# xenial is for python3.5 # TODO(stephenfin): Are curl, unzip required? COPY tools/docker/*.list /etc/apt/sources.list.d/ RUN cd /etc/apt/sources.list.d; \ echo $(uname -m) > /tmp/arch; \ if [ $(cat /tmp/arch) != 'x86_64' ] && grep -q -v "i.86" /tmp/arch; then \ - mv trusty-ports.list trusty.list; \ mv xenial-ports.list xenial.list; \ else \ rm *-ports.list; \ @@ -34,7 +33,7 @@ RUN apt-get update -qq && \ apt-get install -y --no-install-recommends --allow-downgrades \ python-dev python-pip python-setuptools python-wheel \ python3.5-dev python3-pip python3-setuptools python3-wheel \ - python3.4-dev findutils=4.4.2-7 python3.6-dev \ + python3.6-dev \ libmysqlclient-dev mysql-client curl unzip build-essential \ git postgresql-client tzdata libpq-dev diff --git a/tools/docker/trusty-ports.list b/tools/docker/trusty-ports.list deleted file mode 100644 index ebcf4fa4..00000000 --- a/tools/docker/trusty-ports.list +++ /dev/null @@ -1,3 +0,0 @@ -deb http://ports.ubuntu.com/ubuntu-ports/ trusty main -deb http://ports.ubuntu.com/ubuntu-ports/ trusty-updates main -deb http://ports.ubuntu.com/ubuntu-ports/ trusty-security main diff --git a/tools/docker/trusty.list b/tools/docker/trusty.list deleted file mode 100644 index 8bb92c09..00000000 --- a/tools/docker/trusty.list +++ /dev/null @@ -1,3 +0,0 @@ -deb http://archive.ubuntu.com/ubuntu/ trusty main -deb http://archive.ubuntu.com/ubuntu/ trusty-updates main -deb http://security.ubuntu.com/ubuntu trusty-security main diff --git a/tox.ini b/tox.ini index bfca0538..7742d1b8 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 2.0 -envlist = pep8,docs,py{27,34}-django111,py{35,36}-django{111,20,21,22} +envlist = pep8,docs,py{27}-django111,py{35,36,37}-django{111,20,21,22} skipsdist = True [testenv] @@ -8,7 +8,7 @@ deps = -r{toxinidir}/requirements-test.txt django111: django>=1.11,<2.0 django111: djangorestframework>=3.6,<3.10 - django111: django-filter>=1.0,<3.0; python_version >= '3.4' + django111: django-filter>=1.0,<3.0; python_version >= '3.5' django111: django-filter>=1.0,<2.0; python_version < '3.0' django20: django>=2.0,<2.1 django21: django>=2.1,<2.2