| 1 |
commit: ef96b71d7cce0525cb76025ccb67a5f08f4e4d72 |
| 2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 2 00:50:25 2016 +0000 |
| 4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 2 00:50:25 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef96b71d |
| 7 |
|
| 8 |
app-admin/salt: Sync 9999 ebuild to latest version |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.2 |
| 11 |
|
| 12 |
app-admin/salt/salt-9999.ebuild | 51 ++++++++++++++++++++++++++++++----------- |
| 13 |
1 file changed, 38 insertions(+), 13 deletions(-) |
| 14 |
|
| 15 |
diff --git a/app-admin/salt/salt-9999.ebuild b/app-admin/salt/salt-9999.ebuild |
| 16 |
index fa3262c..f6ea995 100644 |
| 17 |
--- a/app-admin/salt/salt-9999.ebuild |
| 18 |
+++ b/app-admin/salt/salt-9999.ebuild |
| 19 |
@@ -1,9 +1,9 @@ |
| 20 |
-# Copyright 1999-2015 Gentoo Foundation |
| 21 |
+# Copyright 1999-2016 Gentoo Foundation |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
# $Id$ |
| 24 |
|
| 25 |
-EAPI=5 |
| 26 |
-PYTHON_COMPAT=(python2_7) |
| 27 |
+EAPI=6 |
| 28 |
+PYTHON_COMPAT=( python2_7 ) |
| 29 |
|
| 30 |
inherit eutils systemd distutils-r1 |
| 31 |
|
| 32 |
@@ -24,7 +24,7 @@ fi |
| 33 |
LICENSE="Apache-2.0" |
| 34 |
SLOT="0" |
| 35 |
IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" |
| 36 |
-IUSE+=" openssl profile redis selinux test timelib raet +zeromq vim-syntax" |
| 37 |
+IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax" |
| 38 |
|
| 39 |
RDEPEND="sys-apps/pciutils |
| 40 |
dev-python/jinja[${PYTHON_USEDEP}] |
| 41 |
@@ -38,7 +38,7 @@ RDEPEND="sys-apps/pciutils |
| 42 |
libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) |
| 43 |
mako? ( dev-python/mako[${PYTHON_USEDEP}] ) |
| 44 |
ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
| 45 |
- openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] ) |
| 46 |
+ |
| 47 |
libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) |
| 48 |
openssl? ( |
| 49 |
dev-libs/openssl:*[-bindist] |
| 50 |
@@ -55,6 +55,7 @@ RDEPEND="sys-apps/pciutils |
| 51 |
) |
| 52 |
cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) |
| 53 |
mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
| 54 |
+ portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) |
| 55 |
keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) |
| 56 |
mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) |
| 57 |
redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) |
| 58 |
@@ -67,24 +68,34 @@ RDEPEND="sys-apps/pciutils |
| 59 |
vim-syntax? ( app-vim/salt-vim )" |
| 60 |
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
| 61 |
test? ( |
| 62 |
+ dev-python/psutil[${PYTHON_USEDEP}] |
| 63 |
dev-python/pip[${PYTHON_USEDEP}] |
| 64 |
dev-python/virtualenv[${PYTHON_USEDEP}] |
| 65 |
dev-python/mock[${PYTHON_USEDEP}] |
| 66 |
dev-python/timelib[${PYTHON_USEDEP}] |
| 67 |
>=dev-python/boto-2.32.1[${PYTHON_USEDEP}] |
| 68 |
+ !x86? ( dev-python/boto3[${PYTHON_USEDEP}] ) |
| 69 |
>=dev-python/moto-0.3.6[${PYTHON_USEDEP}] |
| 70 |
- >=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}] |
| 71 |
+ >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] |
| 72 |
+ >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] |
| 73 |
${RDEPEND} |
| 74 |
)" |
| 75 |
|
| 76 |
-DOCS=(README.rst AUTHORS) |
| 77 |
+DOCS=( README.rst AUTHORS ) |
| 78 |
|
| 79 |
REQUIRED_USE="|| ( raet zeromq )" |
| 80 |
+RESTRICT="x86? ( test )" |
| 81 |
|
| 82 |
python_prepare() { |
| 83 |
# this test fails because it trys to "pip install distribute" |
| 84 |
rm tests/unit/{modules,states}/zcbuildout_test.py \ |
| 85 |
- tests/unit/modules/{rh_ip,win_network,random_org}_test.py |
| 86 |
+ tests/unit/modules/{rh_ip,win_network,random_org}_test.py || die |
| 87 |
+ |
| 88 |
+ # apparently libcloud does not know about this? |
| 89 |
+ rm tests/unit/cloud/clouds/dimensiondata_test.py || die |
| 90 |
+ |
| 91 |
+ # seriously? "ValueError: Missing (or not readable) key file: '/home/dany/PRIVKEY.pem'" |
| 92 |
+ rm tests/unit/cloud/clouds/gce_test.py || die |
| 93 |
} |
| 94 |
|
| 95 |
python_install_all() { |
| 96 |
@@ -102,11 +113,25 @@ python_install_all() { |
| 97 |
} |
| 98 |
|
| 99 |
python_test() { |
| 100 |
+ local tempdir |
| 101 |
# testsuite likes lots of files |
| 102 |
- ulimit -n 3072 |
| 103 |
+ ulimit -n 3072 || die |
| 104 |
+ |
| 105 |
+ # ${T} is too long a path for the tests to work |
| 106 |
+ tempdir="$(mktemp -dup /tmp salt-XXX)" |
| 107 |
+ mkdir "${T}/$(basename "${tempdir}")" |
| 108 |
+ |
| 109 |
+ ( |
| 110 |
+ cleanup() { rm -f "${tempdir}"; } |
| 111 |
+ trap cleanup EXIT |
| 112 |
+ |
| 113 |
+ addwrite "${tempdir}" |
| 114 |
+ ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" |
| 115 |
+ |
| 116 |
+ USE_SETUPTOOLS=1 SHELL="/bin/bash" \ |
| 117 |
+ TMPDIR="${tempdir}" \ |
| 118 |
+ ${EPYTHON} tests/runtests.py \ |
| 119 |
+ --unit-tests --no-report --verbose |
| 120 |
|
| 121 |
- # using ${T} for the TMPDIR makes some tests needs paths that exceed PATH_MAX |
| 122 |
- USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="/tmp" \ |
| 123 |
- ${EPYTHON} tests/runtests.py \ |
| 124 |
- --unit-tests --no-report --verbose || die "testing failed" |
| 125 |
+ ) || die "testing failed" |
| 126 |
} |
Archives