summaryrefslogtreecommitdiff
path: root/app-admin/salt
diff options
context:
space:
mode:
Diffstat (limited to 'app-admin/salt')
-rw-r--r--app-admin/salt/Manifest20
-rw-r--r--app-admin/salt/files/salt-3003-skip-tests-that-oom-machine.patch20
-rw-r--r--app-admin/salt/files/salt-3006-skip-tests-that-oom-machine.patch21
-rw-r--r--app-admin/salt/salt-3005.1-r1.ebuild219
-rw-r--r--app-admin/salt/salt-3005.3.ebuild235
-rw-r--r--app-admin/salt/salt-3005.4.ebuild235
-rw-r--r--app-admin/salt/salt-3005.5-r1.ebuild (renamed from app-admin/salt/salt-3005.5.ebuild)10
-rw-r--r--app-admin/salt/salt-3006.2.ebuild232
-rw-r--r--app-admin/salt/salt-3006.3.ebuild237
-rw-r--r--app-admin/salt/salt-3006.4.ebuild235
-rw-r--r--app-admin/salt/salt-3006.5-r1.ebuild (renamed from app-admin/salt/salt-3006.5.ebuild)171
-rw-r--r--app-admin/salt/salt-3006.7-r1.ebuild (renamed from app-admin/salt/salt-3006.7.ebuild)11
12 files changed, 152 insertions, 1494 deletions
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 47b879fb97bc..c343a3cfa357 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -6,7 +6,6 @@ AUX minion-confd-1 188 BLAKE2B ad20094c30f9aa573397d347f9fb11acafba2f724b6c836d7
AUX minion-initd-5 564 BLAKE2B 19f2d909b1a91b5cf22c932b04b794ef536c3a84fbd36676d4bf136c6af66ae4ea94abcf9657919cb4cf85ee88cc6e93df0e7373e0410823550cc45ebc8f5673 SHA512 c92165fe73157c9c3898f7c8c90e3b1626f704d4a8432237bd264463c66ba00e89a1d66e44b049703fd32ce48f771248b902e7183c4e31ee6611f938704b2583
AUX salt-3002-tests.patch 1125 BLAKE2B 345c094c38a1b62190587062a86da4e0a516988fb2bbf98c295da87f0abd456cfc8f25c11fe10a1c4571d4eb25390c6d89b0e300bd2ae6d82212d1685af8ed30 SHA512 7f9d6f8c4a5d34381c516c72d77de6613ed646fb88f89b7c4180afebb0bf0ee34a99ed02a7e8d7a6836a61c01653fe97a13c8caa18898a507a03091cff8e9d30
AUX salt-3003-gentoolkit-revdep.patch 514 BLAKE2B aff27558a2043970feeb3eda70cf8e9112b5545af40ba215c7859520ef95a9824001274e837929ef6c25f8e1c35a8ac73f1033e63336bcbaf48dbd4b54c2d42c SHA512 c8a4649ac241f219cf576b0896f48dffc0d5a273118713829c0ad34594f77cffceaa4f06a4d0f47a17b13d6e71b5787fc27f8ee97c774e53a6d15d1b282f99b3
-AUX salt-3003-skip-tests-that-oom-machine.patch 732 BLAKE2B b9e10cf8d9ce7f36371fd30fcf592dce4933a05ca2d85c41b2159233272f2e7c90315fbd998c4064f3733b5b1944f9f96816418ed7eb434f3b9df324de2e859b SHA512 e7bc9c63d95a9af4e85372ca973c5023660c332b67486382ce898e7d60c3f50e2aca59e2634a2e87ab7fa8b34e45bfd3a781e04b8003108efbfcc67cd921aff4
AUX salt-3003.1-tests.patch 1151 BLAKE2B b2f0d99bf4bd90a7ea85ae5cc6abb91dd078ad8a95b062863a21573067f3df6045fe23ffd1b3f397e28b90b25126798253e8a9001509ad786cee3f318a900321 SHA512 9340a1dd343af45467be63b1f6991cd06fa57ffc187bcff4a96c75a9666a1429b98ce5b497354bc4cb975c0f6bcd9a64dbfb819b6bfdba02bb5917446d0a36fc
AUX salt-3005-relax-pyzmq-dep.patch 332 BLAKE2B d22d94b7680fb81e642b83cb7d823137e7e208b43a1720b131401fb957bcb3deb6a0fe5ca87da528cdf60ac219820d259d0b03a905e17142c9cd4d939b4bacf1 SHA512 7c5b963436c3066bf8e8f528acf04ea8ddfa2a5a19adb9486f9888346d55e56fdfcd97a4a04db18d85476cb8ecc8a350343855d765387744706e43e868464f5e
AUX salt-3005-tests.patch 4101 BLAKE2B 6a7d7dee4e631a7619bf1b7fa6bd08b93c0bf31342ce72f734bb645206604ffed9ae2ddae9cebe01401cbe100c224e97f18a69ede5f40a041158d1cd8878dc0f SHA512 cbc3b3d625ab8e20aa7b166dd6ddca1728c4bf562cc14d28fa684573c6ee1d42a270b0f029e5d978803a30103e7ad281d516afff66d18bf31308528fae79c00c
@@ -14,7 +13,6 @@ AUX salt-3005.1-importlib-metadata-5-r1.patch 1162 BLAKE2B cbc8df0043881725eb00a
AUX salt-3005.1-modules-file-python-3.11-host.patch 4206 BLAKE2B 9cd3cb68b5c1a95475834ae917a2f6fbdbe3424c9f1e837a0e797b84e291e3530f86a2f7d2286e0070f433817ec06b2fd4d0a069b47acb1b0646653862337ece SHA512 4bc03979e1a4202d5ccb2b3159e178bc72c2a4be4297d7b9306479a5c7fe8cc81fc7d25474d80c2627e638db25e73cd4e8f7e1b25c8e15317e22986d63307823
AUX salt-3005.1-no-entry-points.patch 428 BLAKE2B 1bcf3b070afd01c56985290051a3cb031d5ca83b42631eba5f05d7648eabf13bca44573811b767d739dc9bc6d0a5da6f99de87b57c678df79cc172fa6dd5495f SHA512 ed5712689a6d39da9c6a67f28a48d35bbd271a6a3b898cbb0e0493e1813cc99e64388fb60707e6fee95691e339336c2656278780115b39d285c380ded92fe3cb
AUX salt-3005.1-tests.patch 2367 BLAKE2B 467af423de22b4ddeb80fef3d4682976283116698b7c2551c4710e049d8ad7749a4eb07c541a427ed540fdea6a0e4f4e63d96988bafd92974cc3b1026e27fd03 SHA512 4ba3c36be9de377848880819fc4bacf72978a12e483bea90a4e5e7524d7212b5d554302000f6c628156ec5aafbf48d662dec2764d96253be74fa202c73e7fc67
-AUX salt-3006-skip-tests-that-oom-machine.patch 749 BLAKE2B 453e9db439bb87aa949cc150bafc7b39cc69a4e7189115e69bd7571d35c5eb34eba9d80d7ebb21c62bb454bf54217af7f5f8ef366dbeecc5250c1fee1d729420 SHA512 7d68020cc52ecc51e67861ed8465104b92b0c869823501d7966ab42df60f40049e5619453c1cd5238513c5e4afd1d46b1c5e3dd50830604555abd2a111a4601f
AUX salt-3006.2-tests.patch 3598 BLAKE2B 5e8f8df73e905aa1807b6bdeed2f95bd5b12623beb368123091e5f9733dc81d7564b00b308232baa0603feb047ad693581648341e72ab2d263b438d12cc6c916 SHA512 c4dde9a456adfe70ebaf0ebdc8c1dd532e41c603a148ee15720f520f8366738d4fb4e0b6b27a6164ddf4d34d1e9d398c3299aaf3945fbba97c250b38e2dcacec
AUX salt-3006.3-tests.patch 1379 BLAKE2B bc19d5f9ced7550e8fcd025d31fcd06c6745acba1cf1764a5831a29197c245ac0300f68d98c5175c68a0ed554a1bee701881f4e2597d3788c209536da2fbbc81 SHA512 ff2ea0a6259964ef96799f009c84e4d5cbeb01b085cf65e9b091c8cc3093e26d3b9f1d780e5ca2c632f5fa1071ddbff40cd2c2d8494276e557395ccafaddbcc3
AUX salt-api.service 166 BLAKE2B 32d28ef4ef3c60942bed3fa3a01d70a9af387705844326cdf9339d7c887238a1e6817d78ffd1cb205a6397a2138c2389ea00bf53be84a17b23bea140279bf42c SHA512 bab6b8380c965bf16e23078ebe6f38d942300829d4c89ddf23b630bd57b4d371f80687d85dd9e0cc1b669f2ca882aecde1bc8d7d82382a02ed20e493d3f04702
@@ -23,22 +21,10 @@ AUX salt-minion.service 162 BLAKE2B 6f7b6b72e26d1651dbcb324b1e0cfef9f4b5a794f405
AUX salt-syndic.service 169 BLAKE2B 0d00f20b4663804eaa4b6a1a1b32ed87b04d1f4df6a8e8e0b2a0e3d17f71e1bb53f71f6168446aaf3765692cd540217c4cdf5ab8dd9cb7032801aa798d8a9bc3 SHA512 b45509a22a18f573726a868fda1591eaf42ef44220960dda698274ba8ff1db8cdc302605133ab61b188e15017ba15c5f409f3ee64e026b635ac359eea7aad7d0
AUX syndic-confd-1 188 BLAKE2B 98f13eb627963d65df26140f348c04eb8c253d444d36ecd1f5ef344ad89901b0a5ed62c64364e90595c2d2ee2766f30802a4a86a2555bbea343ab410292359af SHA512 35fe9bf4732c8a53b47099ffe5f9468d884ec3e2671451a6d52821dde6c70c63176b29ade0d700b99aaf47557f58179f780422843346bd3aa6513d9465ec9f58
AUX syndic-initd-5 558 BLAKE2B 5e1ea25b57f56ad7bfb8be0c845e7da9f99af03c50c31ca2031e604267c680555d0d8a3ef6299ec588770f26dad19d262c8b9403391b60fb17c6811d7946107a SHA512 6e927925cf1e4d0f901bec10499a8ecf1193b99742cfda5f94f70d0ec743902b1b89728cb2e447b8b4879a9417d0d482b813161968dc9c2b2c7944b3af14df14
-DIST salt-3005.1.tar.gz 17914349 BLAKE2B 697c2068bf119e4a19f92a86ce880fec9375c10ba549cdcdd2182cfeaacce31c7bc4c4c91e1a609906b4c5373bb5e3120e0db47ede5b45ee20942d7b2d201e64 SHA512 391f995f0129f3d7104a0eea4fd83b18aa6ecae0fd7a2c77c1154e24b0bcd52cef4b63db12597c85737bb33ddf605e0c23370cef3bf47f9ea85af5b77d74dc50
-DIST salt-3005.3.tar.gz 17932868 BLAKE2B 18b1b3fe0708c2b425a410766df1545c093b43e69527b1213e1b043668b914016dc95b5c96c0619b1234b57fa404fdbe4fc245ac11d4f0b121edf4b0deacb3ee SHA512 4a40b21f0ee8ac31d3ca3d4d43706c3a484b9e19bd5797764475772af42fe682476b19f9097f003c838683529f15a757aab769eb0a15578cbc2fc449d8216604
-DIST salt-3005.4.tar.gz 17936876 BLAKE2B e06ec0e357fac18fe0ad823cf80e6261d80dbf22d856f0680a1c044d368133a1f94a6c9ff37b0f07ab305b835f808e96ae42a510eabedb6b2691b23959fa796e SHA512 31c699fc369c1f3c47f4f3a9a572381dd8c54323771194bdcc73128b55d983da7338b03061a6cdec6631aca62048e5829ea38687c3b0fdb1cdcbd5df9d000f05
DIST salt-3005.5.tar.gz 17940104 BLAKE2B c7a820bc946c2cd8124fb6f559608ab1dc3cd85d6f0e7d0a2a87b7bc0dda361178e83b307c2fecd8a47d59032f85dc9f4caeef5698e98c0e349d1c6979f9f68a SHA512 1332c9751a225dbf569601eb1932fe3ebea93c8d8be7485b1b8150d5200ad2e82954c970d59ba0e888860062d059db78a50bffe69fc367bdb7b2388b62e19f32
-DIST salt-3006.2.tar.gz 20411634 BLAKE2B dff474017918ef3ee0031856a2739282077205d8c2589809a91e5f1c3741cb26d2bd2458734ea4d3533118c881851dfd853f4ba4f1c631e7db28e95bc1b6f7f8 SHA512 2626cb5beb1b30fc63f554f5804f0d9b7e36b7c569c5f9049e5f5ac5a413e9d99a98b3d91089683338e3d3890ec973dff80782b4e41acb291872e45084fd2546
-DIST salt-3006.3.tar.gz 20461738 BLAKE2B dfa4698dbc611c9c4954b4631d11b685e1efc978915918ce6d8f1890bb4a230d234b6a191166ffff9243058d44530bfc14b43386c8bc295c035c6609d6bf3fa0 SHA512 9cced766db2144de445ed53b52c1551c986ba43774c40512fd07973862d6d3a361e25f55fcfeeb0e03ba44eec1051909834e5d0a352ead5ec6f418b15c909628
-DIST salt-3006.4.tar.gz 20465324 BLAKE2B 8cf9acf8850e9eefbff32f3e347d8773ed7e28f58a0a441af9ec0a4c87a0bba49ff2b82e6f5816511de7303e16d79246df8c0024464a5c267f3ef7e370c8be98 SHA512 c48c69730ba81d3e279cbb01cb26c743dd8b4945c2fc16a7c959472ab4050316fcdaee935e009b7f472bd3b08172ac69defe64774a2d93e143a050cd559997ef
DIST salt-3006.5.tar.gz 20536455 BLAKE2B cf475dc5e919f6ab180578db2aae5f3655623b39b134d67609da4f607be909340c6e55c940cfb66f129cc75d40b5cdda094e866db116d8a45aa5eef26d8fa1eb SHA512 8aaf5c5d36d8aa17b3fe867cee470f7b3c5dd1f6abaf5bdb49a3df76d3498d0dc1fa305a069bc95ad057489db229454b38b0ea9c1ade1e46b5d9b57aeef10c23
DIST salt-3006.7.tar.gz 20562663 BLAKE2B b4ff9039509b1de7151060cb0e68252868d493e114e327a3c48bfc5584f67521a2106b41b77377f6d43ab5795399b6fe5860ce8e091459687c4a5b2378752729 SHA512 9d1759a7c0dfc9ad4fdc94460f0f3799483737207bfdc8ddd1424e5c6083ea74ef520f13c323d5cbd7f65c1d9bb13bbbeb5f2cafe6dcacbc2689e733794aef2d
-EBUILD salt-3005.1-r1.ebuild 7234 BLAKE2B af8c85ad4abcd00244b52a73cc67fc31505395dc11282841bec155a4ae5c24694214f9e3a173f8ae09c25de2ae06f5eefdc3fd0aa27608908a78f664e18cf408 SHA512 1d790f172358abbac38351e1b5be50fa1e646fc7cb51179af428249e8dccd6452f51f25710ab73c91e0942df8098a9b97d6f579b8934a1f0e4d194cd7ec6961d
-EBUILD salt-3005.3.ebuild 9382 BLAKE2B 068d7d5a8e15ebb387b9534616693c74dd89d2b8839c21a57c50bcbdf83427b44a49796805b84b45be823007c0c6ea3828a17ac47a20576286e340c4ccaf0775 SHA512 da78be3da31b32b079129bc05547890e17bb3c67d8e4ba33f84be796c83fbaf31aae838df0f8c51153bca51960dfdfa41ca6af92dc77ef32760b5dba3f901e81
-EBUILD salt-3005.4.ebuild 9382 BLAKE2B 068d7d5a8e15ebb387b9534616693c74dd89d2b8839c21a57c50bcbdf83427b44a49796805b84b45be823007c0c6ea3828a17ac47a20576286e340c4ccaf0775 SHA512 da78be3da31b32b079129bc05547890e17bb3c67d8e4ba33f84be796c83fbaf31aae838df0f8c51153bca51960dfdfa41ca6af92dc77ef32760b5dba3f901e81
-EBUILD salt-3005.5.ebuild 12368 BLAKE2B f29abeaa58dad22955a5db5d14ae6e70ccd1a792dafb171e805241b813f11117ed3384070992b4fa576f4fc777d1c34985ef73b32167070ebb163bbb18999fe6 SHA512 396c92821d1294f4c153399e564e7173067709607ebcd157c914593388471339488e7c90b69d7fbc8b62b2a15a3e459a2344b22fe0d1ecf816d48457a5bf899f
-EBUILD salt-3006.2.ebuild 8539 BLAKE2B 335093f353da0d42abedf7b836c1516239390ec64fe4acf0f58d23f1d4b467446304aec086587fd9901b3007d50d86743aaf26157d7706b0b4b511f814d3e7ab SHA512 d8690757e65594d3bef93e852d61efb4c771fc3d2d441ef79dae0cd585cb93854a77ed641f9ba65bce13eaba7f46475c90dd03c591d2e0f580ef4a53bf7b1532
-EBUILD salt-3006.3.ebuild 8903 BLAKE2B cbf034e5dec44f2b46cecf74dbc4d7b8df9782905024ff86ed3e5320172a1693027859036e79609e23aae00c50994a62aee8806928c46dd907411efcaaa2a0c7 SHA512 867092ef5873126ceee767ebf12df66acaade553df2d7d351441a7aff19fc90346c6805882b77be602e79e407ddf9f90e0885a746336b64e4ce3bb6422426f57
-EBUILD salt-3006.4.ebuild 8825 BLAKE2B 6789758984b1d9bc4e1e6fd61b6516a8bec88df9a3de73a5570f0717e52ed2f5796e03d6a1b2eb31ca67635b51b72f963b406ebd03e97f8be6a0dab7ec29836e SHA512 999951e1a35552ffc86ecccda556274f108d082df37163a8570879aa6029751dedec3ea76ce42f39ce5b3ff46ebdaedca46a2ddc5b6639952aba257830c0e522
-EBUILD salt-3006.5.ebuild 9589 BLAKE2B c90270c444f99da82b8a85e813c652f7cf4f6f5767160183de5162434bc4be3feb0060a2579c7191b189d8401625fc3acf003adea24d0c0aad9e027c3ffa20ef SHA512 1c67d2cc61e8594ee335f5da8c7ba53ea629fe389cd30fdb3f93d5b14b04592bff759fbe7b2ac7ce03d5524d9e9fb935e572119adc2c00861cf45422897d39fc
-EBUILD salt-3006.7.ebuild 15220 BLAKE2B 585a08e0efe624f573454adc1b8894208e4ce5be462bc6a53f694a08613e920987364a31353a0e5f3e54f8697fdc54e781f45b5b55ef593404e94ab71c732f86 SHA512 6c591b101137442e7b3d0f98b386c185842a67afd33e7d8d47d2c73f3b5bf94cd431fa0db7d0ade51c26f84aab06e52c237993dd88fce848d4430296be902330
+EBUILD salt-3005.5-r1.ebuild 12568 BLAKE2B 42c8b216768aa8e008edf0d861971db79854845e47ee47885269f20cfd350173a187ddd60e01e7c8f8cd1f6152769592326c61f99998fda38aae6e78d74e62fd SHA512 2180b51759ce958a03dbc0dcbc623d1fac6fefb91bb1d7c1b5f376e4a12b467238c51d7723fa60976f2c66f3217ca04a7b2c4940b6996e93c027f64ec67d0f2b
+EBUILD salt-3006.5-r1.ebuild 15196 BLAKE2B beb3924f91cf050c2a57414e0121d08c54991c2aa1b5c89a1c67afa644c1ef030415dc588b36e6aa11adf651d851f82365b4d5ccfa27e043c707756ddfe4c6c8 SHA512 c4b1d4a50546196f75c9d1327aa13bb649a61349b52f60b91cc958ad5bfcb1c438042c29d513a94aebb9f92d4d5acc47438d4e34468701e840ca0a0e52f7805e
+EBUILD salt-3006.7-r1.ebuild 15374 BLAKE2B b98136c7f1758989a62a5244dddeb818f326e7a5c102ae027b187b487af0cad930189baf9e9d5cfd89dede0de4a00695427fb9965bcb7f93a4c0815eaa59d591 SHA512 d206b90d3b0306cf66c308f4d7d763ef268796a78e8241d9b2cbe8861010738ef80a443c37e0056f214218a3a640bcc194a135047f6e322a40279c6189f2932d
MISC metadata.xml 2304 BLAKE2B 8fac51fe1b0c0dae5fe71d88f1bf84df1de8cc8b3d836b59c3b2e82bfa085f57352e3aafd999766ae69104a8bd9798f2fffdb64e1df1e0a1ca8561dba1ef7d5e SHA512 7d3706c40c27dd67509bd638cd0550bb4822f0895fef929ecad21c218cdaa0512da443c901cc2b3a8d4afd9f5e9bc461622ac3bab2a332ccd9c64c4cbf99bf74
diff --git a/app-admin/salt/files/salt-3003-skip-tests-that-oom-machine.patch b/app-admin/salt/files/salt-3003-skip-tests-that-oom-machine.patch
deleted file mode 100644
index 804b6a8704f0..000000000000
--- a/app-admin/salt/files/salt-3003-skip-tests-that-oom-machine.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/tests/unit/modules/test_boto_apigateway.py b/tests/unit/modules/test_boto_apigateway.py
-index 6ee6aeb002..db9aeaee95 100644
---- a/tests/unit/modules/test_boto_apigateway.py
-+++ b/tests/unit/modules/test_boto_apigateway.py
-@@ -154,6 +154,7 @@ def _has_required_botocore():
- return True
-
-
-+@skipIf(True, "Causes machines to OOM")
- class BotoApiGatewayTestCaseBase(TestCase, LoaderModuleMockMixin):
- conn = None
-
-@@ -190,6 +191,7 @@ class BotoApiGatewayTestCaseBase(TestCase, LoaderModuleMockMixin):
- self.addCleanup(delattr, self, "utils")
-
-
-+@skipIf(True, "Causes machines to OOM")
- class BotoApiGatewayTestCaseMixin:
- def _diff_list_dicts(self, listdict1, listdict2, sortkey):
- """
diff --git a/app-admin/salt/files/salt-3006-skip-tests-that-oom-machine.patch b/app-admin/salt/files/salt-3006-skip-tests-that-oom-machine.patch
deleted file mode 100644
index 0b62cee96f2f..000000000000
--- a/app-admin/salt/files/salt-3006-skip-tests-that-oom-machine.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/tests/unit/modules/test_boto_apigateway.py b/tests/unit/modules/test_boto_apigateway.py
-index 5f3d2a4982..82366185ff 100644
---- a/tests/unit/modules/test_boto_apigateway.py
-+++ b/tests/unit/modules/test_boto_apigateway.py
-@@ -155,7 +155,7 @@ def _has_required_botocore():
- else:
- return True
-
--
-+@pytest.mark.skip("Causes machine to OOM")
- class BotoApiGatewayTestCaseBase(TestCase, LoaderModuleMockMixin):
- conn = None
-
-@@ -192,6 +192,7 @@ class BotoApiGatewayTestCaseBase(TestCase, LoaderModuleMockMixin):
- self.addCleanup(delattr, self, "utils")
-
-
-+@pytest.mark.skip("Causes machine to OOM")
- class BotoApiGatewayTestCaseMixin:
- def _diff_list_dicts(self, listdict1, listdict2, sortkey):
- """
diff --git a/app-admin/salt/salt-3005.1-r1.ebuild b/app-admin/salt/salt-3005.1-r1.ebuild
deleted file mode 100644
index bc9ea15bf0bc..000000000000
--- a/app-admin/salt/salt-3005.1-r1.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_10 )
-
-DISTUTILS_USE_PEP517=setuptools
-inherit systemd distutils-r1
-
-DESCRIPTION="Salt is a remote execution and configuration manager"
-HOMEPAGE="https://www.saltstack.com/resources/community/
- https://github.com/saltstack"
-
-if [[ ${PV} == 9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
- EGIT_BRANCH="develop"
-else
- inherit pypi
- KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="
- cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
- mongodb neutron nova openssl portage profile redis selinux test raet
- +zeromq vim-syntax
-"
-
-RDEPEND="
- sys-apps/pciutils
- >=dev-python/distro-1.5[${PYTHON_USEDEP}]
- >=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
- dev-python/jmespath[${PYTHON_USEDEP}]
- dev-python/libnacl[${PYTHON_USEDEP}]
- >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
- >=dev-python/psutil-5.0.0[${PYTHON_USEDEP}]
- >=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- >=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
- >=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/tomli[${PYTHON_USEDEP}]
- dev-python/watchdog[${PYTHON_USEDEP}]
- libcloud? (
- dev-python/aiohttp[${PYTHON_USEDEP}]
- dev-python/aiosignal[${PYTHON_USEDEP}]
- >=dev-python/apache-libcloud-2.5.0[${PYTHON_USEDEP}]
- dev-python/async-timeout[${PYTHON_USEDEP}]
- )
- mako? ( dev-python/mako[${PYTHON_USEDEP}] )
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
- libvirt? (
- dev-python/libvirt-python[${PYTHON_USEDEP}]
- )
- openssl? (
- dev-libs/openssl:0=[-bindist(-)]
- dev-python/pyopenssl[${PYTHON_USEDEP}]
- )
- raet? (
- >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
- >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
- >=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
- )
- cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
- cheetah? ( >=dev-python/cheetah3-3.2.2[${PYTHON_USEDEP}] )
- genshi? ( dev-python/genshi[${PYTHON_USEDEP}] )
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
- portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
- keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
- redis? ( dev-python/redis[${PYTHON_USEDEP}] )
- selinux? ( sec-policy/selinux-salt )
- nova? (
- >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]
- )
- neutron? (
- >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]
- )
- gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
- profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
- vim-syntax? ( app-vim/salt-vim )
- zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] )
-"
-BDEPEND="
- test? (
- ${RDEPEND}
- dev-python/apache-libcloud[${PYTHON_USEDEP}]
- >=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
- dev-python/certifi[${PYTHON_USEDEP}]
- dev-python/cherrypy[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
- dev-python/mako[${PYTHON_USEDEP}]
- >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/moto-2.0.0[${PYTHON_USEDEP}]
- dev-python/passlib
- dev-python/pip[${PYTHON_USEDEP}]
- dev-python/pyopenssl[${PYTHON_USEDEP}]
- >=dev-python/pytest-7.0.1[${PYTHON_USEDEP}]
- >=dev-python/pytest-salt-factories-1.0.0_rc17[${PYTHON_USEDEP}]
- dev-python/pytest-tempdir[${PYTHON_USEDEP}]
- dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
- dev-python/pytest-subtests[${PYTHON_USEDEP}]
- dev-python/pytest-shell-utilities[${PYTHON_USEDEP}]
- dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
- dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
- dev-python/flaky[${PYTHON_USEDEP}]
- net-dns/bind-tools
- >=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}]
- dev-util/yamllint[${PYTHON_USEDEP}]
- !x86? ( >=dev-python/boto3-1.17.67[${PYTHON_USEDEP}] )
- )
-"
-
-DOCS=( README.rst AUTHORS )
-
-REQUIRED_USE="|| ( raet zeromq )
- test? ( cheetah genshi )"
-RESTRICT="!test? ( test ) x86? ( test )"
-
-PATCHES=(
- "${FILESDIR}/salt-3003-skip-tests-that-oom-machine.patch"
- "${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
- "${FILESDIR}/salt-3002-tests.patch"
- "${FILESDIR}/salt-3003.1-tests.patch"
- "${FILESDIR}/salt-3005-relax-pyzmq-dep.patch"
- "${FILESDIR}/salt-3005-tests.patch"
- "${FILESDIR}/salt-3005.1-no-entry-points.patch"
- "${FILESDIR}/salt-3005.1-importlib-metadata-5-r1.patch"
- "${FILESDIR}/salt-3005.1-tests.patch"
- "${FILESDIR}/salt-3005.1-modules-file-python-3.11-host.patch"
-)
-
-python_prepare_all() {
- # remove tests with external dependencies that may not be available, and
- # tests that don't work in sandbox
- rm tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py || die
- rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die
- rm tests/unit/states/test_boto_vpc.py || die
- rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die
- rm tests/pytests/functional/transport/server/test_req_channel.py || die
- rm tests/pytests/functional/utils/test_async_event_publisher.py || die
- rm tests/pytests/functional/runners/test_winrepo.py || die
-
- # tests that require network access
- rm tests/unit/{states,modules}/test_zcbuildout.py || die
- rm -r tests/integration/cloud || die
- rm -r tests/kitchen/tests/wordpress/tests || die
- rm tests/kitchen/test_kitchen.py || die
- rm tests/unit/modules/test_network.py || die
- rm tests/pytests/functional/modules/test_pip.py || die
- rm tests/pytests/unit/client/ssh/test_ssh.py || die
- rm -r tests/pytests/{integration,functional}/netapi tests/integration/netapi || die
-
- # tests require root access
- rm tests/integration/pillar/test_git_pillar.py || die
- rm tests/integration/states/test_supervisord.py || die
-
- # removes contextvars, see bug: https://bugs.gentoo.org/799431
- sed -i '/^contextvars/d' requirements/base.txt || die
-
- # make sure pkg_resources doesn't bomb because pycrypto isn't installed
- find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die
- # pycryptodome rather than pycryptodomex
- find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die
-
- distutils-r1_python_prepare_all
-}
-
-python_install_all() {
- local svc
- USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
- for svc in minion master syndic api; do
- newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc}
- newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
- systemd_dounit "${FILESDIR}"/salt-${svc}.service
- done
-
- insinto /etc/${PN}
- doins -r conf/*
-}
-
-python_test() {
- # testsuite likes lots of files
- ulimit -n 4096 || die
-
- local -a disable_tests=(
- # doesn't like the distutils warning
- batch_retcode
- multiple_modules_in_batch
- # hangs indefinitely
- master_type_disable
- # needs root
- runas_env_sudo_group
- # don't like sandbox
- split_multibyte_characters_{shiftjis,unicode}
- # doesn't like sandbox env
- log_sanitize
- )
- local textexpr
- testexpr=$(printf 'not %s and ' "${disable_tests[@]}")
-
- # ${T} is too long a path for the tests to work
- local TMPDIR
- TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" || die
- (
- export TMPDIR
- cleanup() { rm -rf "${TMPDIR}" || die; }
-
- trap cleanup EXIT
-
- addwrite "${TMPDIR}"
-
- USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
- "${EPYTHON}" -m pytest -vv -k "${testexpr%and }" \
- || die "testing failed with ${EPYTHON}"
- )
-}
diff --git a/app-admin/salt/salt-3005.3.ebuild b/app-admin/salt/salt-3005.3.ebuild
deleted file mode 100644
index 2d5c18e2ca63..000000000000
--- a/app-admin/salt/salt-3005.3.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_10 )
-
-DISTUTILS_USE_PEP517=setuptools
-inherit systemd distutils-r1
-
-DESCRIPTION="Salt is a remote execution and configuration manager"
-HOMEPAGE="https://www.saltstack.com/resources/community/
- https://github.com/saltstack"
-
-if [[ ${PV} == 9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
- EGIT_BRANCH="develop"
-else
- inherit pypi
- KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="
- cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
- mongodb neutron nova openssl portage profile redis selinux test raet
- +zeromq vim-syntax
-"
-
-RDEPEND="
- sys-apps/pciutils
- >=dev-python/distro-1.5[${PYTHON_USEDEP}]
- >=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
- dev-python/jmespath[${PYTHON_USEDEP}]
- dev-python/libnacl[${PYTHON_USEDEP}]
- >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
- >=dev-python/psutil-5.0.0[${PYTHON_USEDEP}]
- >=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-6.0.1[${PYTHON_USEDEP}]
- >=dev-python/markupsafe-2.1.2[${PYTHON_USEDEP}]
- >=dev-python/requests-2.31.0[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/tomli[${PYTHON_USEDEP}]
- dev-python/watchdog[${PYTHON_USEDEP}]
- libcloud? (
- dev-python/aiohttp[${PYTHON_USEDEP}]
- dev-python/aiosignal[${PYTHON_USEDEP}]
- >=dev-python/apache-libcloud-2.5.0[${PYTHON_USEDEP}]
- dev-python/async-timeout[${PYTHON_USEDEP}]
- )
- mako? ( dev-python/mako[${PYTHON_USEDEP}] )
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
- libvirt? (
- dev-python/libvirt-python[${PYTHON_USEDEP}]
- )
- openssl? (
- dev-libs/openssl:0=[-bindist(-)]
- >=dev-python/pyopenssl-23.2.0[${PYTHON_USEDEP}]
- )
- raet? (
- >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
- >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
- >=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
- )
- cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
- cheetah? ( >=dev-python/cheetah3-3.2.2[${PYTHON_USEDEP}] )
- genshi? ( dev-python/genshi[${PYTHON_USEDEP}] )
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
- portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
- keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
- redis? ( dev-python/redis[${PYTHON_USEDEP}] )
- selinux? ( sec-policy/selinux-salt )
- nova? (
- >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]
- )
- neutron? (
- >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]
- )
- gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
- profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
- vim-syntax? ( app-vim/salt-vim )
- zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] )
-"
-BDEPEND="
- test? (
- ${RDEPEND}
- dev-python/apache-libcloud[${PYTHON_USEDEP}]
- >=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
- >=dev-python/certifi-2023.07.22[${PYTHON_USEDEP}]
- dev-python/cherrypy[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
- dev-python/mako[${PYTHON_USEDEP}]
- >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/moto-2.0.0[${PYTHON_USEDEP}]
- dev-python/passlib[${PYTHON_USEDEP}]
- dev-python/pip[${PYTHON_USEDEP}]
- >=dev-python/pyopenssl-23.0.0[${PYTHON_USEDEP}]
- >=dev-python/pytest-7.2.0[${PYTHON_USEDEP}]
- >=dev-python/pytest-salt-factories-1.0.0_rc17[${PYTHON_USEDEP}]
- dev-python/pytest-tempdir[${PYTHON_USEDEP}]
- dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
- dev-python/pytest-subtests[${PYTHON_USEDEP}]
- dev-python/pytest-shell-utilities[${PYTHON_USEDEP}]
- dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
- dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
- dev-python/flaky[${PYTHON_USEDEP}]
- net-dns/bind-tools
- >=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}]
- dev-util/yamllint[${PYTHON_USEDEP}]
- !x86? ( >=dev-python/boto3-1.17.67[${PYTHON_USEDEP}] )
- )
-"
-
-DOCS=( README.rst AUTHORS )
-
-REQUIRED_USE="|| ( raet zeromq )
- test? ( cheetah genshi )"
-RESTRICT="!test? ( test ) x86? ( test )"
-
-PATCHES=(
- "${FILESDIR}/salt-3003-skip-tests-that-oom-machine.patch"
- "${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
- "${FILESDIR}/salt-3002-tests.patch"
- "${FILESDIR}/salt-3003.1-tests.patch"
- "${FILESDIR}/salt-3005-tests.patch"
- "${FILESDIR}/salt-3005.1-no-entry-points.patch"
- "${FILESDIR}/salt-3005.1-importlib-metadata-5-r1.patch"
- "${FILESDIR}/salt-3005.1-tests.patch"
- "${FILESDIR}/salt-3005.1-modules-file-python-3.11-host.patch"
- "${FILESDIR}/salt-3006.2-tests.patch"
-)
-
-python_prepare_all() {
- # remove tests with external dependencies that may not be available, and
- # tests that don't work in sandbox
- rm tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py || die
- rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die
- rm tests/unit/states/test_boto_vpc.py || die
- rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die
- rm tests/pytests/functional/transport/server/test_req_channel.py || die
- rm tests/pytests/functional/utils/test_async_event_publisher.py || die
- rm tests/pytests/functional/runners/test_winrepo.py || die
-
- # tests that require network access
- rm tests/unit/{states,modules}/test_zcbuildout.py || die
- rm -r tests/integration/cloud || die
- rm -r tests/kitchen/tests/wordpress/tests || die
- rm tests/kitchen/test_kitchen.py || die
- rm tests/unit/modules/test_network.py || die
- rm tests/pytests/functional/modules/test_pip.py || die
- rm tests/pytests/unit/client/ssh/test_ssh.py || die
- rm -r tests/pytests/{integration,functional}/netapi tests/integration/netapi || die
-
- # tests require root access
- rm tests/integration/pillar/test_git_pillar.py || die
- rm tests/integration/states/test_supervisord.py || die
-
- # removes contextvars, see bug: https://bugs.gentoo.org/799431
- sed -i '/^contextvars/d' requirements/base.txt || die
-
- # make sure pkg_resources doesn't bomb because pycrypto isn't installed
- find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die
- # pycryptodome rather than pycryptodomex
- find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die
-
- distutils-r1_python_prepare_all
-}
-
-python_install_all() {
- local svc
- USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
- for svc in minion master syndic api; do
- newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc}
- newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
- systemd_dounit "${FILESDIR}"/salt-${svc}.service
- done
-
- insinto /etc/${PN}
- doins -r conf/*
-}
-
-python_test() {
- local -a EPYTEST_DESELECT=(
- # doesn't like the distutils warning
- tests/pytests/integration/cli/test_batch.py::test_batch_retcode
- tests/pytests/integration/cli/test_batch.py::test_multiple_modules_in_batch
- # hangs indefinitely
- tests/pytests/unit/test_minion.py::test_master_type_disable
- # needs root
- tests/pytests/unit/modules/test_cmdmod.py::test_runas_env_sudo_group
- # don't like sandbox
- tests/unit/cloud/clouds/test_joyent.py::JoyentTestCase::test_query_instance_has_ip
- tests/unit/cloud/clouds/test_joyent.py::JoyentTestCase::test_query_instance_init
- tests/unit/cloud/clouds/test_joyent.py::JoyentTestCase::test_query_instance_ready
- tests/unit/modules/test_win_ip.py::WinShadowTestCase::test_disable
- tests/unit/modules/test_win_ip.py::WinShadowTestCase::test_enable
- tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_is_finished_is_set_before_events_return_then_no_data_should_be_returned
- tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_is_finished_then_all_collected_data_should_be_returned
- tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_is_timed_out_is_set_before_other_events_are_completed_then_result_should_be_empty_dictionary
- tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_is_timed_out_then_all_collected_data_should_be_returned
- tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_min_wait_time_has_not_passed_then_disbatch_should_not_return_expected_data_until_time_has_passed
- tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_minions_all_return_then_all_collected_data_should_be_returned
- tests/unit/utils/test_vt.py::VTTestCase::test_split_multibyte_characters_shiftjis
- tests/unit/utils/test_vt.py::VTTestCase::test_split_multibyte_characters_unicode
- tests/pytests/unit/utils/test_vt.py::test_log_sanitize
- tests/pytests/unit/test_master.py::test_fileserver_duration
- tests/pytests/unit/modules/test_aptpkg.py::test_call_apt_dpkg_lock
- tests/unit/utils/test_schema.py::ConfigTestCase::test_anyof_config_validation
- tests/unit/utils/test_schema.py::ConfigTestCase::test_dict_config_validation
- tests/unit/utils/test_schema.py::ConfigTestCase::test_hostname_config_validation
- tests/unit/utils/test_schema.py::ConfigTestCase::test_not_config_validation
- tests/unit/utils/test_schema.py::ConfigTestCase::test_oneof_config_validation
- tests/unit/utils/test_schema.py::ConfigTestCase::test_optional_requirements_config_validation
- )
-
- # testsuite likes lots of files
- ulimit -n 4096 || die
-
- # ${T} is too long a path for the tests to work
- local TMPDIR
- TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" || die
- (
- export TMPDIR
- cleanup() { rm -rf "${TMPDIR}" || die; }
-
- trap cleanup EXIT
-
- addwrite "${TMPDIR}"
-
- USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
- epytest
- )
-}
diff --git a/app-admin/salt/salt-3005.4.ebuild b/app-admin/salt/salt-3005.4.ebuild
deleted file mode 100644
index 2d5c18e2ca63..000000000000
--- a/app-admin/salt/salt-3005.4.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_10 )
-
-DISTUTILS_USE_PEP517=setuptools
-inherit systemd distutils-r1
-
-DESCRIPTION="Salt is a remote execution and configuration manager"
-HOMEPAGE="https://www.saltstack.com/resources/community/
- https://github.com/saltstack"
-
-if [[ ${PV} == 9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
- EGIT_BRANCH="develop"
-else
- inherit pypi
- KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="
- cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
- mongodb neutron nova openssl portage profile redis selinux test raet
- +zeromq vim-syntax
-"
-
-RDEPEND="
- sys-apps/pciutils
- >=dev-python/distro-1.5[${PYTHON_USEDEP}]
- >=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
- dev-python/jmespath[${PYTHON_USEDEP}]
- dev-python/libnacl[${PYTHON_USEDEP}]
- >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
- >=dev-python/psutil-5.0.0[${PYTHON_USEDEP}]
- >=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-6.0.1[${PYTHON_USEDEP}]
- >=dev-python/markupsafe-2.1.2[${PYTHON_USEDEP}]
- >=dev-python/requests-2.31.0[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/tomli[${PYTHON_USEDEP}]
- dev-python/watchdog[${PYTHON_USEDEP}]
- libcloud? (
- dev-python/aiohttp[${PYTHON_USEDEP}]
- dev-python/aiosignal[${PYTHON_USEDEP}]
- >=dev-python/apache-libcloud-2.5.0[${PYTHON_USEDEP}]
- dev-python/async-timeout[${PYTHON_USEDEP}]
- )
- mako? ( dev-python/mako[${PYTHON_USEDEP}] )
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
- libvirt? (
- dev-python/libvirt-python[${PYTHON_USEDEP}]
- )
- openssl? (
- dev-libs/openssl:0=[-bindist(-)]
- >=dev-python/pyopenssl-23.2.0[${PYTHON_USEDEP}]
- )
- raet? (
- >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
- >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
- >=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
- )
- cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
- cheetah? ( >=dev-python/cheetah3-3.2.2[${PYTHON_USEDEP}] )
- genshi? ( dev-python/genshi[${PYTHON_USEDEP}] )
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
- portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
- keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
- redis? ( dev-python/redis[${PYTHON_USEDEP}] )
- selinux? ( sec-policy/selinux-salt )
- nova? (
- >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]
- )
- neutron? (
- >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]
- )
- gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
- profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
- vim-syntax? ( app-vim/salt-vim )
- zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] )
-"
-BDEPEND="
- test? (
- ${RDEPEND}
- dev-python/apache-libcloud[${PYTHON_USEDEP}]
- >=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
- >=dev-python/certifi-2023.07.22[${PYTHON_USEDEP}]
- dev-python/cherrypy[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
- dev-python/mako[${PYTHON_USEDEP}]
- >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/moto-2.0.0[${PYTHON_USEDEP}]
- dev-python/passlib[${PYTHON_USEDEP}]
- dev-python/pip[${PYTHON_USEDEP}]
- >=dev-python/pyopenssl-23.0.0[${PYTHON_USEDEP}]
- >=dev-python/pytest-7.2.0[${PYTHON_USEDEP}]
- >=dev-python/pytest-salt-factories-1.0.0_rc17[${PYTHON_USEDEP}]
- dev-python/pytest-tempdir[${PYTHON_USEDEP}]
- dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
- dev-python/pytest-subtests[${PYTHON_USEDEP}]
- dev-python/pytest-shell-utilities[${PYTHON_USEDEP}]
- dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
- dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
- dev-python/flaky[${PYTHON_USEDEP}]
- net-dns/bind-tools
- >=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}]
- dev-util/yamllint[${PYTHON_USEDEP}]
- !x86? ( >=dev-python/boto3-1.17.67[${PYTHON_USEDEP}] )
- )
-"
-
-DOCS=( README.rst AUTHORS )
-
-REQUIRED_USE="|| ( raet zeromq )
- test? ( cheetah genshi )"
-RESTRICT="!test? ( test ) x86? ( test )"
-
-PATCHES=(
- "${FILESDIR}/salt-3003-skip-tests-that-oom-machine.patch"
- "${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
- "${FILESDIR}/salt-3002-tests.patch"
- "${FILESDIR}/salt-3003.1-tests.patch"
- "${FILESDIR}/salt-3005-tests.patch"
- "${FILESDIR}/salt-3005.1-no-entry-points.patch"
- "${FILESDIR}/salt-3005.1-importlib-metadata-5-r1.patch"
- "${FILESDIR}/salt-3005.1-tests.patch"
- "${FILESDIR}/salt-3005.1-modules-file-python-3.11-host.patch"
- "${FILESDIR}/salt-3006.2-tests.patch"
-)
-
-python_prepare_all() {
- # remove tests with external dependencies that may not be available, and
- # tests that don't work in sandbox
- rm tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py || die
- rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die
- rm tests/unit/states/test_boto_vpc.py || die
- rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die
- rm tests/pytests/functional/transport/server/test_req_channel.py || die
- rm tests/pytests/functional/utils/test_async_event_publisher.py || die
- rm tests/pytests/functional/runners/test_winrepo.py || die
-
- # tests that require network access
- rm tests/unit/{states,modules}/test_zcbuildout.py || die
- rm -r tests/integration/cloud || die
- rm -r tests/kitchen/tests/wordpress/tests || die
- rm tests/kitchen/test_kitchen.py || die
- rm tests/unit/modules/test_network.py || die
- rm tests/pytests/functional/modules/test_pip.py || die
- rm tests/pytests/unit/client/ssh/test_ssh.py || die
- rm -r tests/pytests/{integration,functional}/netapi tests/integration/netapi || die
-
- # tests require root access
- rm tests/integration/pillar/test_git_pillar.py || die
- rm tests/integration/states/test_supervisord.py || die
-
- # removes contextvars, see bug: https://bugs.gentoo.org/799431
- sed -i '/^contextvars/d' requirements/base.txt || die
-
- # make sure pkg_resources doesn't bomb because pycrypto isn't installed
- find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die
- # pycryptodome rather than pycryptodomex
- find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die
-
- distutils-r1_python_prepare_all
-}
-
-python_install_all() {
- local svc
- USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
- for svc in minion master syndic api; do
- newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc}
- newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
- systemd_dounit "${FILESDIR}"/salt-${svc}.service
- done
-
- insinto /etc/${PN}
- doins -r conf/*
-}
-
-python_test() {
- local -a EPYTEST_DESELECT=(
- # doesn't like the distutils warning
- tests/pytests/integration/cli/test_batch.py::test_batch_retcode
- tests/pytests/integration/cli/test_batch.py::test_multiple_modules_in_batch
- # hangs indefinitely
- tests/pytests/unit/test_minion.py::test_master_type_disable
- # needs root
- tests/pytests/unit/modules/test_cmdmod.py::test_runas_env_sudo_group
- # don't like sandbox
- tests/unit/cloud/clouds/test_joyent.py::JoyentTestCase::test_query_instance_has_ip
- tests/unit/cloud/clouds/test_joyent.py::JoyentTestCase::test_query_instance_init
- tests/unit/cloud/clouds/test_joyent.py::JoyentTestCase::test_query_instance_ready
- tests/unit/modules/test_win_ip.py::WinShadowTestCase::test_disable
- tests/unit/modules/test_win_ip.py::WinShadowTestCase::test_enable
- tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_is_finished_is_set_before_events_return_then_no_data_should_be_returned
- tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_is_finished_then_all_collected_data_should_be_returned
- tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_is_timed_out_is_set_before_other_events_are_completed_then_result_should_be_empty_dictionary
- tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_is_timed_out_then_all_collected_data_should_be_returned
- tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_min_wait_time_has_not_passed_then_disbatch_should_not_return_expected_data_until_time_has_passed
- tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_minions_all_return_then_all_collected_data_should_be_returned
- tests/unit/utils/test_vt.py::VTTestCase::test_split_multibyte_characters_shiftjis
- tests/unit/utils/test_vt.py::VTTestCase::test_split_multibyte_characters_unicode
- tests/pytests/unit/utils/test_vt.py::test_log_sanitize
- tests/pytests/unit/test_master.py::test_fileserver_duration
- tests/pytests/unit/modules/test_aptpkg.py::test_call_apt_dpkg_lock
- tests/unit/utils/test_schema.py::ConfigTestCase::test_anyof_config_validation
- tests/unit/utils/test_schema.py::ConfigTestCase::test_dict_config_validation
- tests/unit/utils/test_schema.py::ConfigTestCase::test_hostname_config_validation
- tests/unit/utils/test_schema.py::ConfigTestCase::test_not_config_validation
- tests/unit/utils/test_schema.py::ConfigTestCase::test_oneof_config_validation
- tests/unit/utils/test_schema.py::ConfigTestCase::test_optional_requirements_config_validation
- )
-
- # testsuite likes lots of files
- ulimit -n 4096 || die
-
- # ${T} is too long a path for the tests to work
- local TMPDIR
- TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" || die
- (
- export TMPDIR
- cleanup() { rm -rf "${TMPDIR}" || die; }
-
- trap cleanup EXIT
-
- addwrite "${TMPDIR}"
-
- USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
- epytest
- )
-}
diff --git a/app-admin/salt/salt-3005.5.ebuild b/app-admin/salt/salt-3005.5-r1.ebuild
index a107b8846f17..00992ac88f15 100644
--- a/app-admin/salt/salt-3005.5.ebuild
+++ b/app-admin/salt/salt-3005.5-r1.ebuild
@@ -86,7 +86,6 @@ BDEPEND="
test? (
${RDEPEND}
dev-python/apache-libcloud[${PYTHON_USEDEP}]
- >=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
>=dev-python/certifi-2023.07.22[${PYTHON_USEDEP}]
dev-python/cherrypy[${PYTHON_USEDEP}]
>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
@@ -119,7 +118,6 @@ REQUIRED_USE="|| ( raet zeromq )
RESTRICT="!test? ( test ) x86? ( test )"
PATCHES=(
- "${FILESDIR}/salt-3003-skip-tests-that-oom-machine.patch"
"${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
"${FILESDIR}/salt-3002-tests.patch"
"${FILESDIR}/salt-3003.1-tests.patch"
@@ -191,7 +189,9 @@ python_prepare_all() {
tests/pytests/integration/cli/test_salt_deltaproxy.py
tests/pytests/integration/cli/test_salt_proxy.py
tests/pytests/integration/master/test_clear_funcs.py
+ tests/pytests/integration/modules/test_state.py
tests/pytests/integration/proxy/test_simple.py
+ tests/pytests/integration/runners/state/orchestrate/test_events.py
tests/pytests/integration/wheel/test_pillar_roots.py
tests/pytests/unit/client/ssh/test_ssh.py
tests/pytests/unit/cloud/test_map.py
@@ -204,6 +204,8 @@ python_prepare_all() {
tests/pytests/{integration,functional}/netapi tests/integration/netapi
tests/unit/cloud/clouds/test_joyent.py
tests/unit/config/schemas/test_ssh.py
+ tests/unit/modules/test_boto3_elasticsearch.py
+ tests/unit/modules/test_boto3_route53.py
tests/unit/modules/test_network.py
tests/unit/netapi/rest_tornado/test_saltnado.py
tests/unit/{states,modules}/test_zcbuildout.py
@@ -215,6 +217,9 @@ python_prepare_all() {
rm -r "${remove_test_files[@]}" || die
+ # axe the boto dep (bug #888235)
+ find "${S}/tests" -name 'test_boto_*.py' -delete || die
+
# removes contextvars, see bug: https://bugs.gentoo.org/799431
sed -i '/^contextvars/d' requirements/base.txt || die
@@ -265,6 +270,7 @@ python_test() {
# need root
tests/pytests/unit/modules/test_cmdmod.py::test_runas_env_sudo_group
)
+
# https://bugs.gentoo.org/924377
has_version 'sys-apps/systemd' || EPYTEST_DESELECT+=(
tests/pytests/unit/modules/test_aptpkg.py::test_autoremove
diff --git a/app-admin/salt/salt-3006.2.ebuild b/app-admin/salt/salt-3006.2.ebuild
deleted file mode 100644
index 031e12b522fb..000000000000
--- a/app-admin/salt/salt-3006.2.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_10 )
-
-DISTUTILS_USE_PEP517=setuptools
-inherit systemd distutils-r1
-
-DESCRIPTION="Salt is a remote execution and configuration manager"
-HOMEPAGE="https://www.saltstack.com/resources/community/
- https://github.com/saltstack"
-
-if [[ ${PV} == 9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
- EGIT_BRANCH="develop"
-else
- inherit pypi
- KEYWORDS="~amd64 ~riscv ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="
- cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
- mongodb neutron nova openssl portage profile redis selinux test raet
- +zeromq vim-syntax
-"
-
-RDEPEND="
- sys-apps/pciutils
- >=dev-python/cryptography-41.0.3[${PYTHON_USEDEP}]
- >=dev-python/distro-1.5[${PYTHON_USEDEP}]
- >=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
- dev-python/jmespath[${PYTHON_USEDEP}]
- dev-python/libnacl[${PYTHON_USEDEP}]
- dev-python/looseversion[${PYTHON_USEDEP}]
- >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
- >=dev-python/packaging-21.3[${PYTHON_USEDEP}]
- >=dev-python/psutil-5.0.0[${PYTHON_USEDEP}]
- >=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-6.0.1[${PYTHON_USEDEP}]
- >=dev-python/markupsafe-2.1.2[${PYTHON_USEDEP}]
- >=dev-python/requests-2.31.0[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/tomli[${PYTHON_USEDEP}]
- dev-python/watchdog[${PYTHON_USEDEP}]
- libcloud? (
- dev-python/aiohttp[${PYTHON_USEDEP}]
- dev-python/aiosignal[${PYTHON_USEDEP}]
- >=dev-python/apache-libcloud-2.5.0[${PYTHON_USEDEP}]
- dev-python/async-timeout[${PYTHON_USEDEP}]
- )
- mako? ( dev-python/mako[${PYTHON_USEDEP}] )
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
- libvirt? (
- dev-python/libvirt-python[${PYTHON_USEDEP}]
- )
- openssl? (
- dev-libs/openssl:0=[-bindist(-)]
- >=dev-python/pyopenssl-23.2.0[${PYTHON_USEDEP}]
- )
- raet? (
- >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
- >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
- >=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
- )
- cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
- cheetah? ( >=dev-python/cheetah3-3.2.2[${PYTHON_USEDEP}] )
- genshi? ( dev-python/genshi[${PYTHON_USEDEP}] )
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
- portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
- keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
- redis? ( dev-python/redis[${PYTHON_USEDEP}] )
- selinux? ( sec-policy/selinux-salt )
- nova? (
- >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]
- )
- neutron? (
- >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]
- )
- gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
- profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
- vim-syntax? ( app-vim/salt-vim )
- zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] )
-"
-BDEPEND="
- dev-python/build[${PYTHON_USEDEP}]
- test? (
- ${RDEPEND}
- dev-python/apache-libcloud[${PYTHON_USEDEP}]
- >=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
- >=dev-python/certifi-2023.07.22[${PYTHON_USEDEP}]
- dev-python/cherrypy[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
- dev-python/mako[${PYTHON_USEDEP}]
- >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/moto-2.0.0[${PYTHON_USEDEP}]
- dev-python/passlib[${PYTHON_USEDEP}]
- dev-python/bcrypt[${PYTHON_USEDEP}]
- dev-python/pip[${PYTHON_USEDEP}]
- >=dev-python/pyopenssl-23.0.0[${PYTHON_USEDEP}]
- >=dev-python/pytest-7.2.0[${PYTHON_USEDEP}]
- >=dev-python/pytest-salt-factories-1.0.0_rc25[${PYTHON_USEDEP}]
- dev-python/pytest-tempdir[${PYTHON_USEDEP}]
- dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
- dev-python/pytest-subtests[${PYTHON_USEDEP}]
- dev-python/pytest-shell-utilities[${PYTHON_USEDEP}]
- dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
- dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
- dev-python/pytest-custom-exit-code[${PYTHON_USEDEP}]
- dev-python/flaky[${PYTHON_USEDEP}]
- net-dns/bind-tools
- >=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}]
- dev-util/yamllint[${PYTHON_USEDEP}]
- !x86? ( >=dev-python/boto3-1.21.46[${PYTHON_USEDEP}] )
- )
-"
-
-DOCS=( README.rst AUTHORS )
-
-REQUIRED_USE="|| ( raet zeromq )
- test? ( cheetah genshi )"
-RESTRICT="!test? ( test ) x86? ( test )"
-
-PATCHES=(
- "${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
- "${FILESDIR}/salt-3005.1-no-entry-points.patch"
- "${FILESDIR}/salt-3006-skip-tests-that-oom-machine.patch"
- "${FILESDIR}/salt-3006-tests.patch"
- "${FILESDIR}/salt-3006.2-tests.patch"
-)
-
-python_prepare_all() {
- # remove tests with external dependencies that may not be available, and
- # tests that don't work in sandbox
- rm tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py || die
- rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die
- rm tests/unit/states/test_boto_vpc.py || die
-
- #rm tests/support/gitfs.py || die
- rm tests/pytests/functional/transport/server/test_req_channel.py || die
- rm tests/pytests/functional/utils/test_async_event_publisher.py || die
- rm tests/pytests/functional/runners/test_winrepo.py || die
- rm tests/unit/netapi/rest_tornado/test_saltnado.py || die
-
- # tests that require network access
- rm tests/unit/{states,modules}/test_zcbuildout.py || die
- rm -r tests/integration/cloud || die
- rm -r tests/kitchen/tests/wordpress/tests || die
- rm tests/kitchen/test_kitchen.py || die
- rm tests/unit/modules/test_network.py || die
- rm tests/pytests/functional/modules/test_pip.py || die
- rm tests/pytests/unit/client/ssh/test_ssh.py || die
- rm -r tests/pytests/{integration,functional}/netapi tests/integration/netapi || die
-
- # tests require root access
- rm tests/integration/pillar/test_git_pillar.py || die
- rm tests/integration/states/test_supervisord.py || die
-
- # removes contextvars, see bug: https://bugs.gentoo.org/799431
- sed -i '/^contextvars/d' requirements/base.txt || die
-
- # make sure pkg_resources doesn't bomb because pycrypto isn't installed
- find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die
- # pycryptodome rather than pycryptodomex
- find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die
-
- distutils-r1_python_prepare_all
-}
-
-python_install_all() {
- local svc
- USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
- for svc in minion master syndic api; do
- newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc}
- newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
- systemd_dounit "${FILESDIR}"/salt-${svc}.service
- done
-
- insinto /etc/${PN}
- doins -r conf/*
-}
-
-python_test() {
- local -a EPYTEST_DESELECT=(
- # doesn't like the distutils warning
- tests/pytests/integration/cli/test_batch.py::test_batch_retcode
- tests/pytests/integration/cli/test_batch.py::test_multiple_modules_in_batch
- # hangs indefinitely
- tests/pytests/unit/test_minion.py::test_master_type_disable
- # needs root
- tests/pytests/unit/modules/test_cmdmod.py::test_runas_env_sudo_group
- # don't like sandbox
- tests/pytests/functional/cli/test_salt.py::test_versions_report
- tests/unit/utils/test_vt.py::test_split_multibyte_characters_unicode
- tests/unit/utils/test_vt.py::test_split_multibyte_characters_shiftjis
- tests/pytests/unit/utils/test_vt.py::test_log_sanitize
- tests/pytests/unit/client/ssh/test_single.py::test_run_with_pre_flight_args
- tests/pytests/unit/modules/test_aptpkg.py::test_call_apt_dpkg_lock
- tests/pytests/unit/test_template.py::test_compile_template_str_mkstemp_cleanup
- tests/pytests/unit/_logging/handlers/test_deferred_stream_handler.py::test_deferred_write_on_flush
- tests/pytests/unit/_logging/handlers/test_deferred_stream_handler.py::test_sync_with_handlers
- tests/pytests/unit/modules/test_portage_config.py::test_enforce_nice_config
- tests/unit/utils/test_schema.py::ConfigTestCase::test_anyof_config_validation
- tests/unit/utils/test_schema.py::ConfigTestCase::test_dict_config_validation
- tests/unit/utils/test_schema.py::ConfigTestCase::test_hostname_config_validation
- tests/unit/utils/test_schema.py::ConfigTestCase::test_not_config_validation
- tests/unit/utils/test_schema.py::ConfigTestCase::test_oneof_config_validation
- tests/unit/utils/test_schema.py::ConfigTestCase::test_optional_requirements_config_validation
- )
-
- # testsuite likes lots of files
- ulimit -n 4096 || die
-
- # ${T} is too long a path for the tests to work
- local TMPDIR
- TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" || die
- (
- export TMPDIR
- cleanup() { rm -rf "${TMPDIR}" || die; }
-
- trap cleanup EXIT
-
- addwrite "${TMPDIR}"
-
- USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
- epytest
- )
-}
diff --git a/app-admin/salt/salt-3006.3.ebuild b/app-admin/salt/salt-3006.3.ebuild
deleted file mode 100644
index af77b214d420..000000000000
--- a/app-admin/salt/salt-3006.3.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_10 )
-
-DISTUTILS_USE_PEP517=setuptools
-inherit systemd distutils-r1
-
-DESCRIPTION="Salt is a remote execution and configuration manager"
-HOMEPAGE="https://www.saltstack.com/resources/community/
- https://github.com/saltstack"
-
-if [[ ${PV} == 9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
- EGIT_BRANCH="develop"
-else
- inherit pypi
- KEYWORDS="~amd64 ~riscv ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="
- cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
- mongodb neutron nova openssl portage profile redis selinux test raet
- +zeromq vim-syntax
-"
-
-RDEPEND="
- sys-apps/pciutils
- >=dev-python/cryptography-41.0.3[${PYTHON_USEDEP}]
- >=dev-python/distro-1.5[${PYTHON_USEDEP}]
- >=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
- dev-python/jmespath[${PYTHON_USEDEP}]
- dev-python/libnacl[${PYTHON_USEDEP}]
- dev-python/looseversion[${PYTHON_USEDEP}]
- >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
- >=dev-python/packaging-21.3[${PYTHON_USEDEP}]
- >=dev-python/psutil-5.0.0[${PYTHON_USEDEP}]
- >=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-6.0.1[${PYTHON_USEDEP}]
- >=dev-python/markupsafe-2.1.2[${PYTHON_USEDEP}]
- >=dev-python/requests-2.31.0[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/tomli[${PYTHON_USEDEP}]
- dev-python/watchdog[${PYTHON_USEDEP}]
- libcloud? (
- dev-python/aiohttp[${PYTHON_USEDEP}]
- dev-python/aiosignal[${PYTHON_USEDEP}]
- >=dev-python/apache-libcloud-2.5.0[${PYTHON_USEDEP}]
- dev-python/async-timeout[${PYTHON_USEDEP}]
- )
- mako? ( dev-python/mako[${PYTHON_USEDEP}] )
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
- libvirt? (
- dev-python/libvirt-python[${PYTHON_USEDEP}]
- )
- openssl? (
- dev-libs/openssl:0=[-bindist(-)]
- >=dev-python/pyopenssl-23.2.0[${PYTHON_USEDEP}]
- )
- raet? (
- >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
- >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
- >=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
- )
- cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
- cheetah? ( >=dev-python/cheetah3-3.2.2[${PYTHON_USEDEP}] )
- genshi? ( dev-python/genshi[${PYTHON_USEDEP}] )
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
- portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
- keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
- redis? ( dev-python/redis[${PYTHON_USEDEP}] )
- selinux? ( sec-policy/selinux-salt )
- nova? (
- >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]
- )
- neutron? (
- >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]
- )
- gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
- profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
- vim-syntax? ( app-vim/salt-vim )
- zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] )
-"
-BDEPEND="
- dev-python/build[${PYTHON_USEDEP}]
- test? (
- ${RDEPEND}
- dev-python/apache-libcloud[${PYTHON_USEDEP}]
- >=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
- >=dev-python/certifi-2023.07.22[${PYTHON_USEDEP}]
- dev-python/cherrypy[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
- dev-python/mako[${PYTHON_USEDEP}]
- >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/moto-2.0.0[${PYTHON_USEDEP}]
- dev-python/passlib[${PYTHON_USEDEP}]
- dev-python/bcrypt[${PYTHON_USEDEP}]
- dev-python/pip[${PYTHON_USEDEP}]
- >=dev-python/pyopenssl-23.0.0[${PYTHON_USEDEP}]
- >=dev-python/pytest-7.2.0[${PYTHON_USEDEP}]
- >=dev-python/pytest-salt-factories-1.0.0_rc25[${PYTHON_USEDEP}]
- dev-python/pytest-tempdir[${PYTHON_USEDEP}]
- dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
- dev-python/pytest-subtests[${PYTHON_USEDEP}]
- dev-python/pytest-shell-utilities[${PYTHON_USEDEP}]
- dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
- dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
- dev-python/pytest-custom-exit-code[${PYTHON_USEDEP}]
- dev-python/flaky[${PYTHON_USEDEP}]
- net-dns/bind-tools
- >=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}]
- dev-util/yamllint[${PYTHON_USEDEP}]
- !x86? ( >=dev-python/boto3-1.21.46[${PYTHON_USEDEP}] )
- )
-"
-
-DOCS=( README.rst AUTHORS )
-
-REQUIRED_USE="|| ( raet zeromq )
- test? ( cheetah genshi )"
-RESTRICT="!test? ( test ) x86? ( test )"
-
-PATCHES=(
- "${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
- "${FILESDIR}/salt-3005.1-no-entry-points.patch"
- "${FILESDIR}/salt-3006-skip-tests-that-oom-machine.patch"
- "${FILESDIR}/salt-3006.2-tests.patch"
- "${FILESDIR}/salt-3006.3-tests.patch"
-)
-
-python_prepare_all() {
- # remove tests with external dependencies that may not be available, and
- # tests that don't work in sandbox
- rm tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py || die
- rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die
- rm tests/unit/states/test_boto_vpc.py || die
-
- #rm tests/support/gitfs.py || die
- rm tests/pytests/functional/transport/server/test_req_channel.py || die
- rm tests/pytests/functional/utils/test_async_event_publisher.py || die
- rm tests/pytests/functional/runners/test_winrepo.py || die
- rm tests/unit/netapi/rest_tornado/test_saltnado.py || die
-
- # tests that require network access
- rm tests/unit/{states,modules}/test_zcbuildout.py || die
- rm -r tests/integration/cloud || die
- rm -r tests/kitchen/tests/wordpress/tests || die
- rm tests/kitchen/test_kitchen.py || die
- rm tests/unit/modules/test_network.py || die
- rm tests/pytests/functional/modules/test_pip.py || die
- rm tests/pytests/unit/client/ssh/test_ssh.py || die
- rm -r tests/pytests/{integration,functional}/netapi tests/integration/netapi || die
-
- # tests require root access
- rm tests/integration/pillar/test_git_pillar.py || die
- rm tests/integration/states/test_supervisord.py || die
-
- # removes contextvars, see bug: https://bugs.gentoo.org/799431
- sed -i '/^contextvars/d' requirements/base.txt || die
-
- # make sure pkg_resources doesn't bomb because pycrypto isn't installed
- find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die
- # pycryptodome rather than pycryptodomex
- find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die
- # called_once should be assert_called_once_with
- find "${S}/tests" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:[.]called_once:.assert_called_once:g' -- || die
-
- distutils-r1_python_prepare_all
-}
-
-python_install_all() {
- local svc
- USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
- for svc in minion master syndic api; do
- newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc}
- newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
- systemd_dounit "${FILESDIR}"/salt-${svc}.service
- done
-
- insinto /etc/${PN}
- doins -r conf/*
-}
-
-python_test() {
- local -a EPYTEST_DESELECT=(
- # doesn't like the distutils warning
- tests/pytests/integration/cli/test_batch.py::test_batch_retcode
- tests/pytests/integration/cli/test_batch.py::test_multiple_modules_in_batch
- # hangs indefinitely
- tests/pytests/unit/test_minion.py::test_master_type_disable
- # needs root
- tests/pytests/unit/modules/test_cmdmod.py::test_runas_env_sudo_group
- # don't like sandbox
- tests/pytests/functional/cli/test_salt.py::test_versions_report
- tests/unit/utils/test_vt.py::test_split_multibyte_characters_unicode
- tests/unit/utils/test_vt.py::test_split_multibyte_characters_shiftjis
- tests/pytests/unit/utils/test_vt.py::test_log_sanitize
- tests/pytests/unit/client/ssh/test_single.py::test_run_with_pre_flight_args
- tests/pytests/unit/modules/test_aptpkg.py::test_call_apt_dpkg_lock
- tests/pytests/unit/test_master.py::test_fileserver_duration
- tests/pytests/unit/test_template.py::test_compile_template_str_mkstemp_cleanup
- tests/pytests/unit/_logging/handlers/test_deferred_stream_handler.py::test_deferred_write_on_flush
- tests/pytests/unit/_logging/handlers/test_deferred_stream_handler.py::test_sync_with_handlers
- tests/pytests/unit/modules/test_portage_config.py::test_enforce_nice_config
- tests/pytests/unit/modules/test_msteams.py::test_post_card
- tests/pytests/unit/states/test_file.py::test_file_recurse_directory_test
- tests/unit/utils/test_schema.py::ConfigTestCase::test_anyof_config_validation
- tests/unit/utils/test_schema.py::ConfigTestCase::test_dict_config_validation
- tests/unit/utils/test_schema.py::ConfigTestCase::test_hostname_config_validation
- tests/unit/utils/test_schema.py::ConfigTestCase::test_not_config_validation
- tests/unit/utils/test_schema.py::ConfigTestCase::test_oneof_config_validation
- tests/unit/utils/test_schema.py::ConfigTestCase::test_optional_requirements_config_validation
- )
-
- # testsuite likes lots of files
- ulimit -n 4096 || die
-
- # ${T} is too long a path for the tests to work
- local TMPDIR
- TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" || die
- (
- export TMPDIR
- cleanup() { rm -rf "${TMPDIR}" || die; }
-
- trap cleanup EXIT
-
- addwrite "${TMPDIR}"
-
- USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
- epytest
- )
-}
diff --git a/app-admin/salt/salt-3006.4.ebuild b/app-admin/salt/salt-3006.4.ebuild
deleted file mode 100644
index 5de5f5a464f7..000000000000
--- a/app-admin/salt/salt-3006.4.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_10 )
-
-DISTUTILS_USE_PEP517=setuptools
-inherit systemd distutils-r1
-
-DESCRIPTION="Salt is a remote execution and configuration manager"
-HOMEPAGE="https://www.saltstack.com/resources/community/
- https://github.com/saltstack"
-
-if [[ ${PV} == 9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
- EGIT_BRANCH="develop"
-else
- inherit pypi
- KEYWORDS="~amd64 ~riscv ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="
- cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
- mongodb neutron nova openssl portage profile redis selinux test raet
- +zeromq vim-syntax
-"
-
-RDEPEND="
- sys-apps/pciutils
- >=dev-python/cryptography-41.0.3[${PYTHON_USEDEP}]
- >=dev-python/distro-1.5[${PYTHON_USEDEP}]
- >=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
- dev-python/jmespath[${PYTHON_USEDEP}]
- dev-python/libnacl[${PYTHON_USEDEP}]
- dev-python/looseversion[${PYTHON_USEDEP}]
- >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
- >=dev-python/packaging-21.3[${PYTHON_USEDEP}]
- >=dev-python/psutil-5.0.0[${PYTHON_USEDEP}]
- >=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-6.0.1[${PYTHON_USEDEP}]
- >=dev-python/markupsafe-2.1.2[${PYTHON_USEDEP}]
- >=dev-python/requests-2.31.0[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/tomli[${PYTHON_USEDEP}]
- dev-python/watchdog[${PYTHON_USEDEP}]
- libcloud? (
- dev-python/aiohttp[${PYTHON_USEDEP}]
- dev-python/aiosignal[${PYTHON_USEDEP}]
- >=dev-python/apache-libcloud-2.5.0[${PYTHON_USEDEP}]
- dev-python/async-timeout[${PYTHON_USEDEP}]
- )
- mako? ( dev-python/mako[${PYTHON_USEDEP}] )
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
- libvirt? (
- dev-python/libvirt-python[${PYTHON_USEDEP}]
- )
- openssl? (
- dev-libs/openssl:0=[-bindist(-)]
- >=dev-python/pyopenssl-23.2.0[${PYTHON_USEDEP}]
- )
- raet? (
- >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
- >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
- >=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
- )
- cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
- cheetah? ( >=dev-python/cheetah3-3.2.2[${PYTHON_USEDEP}] )
- genshi? ( dev-python/genshi[${PYTHON_USEDEP}] )
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
- portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
- keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
- redis? ( dev-python/redis[${PYTHON_USEDEP}] )
- selinux? ( sec-policy/selinux-salt )
- nova? (
- >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]
- )
- neutron? (
- >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]
- )
- gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
- profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
- vim-syntax? ( app-vim/salt-vim )
- zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] )
-"
-BDEPEND="
- dev-python/build[${PYTHON_USEDEP}]
- test? (
- ${RDEPEND}
- dev-python/apache-libcloud[${PYTHON_USEDEP}]
- >=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
- >=dev-python/certifi-2023.07.22[${PYTHON_USEDEP}]
- dev-python/cherrypy[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
- dev-python/mako[${PYTHON_USEDEP}]
- >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/moto-2.0.0[${PYTHON_USEDEP}]
- dev-python/passlib[${PYTHON_USEDEP}]
- dev-python/bcrypt[${PYTHON_USEDEP}]
- dev-python/pip[${PYTHON_USEDEP}]
- >=dev-python/pyopenssl-23.0.0[${PYTHON_USEDEP}]
- >=dev-python/pytest-7.2.0[${PYTHON_USEDEP}]
- >=dev-python/pytest-salt-factories-1.0.0_rc25[${PYTHON_USEDEP}]
- dev-python/pytest-tempdir[${PYTHON_USEDEP}]
- dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
- dev-python/pytest-subtests[${PYTHON_USEDEP}]
- dev-python/pytest-shell-utilities[${PYTHON_USEDEP}]
- dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
- dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
- dev-python/pytest-custom-exit-code[${PYTHON_USEDEP}]
- dev-python/flaky[${PYTHON_USEDEP}]
- net-dns/bind-tools
- >=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}]
- dev-util/yamllint[${PYTHON_USEDEP}]
- !x86? ( >=dev-python/boto3-1.21.46[${PYTHON_USEDEP}] )
- )
-"
-
-DOCS=( README.rst AUTHORS )
-
-REQUIRED_USE="|| ( raet zeromq )
- test? ( cheetah genshi )"
-RESTRICT="!test? ( test ) x86? ( test )"
-
-PATCHES=(
- "${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
- "${FILESDIR}/salt-3005.1-no-entry-points.patch"
- "${FILESDIR}/salt-3006-skip-tests-that-oom-machine.patch"
-)
-
-python_prepare_all() {
- # remove tests with external dependencies that may not be available, and
- # tests that don't work in sandbox
- rm tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py || die
- rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die
- rm tests/unit/states/test_boto_vpc.py || die
-
- #rm tests/support/gitfs.py || die
- rm tests/pytests/functional/transport/server/test_req_channel.py || die
- rm tests/pytests/functional/utils/test_async_event_publisher.py || die
- rm tests/pytests/functional/runners/test_winrepo.py || die
- rm tests/unit/netapi/rest_tornado/test_saltnado.py || die
-
- # tests that require network access
- rm tests/unit/{states,modules}/test_zcbuildout.py || die
- rm -r tests/integration/cloud || die
- rm -r tests/kitchen/tests/wordpress/tests || die
- rm tests/kitchen/test_kitchen.py || die
- rm tests/unit/modules/test_network.py || die
- rm tests/pytests/functional/modules/test_pip.py || die
- rm tests/pytests/unit/client/ssh/test_ssh.py || die
- rm -r tests/pytests/{integration,functional}/netapi tests/integration/netapi || die
-
- # tests require root access
- rm tests/integration/pillar/test_git_pillar.py || die
- rm tests/integration/states/test_supervisord.py || die
-
- # removes contextvars, see bug: https://bugs.gentoo.org/799431
- sed -i '/^contextvars/d' requirements/base.txt || die
-
- # make sure pkg_resources doesn't bomb because pycrypto isn't installed
- find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die
- # pycryptodome rather than pycryptodomex
- find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die
- # called_once should be assert_called_once_with
- find "${S}/tests" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:[.]called_once:.assert_called_once:g' -- || die
-
- distutils-r1_python_prepare_all
-}
-
-python_install_all() {
- local svc
- USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
- for svc in minion master syndic api; do
- newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc}
- newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
- systemd_dounit "${FILESDIR}"/salt-${svc}.service
- done
-
- insinto /etc/${PN}
- doins -r conf/*
-}
-
-python_test() {
- local -a EPYTEST_DESELECT=(
- # doesn't like the distutils warning
- tests/pytests/integration/cli/test_batch.py::test_batch_retcode
- tests/pytests/integration/cli/test_batch.py::test_multiple_modules_in_batch
- # hangs indefinitely
- tests/pytests/unit/test_minion.py::test_master_type_disable
- # needs root
- tests/pytests/unit/modules/test_cmdmod.py::test_runas_env_sudo_group
- # don't like sandbox
- tests/pytests/functional/cli/test_salt.py::test_versions_report
- tests/unit/utils/test_vt.py::test_split_multibyte_characters_unicode
- tests/unit/utils/test_vt.py::test_split_multibyte_characters_shiftjis
- tests/pytests/unit/utils/test_vt.py::test_log_sanitize
- tests/pytests/unit/client/ssh/test_single.py::test_run_with_pre_flight_args
- tests/pytests/unit/modules/test_aptpkg.py::test_call_apt_dpkg_lock
- tests/pytests/unit/test_master.py::test_fileserver_duration
- tests/pytests/unit/test_template.py::test_compile_template_str_mkstemp_cleanup
- tests/pytests/unit/_logging/handlers/test_deferred_stream_handler.py::test_deferred_write_on_flush
- tests/pytests/unit/_logging/handlers/test_deferred_stream_handler.py::test_sync_with_handlers
- tests/pytests/unit/modules/test_portage_config.py::test_enforce_nice_config
- tests/pytests/unit/modules/test_msteams.py::test_post_card
- tests/pytests/unit/states/test_file.py::test_file_recurse_directory_test
- tests/unit/utils/test_schema.py::ConfigTestCase::test_anyof_config_validation
- tests/unit/utils/test_schema.py::ConfigTestCase::test_dict_config_validation
- tests/unit/utils/test_schema.py::ConfigTestCase::test_hostname_config_validation
- tests/unit/utils/test_schema.py::ConfigTestCase::test_not_config_validation
- tests/unit/utils/test_schema.py::ConfigTestCase::test_oneof_config_validation
- tests/unit/utils/test_schema.py::ConfigTestCase::test_optional_requirements_config_validation
- )
-
- # testsuite likes lots of files
- ulimit -n 4096 || die
-
- # ${T} is too long a path for the tests to work
- local TMPDIR
- TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" || die
- (
- export TMPDIR
- cleanup() { rm -rf "${TMPDIR}" || die; }
-
- trap cleanup EXIT
-
- addwrite "${TMPDIR}"
-
- USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
- epytest
- )
-}
diff --git a/app-admin/salt/salt-3006.5.ebuild b/app-admin/salt/salt-3006.5-r1.ebuild
index f6b28047c843..42a1f42b6498 100644
--- a/app-admin/salt/salt-3006.5.ebuild
+++ b/app-admin/salt/salt-3006.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -90,7 +90,7 @@ BDEPEND="
test? (
${RDEPEND}
dev-python/apache-libcloud[${PYTHON_USEDEP}]
- >=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+ dev-python/boto3[${PYTHON_USEDEP}]
>=dev-python/certifi-2023.07.22[${PYTHON_USEDEP}]
dev-python/cherrypy[${PYTHON_USEDEP}]
>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
@@ -127,36 +127,86 @@ RESTRICT="!test? ( test ) x86? ( test )"
PATCHES=(
"${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
"${FILESDIR}/salt-3005.1-no-entry-points.patch"
- "${FILESDIR}/salt-3006-skip-tests-that-oom-machine.patch"
)
python_prepare_all() {
- # remove tests with external dependencies that may not be available, and
- # tests that don't work in sandbox
- rm tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py || die
- rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die
- rm tests/unit/states/test_boto_vpc.py || die
-
- #rm tests/support/gitfs.py || die
- rm tests/pytests/functional/transport/server/test_req_channel.py || die
- rm tests/pytests/functional/utils/test_async_event_publisher.py || die
- rm tests/pytests/functional/runners/test_winrepo.py || die
- rm tests/unit/netapi/rest_tornado/test_saltnado.py || die
-
- # tests that require network access
- rm tests/unit/{states,modules}/test_zcbuildout.py || die
- rm -r tests/integration/cloud || die
- rm -r tests/kitchen/tests/wordpress/tests || die
- rm tests/kitchen/test_kitchen.py || die
- rm tests/unit/modules/test_network.py || die
- rm tests/pytests/functional/modules/test_pip.py || die
- rm tests/pytests/unit/client/ssh/test_ssh.py || die
- rm -r tests/pytests/{integration,functional}/netapi tests/integration/netapi || die
-
- # tests require root access
- rm tests/integration/pillar/test_git_pillar.py || die
- rm tests/integration/states/test_supervisord.py || die
- rm tests/pytests/scenarios/performance/test_performance.py || die
+ local -a remove_test_files=(
+ # remove tests with external dependencies that may not be available, and
+ # tests that don't work in sandbox
+ tests/pytests/functional/modules/file/test_readlink.py
+ tests/pytests/functional/modules/file/test_symlink.py
+ tests/pytests/functional/modules/state/test_jinja_filters.py
+ tests/pytests/functional/modules/state/test_jinja_renderer.py
+ tests/pytests/functional/modules/state/test_mako_renderer.py
+ tests/pytests/functional/modules/state/test_pyobjects_renderer.py
+ tests/pytests/functional/pillar/test_gpg.py
+ tests/pytests/functional/runners/test_winrepo.py
+ tests/pytests/functional/states/file/test_keyvalue.py
+ tests/pytests/functional/states/file/test_patch.py
+ tests/pytests/functional/transport/server/test_req_channel.py
+ tests/pytests/functional/utils/test_async_event_publisher.py
+ tests/pytests/integration/master/test_clear_funcs.py
+ tests/pytests/integration/minion/test_reauth.py
+ tests/pytests/integration/returners/test_noop_return.py
+ tests/pytests/integration/runners/test_manage.py
+ tests/pytests/integration/states/test_ini_manage.py
+ tests/pytests/integration/states/test_state_test.py
+ tests/pytests/integration/utils/test_templates.py
+ tests/pytests/unit/loader/test_lazy.py
+ tests/pytests/unit/modules/test_aptpkg.py
+ tests/pytests/unit/roster/test_dir.py
+ tests/pytests/unit/states/file/test_keyvalue.py
+ tests/pytests/unit/utils/jinja/test_get_template.py
+ tests/pytests/unit/utils/jinja/test_salt_cache_loader.py
+ tests/unit/modules/test_boto_{vpc,secgroup,elb}.py
+ tests/unit/netapi/rest_tornado/test_saltnado.py
+ tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py
+
+ # tests that require network access
+ tests/integration/cloud
+ tests/integration/netapi
+ tests/kitchen/test_kitchen.py
+ tests/kitchen/tests/wordpress/tests
+ tests/pytests/functional/cli/test_salt_cloud.py
+ tests/pytests/functional/cli/test_salt_run_.py
+ tests/pytests/functional/modules/test_http.py
+ tests/pytests/functional/modules/test_pip.py
+ tests/pytests/integration/cli/test_salt_proxy.py
+ tests/pytests/integration/modules/state/test_state.py
+ tests/pytests/integration/modules/state/test_state_state_events.py
+ tests/pytests/integration/modules/test_jinja.py
+ tests/pytests/integration/modules/test_state.py
+ tests/pytests/integration/modules/test_test.py
+ tests/pytests/integration/pillar/cache/test_pillar_cache.py
+ tests/pytests/integration/pillar/test_pillar_include.py
+ tests/pytests/integration/proxy/test_simple.py
+ tests/pytests/integration/runners/state/orchestrate/test_events.py
+ tests/pytests/integration/wheel/test_pillar_roots.py
+ tests/pytests/unit/client/ssh/test_ssh.py
+ tests/pytests/unit/test_client.py
+ tests/pytests/{integration,functional}/netapi
+ tests/unit/modules/test_boto3_elasticsearch.py
+ tests/unit/modules/test_boto3_route53.py
+ tests/unit/modules/test_network.py
+ tests/unit/{states,modules}/test_zcbuildout.py
+
+ # tests require root access
+ tests/integration/pillar/test_git_pillar.py
+ tests/integration/states/test_supervisord.py
+ tests/pytests/functional/states/file/test_accumulated.py
+ tests/pytests/scenarios/performance/test_performance.py
+ tests/pytests/unit/cloud/test_map.py
+ tests/pytests/unit/modules/state/test_state.py
+ tests/pytests/unit/modules/state/test_top_file_merge.py
+ tests/pytests/unit/proxy/test_netmiko_px.py
+ tests/pytests/unit/proxy/test_ssh_sample.py
+ tests/pytests/unit/roster/test_sshknownhosts.py
+ )
+
+ rm -r "${remove_test_files[@]}" || die
+
+ # axe the boto dep (bug #888235)
+ find "${S}/tests" -name 'test_boto_*.py' -delete || die
# removes contextvars, see bug: https://bugs.gentoo.org/799431
sed -i '/^contextvars/d' requirements/base.txt || die
@@ -165,6 +215,7 @@ python_prepare_all() {
find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die
# pycryptodome rather than pycryptodomex
find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die
+
# called_once should be assert_called_once_with
find "${S}/tests" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:[.]called_once:.assert_called_once:g' -- || die
@@ -190,36 +241,80 @@ python_test() {
# doesn't like the distutils warning
tests/pytests/integration/cli/test_batch.py::test_batch_retcode
tests/pytests/integration/cli/test_batch.py::test_multiple_modules_in_batch
+
# hangs indefinitely
tests/pytests/unit/test_minion.py::test_master_type_disable
+
# needs root
tests/pytests/unit/modules/test_cmdmod.py::test_runas_env_sudo_group
+ tests/pytests/unit/modules/test_portage_config.py::test_enforce_nice_config
+ tests/pytests/integration/modules/test_cmdmod.py::test_long_stdout
+
# don't like sandbox
tests/pytests/functional/cli/test_salt.py::test_help_log
tests/pytests/functional/cli/test_salt.py::test_versions_report
+ tests/pytests/functional/fileserver/test_roots.py::test_symlink_list
+ tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_content
+ tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_empty_file
+ tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_append_on_match
+ tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_match_newline
+ tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_match_no_newline
+ tests/pytests/functional/modules/test_defaults.py::test_defaults_get
+ tests/pytests/functional/pillar/test_top.py::test_pillar_top_compound_match
+ tests/pytests/functional/states/file/test_append.py::test_file_append_check_cmd
+ tests/pytests/functional/states/file/test_blockreplace.py::test_issue_49043
+ tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_in
+ tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_in_with_id
+ tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_with_name
+ tests/pytests/functional/states/file/test_managed.py::test_file_managed_requisites
+ tests/pytests/functional/states/file/test_managed.py::test_issue_8947_utf8_sls
+ tests/pytests/functional/states/file/test_managed.py::test_managed_escaped_file_path
+ tests/pytests/functional/states/file/test_managed.py::test_managed_file_issue_51208
+ tests/pytests/functional/states/file/test_managed.py::test_managed_file_with_grains_data
+ tests/pytests/functional/states/file/test_managed.py::test_managed_latin1_diff
+ tests/pytests/functional/states/file/test_managed.py::test_managed_source_hash_indifferent_case
+ tests/pytests/functional/states/file/test_managed.py::test_managed_unicode_jinja_with_tojson_filter
+ tests/pytests/functional/states/file/test_managed.py::test_verify_ssl_https_source[False]
+ tests/pytests/functional/states/file/test_managed.py::test_verify_ssl_https_source[True]
+ tests/pytests/functional/states/file/test_recurse.py::test_issue_2726_mode_kwarg
+ tests/pytests/functional/states/file/test_replace.py::test_file_replace_check_cmd
+ tests/pytests/functional/states/file/test_replace.py::test_file_replace_prerequired_issues_55775
+ tests/pytests/functional/utils/functools/test_namespaced_function.py::test_namespacing
tests/pytests/integration/ssh/test_pillar_compilation.py::test_gpg_pillar
tests/pytests/integration/ssh/test_pillar_compilation.py::test_saltutil_runner
- tests/unit/utils/test_vt.py::test_split_multibyte_characters_unicode
- tests/unit/utils/test_vt.py::test_split_multibyte_characters_shiftjis
- tests/pytests/unit/utils/test_vt.py::test_log_sanitize
- tests/pytests/unit/client/ssh/test_single.py::test_run_with_pre_flight_args
- tests/pytests/unit/modules/test_aptpkg.py::test_call_apt_dpkg_lock
- tests/pytests/unit/modules/test_yumpkg.py::test_get_yum_config
- tests/pytests/unit/test_master.py::test_fileserver_duration
- tests/pytests/unit/test_template.py::test_compile_template_str_mkstemp_cleanup
tests/pytests/unit/_logging/handlers/test_deferred_stream_handler.py::test_deferred_write_on_flush
tests/pytests/unit/_logging/handlers/test_deferred_stream_handler.py::test_sync_with_handlers
- tests/pytests/unit/modules/test_portage_config.py::test_enforce_nice_config
+ tests/pytests/unit/client/ssh/test_single.py::test_run_with_pre_flight_args
+ tests/pytests/unit/config/schemas/test_ssh.py::test_config_validate
+ tests/pytests/unit/modules/test_aptpkg.py::test_call_apt_dpkg_lock
tests/pytests/unit/modules/test_msteams.py::test_post_card
+ tests/pytests/unit/modules/test_portage_config.py::test_enforce_nice_config
+ tests/pytests/unit/modules/test_saltutil.py::test_clear_job_cache
+ tests/pytests/unit/modules/test_saltutil.py::test_list_extmods
+ tests/pytests/unit/modules/test_yumpkg.py::test_get_yum_config
+ tests/pytests/unit/pillar/test_pillar.py::test_pillar_get_cache_disk
tests/pytests/unit/renderers/test_yamlex.py::test_basic
tests/pytests/unit/renderers/test_yamlex.py::test_complex
tests/pytests/unit/states/test_file.py::test_file_recurse_directory_test
+ tests/pytests/unit/test_ext_importers.py::test_tornado_import_override
+ tests/pytests/unit/test_master.py::test_fileserver_duration
+ tests/pytests/unit/test_template.py::test_compile_template_str_mkstemp_cleanup
+ tests/pytests/unit/utils/test_cache.py::test_context_wrapper
+ tests/pytests/unit/utils/test_cache.py::test_refill_cache
+ tests/pytests/unit/utils/test_cache.py::test_set_cache
+ tests/pytests/unit/utils/test_http.py::test_requests_session_verify_ssl_false
+ tests/pytests/unit/utils/test_vt.py::test_log_sanitize
tests/unit/utils/test_schema.py::ConfigTestCase::test_anyof_config_validation
+ tests/unit/utils/test_schema.py::ConfigTestCase::test_array_config_validation
+ tests/unit/utils/test_schema.py::ConfigTestCase::test_array_config_validation
tests/unit/utils/test_schema.py::ConfigTestCase::test_dict_config_validation
tests/unit/utils/test_schema.py::ConfigTestCase::test_hostname_config_validation
tests/unit/utils/test_schema.py::ConfigTestCase::test_not_config_validation
tests/unit/utils/test_schema.py::ConfigTestCase::test_oneof_config_validation
tests/unit/utils/test_schema.py::ConfigTestCase::test_optional_requirements_config_validation
+ tests/unit/utils/test_vt.py::test_split_multibyte_characters_shiftjis
+ tests/unit/utils/test_vt.py::test_split_multibyte_characters_unicode
+
# tests that need network access
tests/pytests/unit/utils/test_http.py::test_query_proxy
tests/pytests/unit/utils/test_http.py::test_backends_decode_body_false
diff --git a/app-admin/salt/salt-3006.7.ebuild b/app-admin/salt/salt-3006.7-r1.ebuild
index 18725f3ff3dd..e9171e89adf7 100644
--- a/app-admin/salt/salt-3006.7.ebuild
+++ b/app-admin/salt/salt-3006.7-r1.ebuild
@@ -91,7 +91,7 @@ BDEPEND="
${RDEPEND}
app-arch/zip
dev-python/apache-libcloud[${PYTHON_USEDEP}]
- >=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+ dev-python/boto3[${PYTHON_USEDEP}]
>=dev-python/certifi-2023.07.22[${PYTHON_USEDEP}]
dev-python/cherrypy[${PYTHON_USEDEP}]
>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
@@ -129,7 +129,6 @@ RESTRICT="!test? ( test ) x86? ( test )"
PATCHES=(
"${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
"${FILESDIR}/salt-3005.1-no-entry-points.patch"
- "${FILESDIR}/salt-3006-skip-tests-that-oom-machine.patch"
)
python_prepare_all() {
@@ -144,6 +143,7 @@ python_prepare_all() {
tests/pytests/functional/modules/state/test_pyobjects_renderer.py
tests/pytests/functional/pillar/test_gpg.py
tests/pytests/functional/runners/test_winrepo.py
+ tests/pytests/functional/states/file/test_keyvalue.py
tests/pytests/functional/states/file/test_patch.py
tests/pytests/functional/transport/server/test_req_channel.py
tests/pytests/functional/utils/test_async_event_publisher.py
@@ -213,10 +213,13 @@ python_prepare_all() {
tests/pytests/pkg/integration/test_version.py
tests/pytests/pkg/upgrade/test_salt_upgrade.py
tests/pytests/unit/client/ssh/test_ssh.py
+ tests/pytests/unit/loader/test_loading_modules.py
tests/pytests/unit/test_client.py
tests/pytests/unit/utils/test_aws.py
tests/pytests/unit/utils/test_http.py
tests/pytests/{integration,functional}/netapi tests/integration/netapi
+ tests/unit/modules/test_boto3_elasticsearch.py
+ tests/unit/modules/test_boto3_route53.py
tests/unit/modules/test_network.py
tests/unit/{states,modules}/test_zcbuildout.py
@@ -236,6 +239,9 @@ python_prepare_all() {
rm -r "${remove_test_files[@]}" || die
+ # axe the boto dep (bug #888235)
+ find "${S}/tests" -name 'test_boto_*.py' -delete || die
+
# removes contextvars, see bug: https://bugs.gentoo.org/799431
sed -i '/^contextvars/d' requirements/base.txt || die
@@ -286,7 +292,6 @@ python_test() {
tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_in
tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_in_with_id
tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_with_name
- tests/pytests/functional/states/file/test_keyvalue.py::test_keyvalue
tests/pytests/functional/states/file/test_managed.py::test_file_managed_requisites
tests/pytests/functional/states/file/test_managed.py::test_issue_8947_utf8_sls
tests/pytests/functional/states/file/test_managed.py::test_managed_escaped_file_path