From patchwork Wed Jan 4 16:53:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Finucane X-Patchwork-Id: 711058 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3ttxjT1wKZz9t1Q for ; Thu, 5 Jan 2017 03:54:05 +1100 (AEDT) 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="LcMAY7gF"; dkim-atps=neutral Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id CB6C5BBD; Wed, 4 Jan 2017 16:54:03 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 35F41B73 for ; Wed, 4 Jan 2017 16:54:02 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from brown.birch.relay.mailchannels.net (brown.birch.relay.mailchannels.net [23.83.209.23]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 845E1A7 for ; Wed, 4 Jan 2017 16:54:01 +0000 (UTC) X-Sender-Id: mxroute|x-authuser|stephen@that.guru Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 883E61BC006 for ; Wed, 4 Jan 2017 16:54:00 +0000 (UTC) Received: from one.mxroute.com (ip-10-220-3-24.us-west-2.compute.internal [10.220.3.24]) by relay.mailchannels.net (Postfix) with ESMTPA id 071FA1C00A6 for ; Wed, 4 Jan 2017 16:53:59 +0000 (UTC) X-Sender-Id: mxroute|x-authuser|stephen@that.guru Received: from one.mxroute.com ([UNAVAILABLE]. [10.107.128.240]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384) by 0.0.0.0:2500 (trex/5.7.8); Wed, 04 Jan 2017 16:54:00 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: mxroute|x-authuser|stephen@that.guru X-MailChannels-Auth-Id: mxroute X-MC-Loop-Signature: 1483548840254:617515546 X-MC-Ingress-Time: 1483548840254 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=that.guru; s=default; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version :Content-Type:Content-Transfer-Encoding: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=fGIaM3qBpLhcMM21sBkh/uCY4YQs6BPwn+cF5/eS/TE=; b=LcMAY7gFAF1NP934xLr69knI8o OZz4WGZZ+mWsveEHKCoJxzuylrNzz/yhSKb1aD6hllWc/4T7BgRj3bYw7qn0KoB8aRVC1aJil0aq9 GUNuqcZehiLZmM7lUNvr7Jf5LWCe+CDFtyTCMDqkHh7MMeNzmlkS0LHlhstJl+tyu5ufS26SbMl5O RN9PejalJygCNB6xNMWW6+dHBtr1gJMJ5/9Dv9nqoZALwJnY3wVaSzEHPev3g4rwdkrCfRInhbSAS 9mQ0xQ3i6yjxuqRSr0ajOx3kNLz+W3t1hQ6cbdHUUhb7HBho/HGArtIafM0YGytdtVphCSIxplFNI i5Eo2Dbw==; From: Stephen Finucane To: dev@openvswitch.org Date: Wed, 4 Jan 2017 16:53:54 +0000 Message-Id: <20170104165354.22729-1-stephen@that.guru> X-Mailer: git-send-email 2.9.3 X-AuthUser: stephen@that.guru X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_NONE,T_DKIM_INVALID autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH] doc: Don't limit ourselves to flake8 2.x X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org There was a bug when using hacking with flake8 3.x. This bug has since been resolved [1], meaning we no longer need to call out the need to use the older version of flake8. [1] https://review.openstack.org/#/c/335965/ Signed-off-by: Stephen Finucane --- .travis/linux-prepare.sh | 5 +---- Documentation/intro/install/general.rst | 12 ++++-------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/.travis/linux-prepare.sh b/.travis/linux-prepare.sh index 1f2e3dd..1d0f75c 100755 --- a/.travis/linux-prepare.sh +++ b/.travis/linux-prepare.sh @@ -3,7 +3,4 @@ git clone git://git.kernel.org/pub/scm/devel/sparse/chrisl/sparse.git cd sparse && make && make install && cd .. -# Incompatibility between flake8 3.0.x and the hacking plugin: -# https://gitlab.com/pycqa/flake8/issues/153 -# https://bugs.launchpad.net/hacking/+bug/1607942 -pip install --disable-pip-version-check --user six "flake8<3.0" hacking +pip install --disable-pip-version-check --user six flake8 hacking diff --git a/Documentation/intro/install/general.rst b/Documentation/intro/install/general.rst index 95b70a1..4749832 100644 --- a/Documentation/intro/install/general.rst +++ b/Documentation/intro/install/general.rst @@ -147,14 +147,10 @@ following to obtain better warnings: - clang, version 3.4 or later -- flake8, version 2.X, along with the hacking flake8 plugin (for Python code). - The automatic flake8 check that runs against Python code has some warnings - enabled that come from the "hacking" flake8 plugin. If it's not installed, - the warnings just won't occur until it's run on a system with "hacking" - installed. Note that there are problems with flake8 3.0 and the "hacking" - plugin. To ensure you get flake8 2.X, you can use:: - - $ pip install 'flake8<3.0' +- flake8 along with the hacking flake8 plugin (for Python code). The automatic + flake8 check that runs against Python code has some warnings enabled that + come from the "hacking" flake8 plugin. If it's not installed, the warnings + just won't occur until it's run on a system with "hacking" installed. You may find the ovs-dev script found in ``utilities/ovs-dev.py`` useful.