On 02/25/2018 11:59 AM, Michał Górny wrote: > Deprecated the testing variant of EAPI 6. > --- > pym/portage/__init__.py | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py > index 99f3f98ac..4773738b2 100644 > --- a/pym/portage/__init__.py > +++ b/pym/portage/__init__.py > @@ -1,4 +1,4 @@ > -# Copyright 1998-2014 Gentoo Foundation > +# Copyright 1998-2018 Gentoo Foundation > # Distributed under the terms of the GNU General Public License v2 > > from __future__ import unicode_literals > @@ -462,8 +462,8 @@ def abssymlink(symlink, target=None): > > _doebuild_manifest_exempt_depend = 0 > > -_testing_eapis = frozenset(["4-python", "4-slot-abi", "5-progress", > "5-hdepend", "6_pre1"]) > -_deprecated_eapis = frozenset(["4_pre1", "3_pre2", "3_pre1", "5_pre1", > "5_pre2"]) > +_testing_eapis = frozenset(["4-python", "4-slot-abi", "5-progress", > "5-hdepend"]) > +_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): >
Looks good, please merge. -- Thanks, Zac
