From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C7998138334 for ; Sat, 27 Apr 2019 19:20:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0D6F6E08B1; Sat, 27 Apr 2019 19:20:39 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E96D5E08B1 for ; Sat, 27 Apr 2019 19:20:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9DD70342A70 for ; Sat, 27 Apr 2019 19:20:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F3F31266 for ; Sat, 27 Apr 2019 19:20:35 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1556389304.875a23c347507bb963e89c6f22ff763063c9500b.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/__init__.py X-VCS-Directories: lib/portage/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 875a23c347507bb963e89c6f22ff763063c9500b X-VCS-Branch: master Date: Sat, 27 Apr 2019 19:20:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d9a9b42b-08df-4555-83d0-802e67555802 X-Archives-Hash: 0516adb9dc84e371fcc42038ac319742 commit: 875a23c347507bb963e89c6f22ff763063c9500b Author: Zac Medico gentoo org> AuthorDate: Sat Apr 27 17:49:37 2019 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Apr 27 18:21:44 2019 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=875a23c3 Format _testing,_deprecated_eapis one per line Signed-off-by: Zac Medico gentoo.org> lib/portage/__init__.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/lib/portage/__init__.py b/lib/portage/__init__.py index f361b9dcf..46077ea84 100644 --- a/lib/portage/__init__.py +++ b/lib/portage/__init__.py @@ -458,8 +458,21 @@ def abssymlink(symlink, target=None): _doebuild_manifest_exempt_depend = 0 -_testing_eapis = frozenset(["4-python", "4-slot-abi", "5-progress", "5-hdepend", "7_pre1", "7"]) -_deprecated_eapis = frozenset(["4_pre1", "3_pre2", "3_pre1", "5_pre1", "5_pre2", "6_pre1"]) +_testing_eapis = frozenset([ + "4-python", + "4-slot-abi", + "5-progress", + "5-hdepend", + "7_pre1", +]) +_deprecated_eapis = frozenset([ + "4_pre1", + "3_pre2", + "3_pre1", + "5_pre1", + "5_pre2", + "6_pre1", +]) _supported_eapis = frozenset([str(x) for x in range(portage.const.EAPI + 1)] + list(_testing_eapis) + list(_deprecated_eapis)) def _eapi_is_deprecated(eapi):