| 1 |
commit: 75d6df1a2988ba440feed3db02550b62ebe0c204 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 1 18:18:49 2018 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 1 18:22:45 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=75d6df1a |
| 7 |
|
| 8 |
Enable EAPI 7 (bug 654472) |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/654472 |
| 11 |
|
| 12 |
pym/portage/__init__.py | 2 +- |
| 13 |
pym/portage/const.py | 2 +- |
| 14 |
pym/portage/tests/emerge/test_simple.py | 6 +++--- |
| 15 |
pym/portage/tests/resolver/test_eapi.py | 2 +- |
| 16 |
pym/portage/tests/resolver/test_required_use.py | 6 +++--- |
| 17 |
5 files changed, 9 insertions(+), 9 deletions(-) |
| 18 |
|
| 19 |
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py |
| 20 |
index 15c404f6f..166bfc700 100644 |
| 21 |
--- a/pym/portage/__init__.py |
| 22 |
+++ b/pym/portage/__init__.py |
| 23 |
@@ -462,7 +462,7 @@ def abssymlink(symlink, target=None): |
| 24 |
|
| 25 |
_doebuild_manifest_exempt_depend = 0 |
| 26 |
|
| 27 |
-_testing_eapis = frozenset(["4-python", "4-slot-abi", "5-progress", "5-hdepend", "7_pre1"]) |
| 28 |
+_testing_eapis = frozenset(["4-python", "4-slot-abi", "5-progress", "5-hdepend", "7_pre1", "7"]) |
| 29 |
_deprecated_eapis = frozenset(["4_pre1", "3_pre2", "3_pre1", "5_pre1", "5_pre2", "6_pre1"]) |
| 30 |
_supported_eapis = frozenset([str(x) for x in range(portage.const.EAPI + 1)] + list(_testing_eapis) + list(_deprecated_eapis)) |
| 31 |
|
| 32 |
|
| 33 |
diff --git a/pym/portage/const.py b/pym/portage/const.py |
| 34 |
index 16922a5e6..7f84bf0e9 100644 |
| 35 |
--- a/pym/portage/const.py |
| 36 |
+++ b/pym/portage/const.py |
| 37 |
@@ -204,7 +204,7 @@ SUPPORTED_FEATURES = frozenset([ |
| 38 |
"xattr", |
| 39 |
]) |
| 40 |
|
| 41 |
-EAPI = 6 |
| 42 |
+EAPI = 7 |
| 43 |
|
| 44 |
HASHING_BLOCKSIZE = 32768 |
| 45 |
|
| 46 |
|
| 47 |
diff --git a/pym/portage/tests/emerge/test_simple.py b/pym/portage/tests/emerge/test_simple.py |
| 48 |
index 495e22297..204c23296 100644 |
| 49 |
--- a/pym/portage/tests/emerge/test_simple.py |
| 50 |
+++ b/pym/portage/tests/emerge/test_simple.py |
| 51 |
@@ -1,4 +1,4 @@ |
| 52 |
-# Copyright 2011-2015 Gentoo Foundation |
| 53 |
+# Copyright 2011-2018 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
|
| 56 |
import subprocess |
| 57 |
@@ -116,13 +116,13 @@ pkg_preinst() { |
| 58 |
"MISC_CONTENT": install_something, |
| 59 |
}, |
| 60 |
"dev-libs/C-1": { |
| 61 |
- "EAPI" : "7_pre1", |
| 62 |
+ "EAPI" : "7", |
| 63 |
"KEYWORDS": "~x86", |
| 64 |
"RDEPEND": "dev-libs/D[flag]", |
| 65 |
"MISC_CONTENT": install_something, |
| 66 |
}, |
| 67 |
"dev-libs/D-1": { |
| 68 |
- "EAPI" : "7_pre1", |
| 69 |
+ "EAPI" : "7", |
| 70 |
"KEYWORDS": "~x86", |
| 71 |
"IUSE" : "flag", |
| 72 |
"MISC_CONTENT": install_something, |
| 73 |
|
| 74 |
diff --git a/pym/portage/tests/resolver/test_eapi.py b/pym/portage/tests/resolver/test_eapi.py |
| 75 |
index fce05890b..50b9d90da 100644 |
| 76 |
--- a/pym/portage/tests/resolver/test_eapi.py |
| 77 |
+++ b/pym/portage/tests/resolver/test_eapi.py |
| 78 |
@@ -62,7 +62,7 @@ class EAPITestCase(TestCase): |
| 79 |
|
| 80 |
#EAPI-7: implicit || ( ) no longer satisfies deps |
| 81 |
"dev-libs/C-1": { "EAPI": "6", "IUSE": "foo", "RDEPEND": "|| ( foo? ( dev-libs/B ) )" }, |
| 82 |
- "dev-libs/C-2": { "EAPI": "7_pre1", "IUSE": "foo", "RDEPEND": "|| ( foo? ( dev-libs/B ) )" }, |
| 83 |
+ "dev-libs/C-2": { "EAPI": "7", "IUSE": "foo", "RDEPEND": "|| ( foo? ( dev-libs/B ) )" }, |
| 84 |
} |
| 85 |
|
| 86 |
test_cases = ( |
| 87 |
|
| 88 |
diff --git a/pym/portage/tests/resolver/test_required_use.py b/pym/portage/tests/resolver/test_required_use.py |
| 89 |
index 7909f927f..c679ce300 100644 |
| 90 |
--- a/pym/portage/tests/resolver/test_required_use.py |
| 91 |
+++ b/pym/portage/tests/resolver/test_required_use.py |
| 92 |
@@ -51,9 +51,9 @@ class RequiredUSETestCase(TestCase): |
| 93 |
"dev-libs/E-4" : {"EAPI": "5", "IUSE": "+foo +bar", "REQUIRED_USE": "?? ( foo bar )"}, |
| 94 |
"dev-libs/E-5" : {"EAPI": "5", "IUSE": "+foo +bar", "REQUIRED_USE": "?? ( )"}, |
| 95 |
|
| 96 |
- "dev-libs/F-1" : {"EAPI": "7_pre1", "IUSE": "+foo +bar", "REQUIRED_USE": "|| ( )"}, |
| 97 |
- "dev-libs/F-2" : {"EAPI": "7_pre1", "IUSE": "+foo +bar", "REQUIRED_USE": "^^ ( )"}, |
| 98 |
- "dev-libs/F-3" : {"EAPI": "7_pre1", "IUSE": "+foo +bar", "REQUIRED_USE": "?? ( )"}, |
| 99 |
+ "dev-libs/F-1" : {"EAPI": "7", "IUSE": "+foo +bar", "REQUIRED_USE": "|| ( )"}, |
| 100 |
+ "dev-libs/F-2" : {"EAPI": "7", "IUSE": "+foo +bar", "REQUIRED_USE": "^^ ( )"}, |
| 101 |
+ "dev-libs/F-3" : {"EAPI": "7", "IUSE": "+foo +bar", "REQUIRED_USE": "?? ( )"}, |
| 102 |
} |
| 103 |
|
| 104 |
test_cases = ( |
Archives