diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-25 11:37:10 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-25 11:37:10 +0100 |
| commit | 38423c67c8a23f6a1bc42038193182e2da3116eb (patch) | |
| tree | 04e2cf4bd43601b77daa79fe654e409187093c5e /dev-python/SaltTesting | |
| parent | 623ee73d661e5ed8475cb264511f683407d87365 (diff) | |
gentoo resync : 25.04.2020
Diffstat (limited to 'dev-python/SaltTesting')
| -rw-r--r-- | dev-python/SaltTesting/Manifest | 5 | ||||
| -rw-r--r-- | dev-python/SaltTesting/SaltTesting-2018.9.21.ebuild | 33 | ||||
| -rw-r--r-- | dev-python/SaltTesting/files/SaltTesting-2018.9.21-python37.patch | 21 | ||||
| -rw-r--r-- | dev-python/SaltTesting/metadata.xml | 4 |
4 files changed, 58 insertions, 5 deletions
diff --git a/dev-python/SaltTesting/Manifest b/dev-python/SaltTesting/Manifest index 66c5eefda4b1..ebe64b92a12b 100644 --- a/dev-python/SaltTesting/Manifest +++ b/dev-python/SaltTesting/Manifest @@ -1,3 +1,6 @@ +AUX SaltTesting-2018.9.21-python37.patch 1213 BLAKE2B 82257c24956fa9af21b63ca5c356219efb36d89371ec473bc9fe77aafd637d5310077db0312c7c594d3569821d12524c0ff30710018f9d481ac12706df246b0f SHA512 5ffd4e6bc726633a0957796ab531bb3a566a6a8cc39fc59df888afa7ce53c4b2b7fbbcf5e64dc111e5a603ecda3d7c5920f436b986f11df0ae4fdf9ad042b81e DIST SaltTesting-2018.1.16.tar.gz 88951 BLAKE2B 41061e691f97e95ac672b463cb7dc02af4ea70553577ac80d63800198aba8de8565c021381718a32fe76fd958446c3057dec25312a1f961b7696e19570dcee93 SHA512 1ea200ebd7688de35049a45816d87fb3b24f0a862384419a3796f191efb268cdad8a69187261db91de1151f7df8147251910170fd56a50335612bf2f29f09c0a +DIST SaltTesting-2018.9.21.tar.gz 459708 BLAKE2B c0c6d853ab335432464140b6db8939ae87b58f50c0ea63a547a09ab3e1899b52053e3f9ea90b183268b807db5d7f323f09f9b6d4186e1b4214d6984486f37139 SHA512 9ce79aaa0fd90fd75fa2a64112563751837d441518426cbdb5df93721fd186e9fe33609341a75bc173781cd9a97b477809a4c2e2d4fdd29a5331f0d096983db8 EBUILD SaltTesting-2018.1.16.ebuild 674 BLAKE2B e4f7beadfc662c96f5cc156b96b5f3233a5c4c9b49da52dadbb0c33ca306c7f8a55f340d9f1c0cc217ffb234607449be59bc500ea253bf7f88c21440f418fdbc SHA512 bfa57ef9c1c2a1df1f4c448fd186f1aa16ba9e8c58deb39147769ebcdbbc88fb94e8df963abfb7667585aa4589be56f5139ab21600a922655a2c77de57c8e072 -MISC metadata.xml 440 BLAKE2B c1e25f228c59fc89508e0a67def40ad27d42f679a8ef63e2a64db91e2c087208ae37d929c28cecff704be813fab5e9365a274e7c33065cf652b9986555a450eb SHA512 66e2e15e61bff62daa00dd1462249b7631b213fb1abd1da2deca72114cd16d296cb7add9eaacad0851a31a9cab01311bb83a8ae09e9741e3b3401b22c054264c +EBUILD SaltTesting-2018.9.21.ebuild 817 BLAKE2B cf04680c43522b8d4ec1aa861228b976a11d2036a052c5d4b4573c01b3b42e9f63672d4771b514d32199238cefd612c34668222a8ad92c2b265b5a20c120ab02 SHA512 cc14bca0e8e0c4d940eb2a18768ced0f1de7ac4b3745285bb4c291c279a5b8e76c6e24e50c393d01843cee580631f5c6cfb73c711d59671685007753a712aff2 +MISC metadata.xml 333 BLAKE2B e600956c630527e61c16aeba7e9146732252ed6351301052a3aa1c6187f1b496a162ae7f656cb2c1fc6be3112a7920503af30028df8b4410aa460cc1975dbb31 SHA512 ea35cbbfa8be4ef354636ca16d31caf69cbde213be302049874e03d5167a7435c28605b3dbfe8d8285784375ba2a73718eaa24bf5e9985c559cb04a6b8ffb74a diff --git a/dev-python/SaltTesting/SaltTesting-2018.9.21.ebuild b/dev-python/SaltTesting/SaltTesting-2018.9.21.ebuild new file mode 100644 index 000000000000..db921ba1591e --- /dev/null +++ b/dev-python/SaltTesting/SaltTesting-2018.9.21.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit eutils distutils-r1 + +DESCRIPTION="Required testing tools needed in the several Salt Stack projects" +HOMEPAGE="https://saltstack.com/community/" + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/saltstack/salt-testing.git" + EGIT_BRANCH="develop" + inherit git-r3 +else + SRC_URI="https://github.com/saltstack/salt-testing/archive/v${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/salt-testing-${PV}" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="Apache-2.0" +SLOT="0" + +RDEPEND=" + dev-python/psutil[${PYTHON_USEDEP}] + >=dev-python/requests-2.4.2[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] +" +PATCHES=( + "${FILESDIR}/SaltTesting-2018.9.21-python37.patch" +) diff --git a/dev-python/SaltTesting/files/SaltTesting-2018.9.21-python37.patch b/dev-python/SaltTesting/files/SaltTesting-2018.9.21-python37.patch new file mode 100644 index 000000000000..b12d4231bbd8 --- /dev/null +++ b/dev-python/SaltTesting/files/SaltTesting-2018.9.21-python37.patch @@ -0,0 +1,21 @@ +diff --git a/salttesting/case.py b/salttesting/case.py +index 4918915..19e47cc 100644 +--- a/salttesting/case.py ++++ b/salttesting/case.py +@@ -140,14 +140,14 @@ class ShellTestCase(TestCase, AdaptedConfigurationTestCaseMixIn): + ) + return self.run_script('salt-ssh', arg_str, with_retcode=with_retcode, catch_stderr=catch_stderr, raw=True) + +- def run_run(self, arg_str, with_retcode=False, catch_stderr=False, async=False, timeout=60, config_dir=None): ++ def run_run(self, arg_str, with_retcode=False, catch_stderr=False, async_flag=False, timeout=60, config_dir=None): + ''' + Execute salt-run + ''' + arg_str = '-c {0}{async_flag} -t {timeout} {1}'.format(config_dir or self.get_config_dir(), + arg_str, + timeout=timeout, +- async_flag=' --async' if async else '') ++ async_flag=' --async' if async_flag else '') + return self.run_script('salt-run', arg_str, with_retcode=with_retcode, catch_stderr=catch_stderr) + + def run_run_plus(self, fun, *arg, **kwargs): diff --git a/dev-python/SaltTesting/metadata.xml b/dev-python/SaltTesting/metadata.xml index 59007b4ca048..7f1265403658 100644 --- a/dev-python/SaltTesting/metadata.xml +++ b/dev-python/SaltTesting/metadata.xml @@ -5,10 +5,6 @@ <email>chutzpah@gentoo.org</email> <name>Patrick McLean</name> </maintainer> - <maintainer type="project"> - <email>python@gentoo.org</email> - <name>Python</name> - </maintainer> <upstream> <remote-id type="pypi">SaltTesting</remote-id> </upstream> |