From patchwork Thu Nov 15 13:58:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 998330 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=konsulko.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42wjd06hmLz9s9G for ; Fri, 16 Nov 2018 00:58:28 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 9DAFBC22326; Thu, 15 Nov 2018 13:58:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id E47ECC221FF; Thu, 15 Nov 2018 13:58:22 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9F878C221FE; Thu, 15 Nov 2018 13:58:21 +0000 (UTC) Received: from mail-yw1-f67.google.com (mail-yw1-f67.google.com [209.85.161.67]) by lists.denx.de (Postfix) with ESMTPS id 119BEC221FA for ; Thu, 15 Nov 2018 13:58:21 +0000 (UTC) Received: by mail-yw1-f67.google.com with SMTP id r199so1058542ywe.4 for ; Thu, 15 Nov 2018 05:58:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=8h2BDGiQGSrEGpgFKg6Kyki2pJM4jVfWO3ikq+De8Cc=; b=lkkxlan+MCytSLFQhfLJ5h0J0mqwGECmG+nCKmlpwIe2tMOvWU3sq6K8DxWU3VU/eC rvgOaYlg8kElQ0pmlMTSeRW7hpCy5Eu2YftdahkM42yxc3ws+PhJxxcyoIu/qrw1Wbad Amj8oGc9ZGb95vGVr1TVkeCCQYz0cuE47WOD6jxJyukWzgD5bxPsOgCPofAH0JYp9i7T zKnbp/ATu4lp+CS/Pq25oOmoNxDvmZurVsuJk/VdQHw9TzLmwAo6aKQUy2ZqOW/x1otf 1+wiuNJL6yG1HT6GRQgKjUFabh8bdgqw/3rLbdN5ZCPMDVHLD0E6IicQUTrgsVZX/wd4 WxAQ== X-Gm-Message-State: AGRZ1gKiN5cW4JDgY9XoqQLLjmNgHtj9iK/r7qU+Rl+XMchLDQjrnbH8 RZFya16wNtrik1mJgpG4xtSUf4U= X-Google-Smtp-Source: AJdET5cpfmRCgGr8Gg1pTcNl1TF8JSxVBjDkBEZc2AOEVoTm/kgtqh51Lqmi/SG4+K/cWXBW03WFrQ== X-Received: by 2002:a0d:e60a:: with SMTP id p10mr3782302ywe.22.1542290298979; Thu, 15 Nov 2018 05:58:18 -0800 (PST) Received: from bill-the-cat.ec.rr.com (cpe-65-184-133-47.ec.res.rr.com. [65.184.133.47]) by smtp.gmail.com with ESMTPSA id i8-v6sm3742959ywa.106.2018.11.15.05.58.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 Nov 2018 05:58:18 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Date: Thu, 15 Nov 2018 08:58:15 -0500 Message-Id: <1542290295-26953-1-git-send-email-trini@konsulko.com> X-Mailer: git-send-email 2.7.4 Subject: [U-Boot] [PATCH] travis: Ensure we use pytest 2.8.7 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The latest version of pytest (4.0.0) makes some of the code we have in test/py/conftest.py a fatal error that needs to be migrated. Unfortunately this in turn requires changes that don't exist in older versions of pytest such as 2.8.7 that ships with Ubuntu 16.04. Force travis to use this older version of pytest. Signed-off-by: Tom Rini --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6ce2ef7fbaaa..a061f02399c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,7 +47,7 @@ install: - cat ~/.buildman - virtualenv /tmp/venv - . /tmp/venv/bin/activate - - pip install pytest + - pip install pytest==2.8.7 - pip install python-subunit - grub-mkimage -o ~/grub_x86.efi -O i386-efi normal echo lsefimmap lsefi lsefisystab efinet tftp minicmd - grub-mkimage -o ~/grub_x64.efi -O x86_64-efi normal echo lsefimmap lsefi lsefisystab efinet tftp minicmd