commit: 75d6df1a2988ba440feed3db02550b62ebe0c204 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Tue May 1 18:18:49 2018 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Tue May 1 18:22:45 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=75d6df1a
Enable EAPI 7 (bug 654472) Bug: https://bugs.gentoo.org/654472 pym/portage/__init__.py | 2 +- pym/portage/const.py | 2 +- pym/portage/tests/emerge/test_simple.py | 6 +++--- pym/portage/tests/resolver/test_eapi.py | 2 +- pym/portage/tests/resolver/test_required_use.py | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 15c404f6f..166bfc700 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -462,7 +462,7 @@ def abssymlink(symlink, target=None): _doebuild_manifest_exempt_depend = 0 -_testing_eapis = frozenset(["4-python", "4-slot-abi", "5-progress", "5-hdepend", "7_pre1"]) +_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"]) _supported_eapis = frozenset([str(x) for x in range(portage.const.EAPI + 1)] + list(_testing_eapis) + list(_deprecated_eapis)) diff --git a/pym/portage/const.py b/pym/portage/const.py index 16922a5e6..7f84bf0e9 100644 --- a/pym/portage/const.py +++ b/pym/portage/const.py @@ -204,7 +204,7 @@ SUPPORTED_FEATURES = frozenset([ "xattr", ]) -EAPI = 6 +EAPI = 7 HASHING_BLOCKSIZE = 32768 diff --git a/pym/portage/tests/emerge/test_simple.py b/pym/portage/tests/emerge/test_simple.py index 495e22297..204c23296 100644 --- a/pym/portage/tests/emerge/test_simple.py +++ b/pym/portage/tests/emerge/test_simple.py @@ -1,4 +1,4 @@ -# Copyright 2011-2015 Gentoo Foundation +# Copyright 2011-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 import subprocess @@ -116,13 +116,13 @@ pkg_preinst() { "MISC_CONTENT": install_something, }, "dev-libs/C-1": { - "EAPI" : "7_pre1", + "EAPI" : "7", "KEYWORDS": "~x86", "RDEPEND": "dev-libs/D[flag]", "MISC_CONTENT": install_something, }, "dev-libs/D-1": { - "EAPI" : "7_pre1", + "EAPI" : "7", "KEYWORDS": "~x86", "IUSE" : "flag", "MISC_CONTENT": install_something, diff --git a/pym/portage/tests/resolver/test_eapi.py b/pym/portage/tests/resolver/test_eapi.py index fce05890b..50b9d90da 100644 --- a/pym/portage/tests/resolver/test_eapi.py +++ b/pym/portage/tests/resolver/test_eapi.py @@ -62,7 +62,7 @@ class EAPITestCase(TestCase): #EAPI-7: implicit || ( ) no longer satisfies deps "dev-libs/C-1": { "EAPI": "6", "IUSE": "foo", "RDEPEND": "|| ( foo? ( dev-libs/B ) )" }, - "dev-libs/C-2": { "EAPI": "7_pre1", "IUSE": "foo", "RDEPEND": "|| ( foo? ( dev-libs/B ) )" }, + "dev-libs/C-2": { "EAPI": "7", "IUSE": "foo", "RDEPEND": "|| ( foo? ( dev-libs/B ) )" }, } test_cases = ( diff --git a/pym/portage/tests/resolver/test_required_use.py b/pym/portage/tests/resolver/test_required_use.py index 7909f927f..c679ce300 100644 --- a/pym/portage/tests/resolver/test_required_use.py +++ b/pym/portage/tests/resolver/test_required_use.py @@ -51,9 +51,9 @@ class RequiredUSETestCase(TestCase): "dev-libs/E-4" : {"EAPI": "5", "IUSE": "+foo +bar", "REQUIRED_USE": "?? ( foo bar )"}, "dev-libs/E-5" : {"EAPI": "5", "IUSE": "+foo +bar", "REQUIRED_USE": "?? ( )"}, - "dev-libs/F-1" : {"EAPI": "7_pre1", "IUSE": "+foo +bar", "REQUIRED_USE": "|| ( )"}, - "dev-libs/F-2" : {"EAPI": "7_pre1", "IUSE": "+foo +bar", "REQUIRED_USE": "^^ ( )"}, - "dev-libs/F-3" : {"EAPI": "7_pre1", "IUSE": "+foo +bar", "REQUIRED_USE": "?? ( )"}, + "dev-libs/F-1" : {"EAPI": "7", "IUSE": "+foo +bar", "REQUIRED_USE": "|| ( )"}, + "dev-libs/F-2" : {"EAPI": "7", "IUSE": "+foo +bar", "REQUIRED_USE": "^^ ( )"}, + "dev-libs/F-3" : {"EAPI": "7", "IUSE": "+foo +bar", "REQUIRED_USE": "?? ( )"}, } test_cases = (
