Still fixing deps issues for ha 2042.10.2

This commit is contained in:
Xavier FORESTIER 2024-10-23 09:19:50 +02:00
parent a48e1181be
commit b82d6b38c7
30 changed files with 505 additions and 46 deletions

View File

@ -21,4 +21,4 @@ EBUILD homeassistant-full-2024.6.4.ebuild 87802 BLAKE2B 266b07de8f1443d187024699
EBUILD homeassistant-full-9999.ebuild 87715 BLAKE2B 54bdcdbc3e0e48d70a849e6ecec43e29e7a0900ba80685bd39613ec032dbdd174581ce39751120108baa2adc3e232e947597758c898017ca51bd5c6ad321cd29 SHA512 cf44446b6b1fc1031dccf50b7a4fd55a8f4623a97c7c264b2d77ad4b881b341db691a06a224d7df7842b01168875e85e3b4716935b2ad957751be40ea28d7234
MISC genebuild.sh 20826 BLAKE2B 21e5c5c45139392abe5f6a5b3fdb2a663ad0626333644a9bd93b78ff6a616be505d0db7c0949fef8d0b642ca1a78240623d1e2cc1c9a7b9ffb53a28fd56f4b63 SHA512 181e671e1a7b17f52a178eb83cbb05a2603451a95e9391f6e10ce21cb7a464745db8fa9628d57ed66617c2863c7a5de65024ec9417bdd6ebf2141db8d12e422c
MISC metadata.xml 93089 BLAKE2B 01dd2ec3963a9c126163f40d13631016482d5dbb662fe465cb03ddbfc41fa6d7a81f2f7ecdcd671b4394ec5180e28acbf5dbb886d36ddc876498caeb706baed9 SHA512 2a105e066da64eb8babc874e3aae6481e37e889478445ef7a4b489cd1181c5432e8025b67c51470f29ec6ad20fa39a60acc458d7f9f3a7bfac3ab9c1ead06410
MISC test.sh 900 BLAKE2B fe831a0094d5d4e0e377eb1eea9ecd9e946a72ea4cf2184e18f0d796efb6e358f551c4c130f7485c50e923d58eb5f893ee6662f43e1efc492de2dfc849f548ba SHA512 ac10fad36f0135b0ab8c4695d2a2051ef63cc200c0d9a9a503416947d226d8eefcba5e97110d097935d22bb103863e42d22fb1707bb6aa7ba5691c093a57fe4b
MISC test.sh 926 BLAKE2B 708bb019794aca023737207aa635a8b7abebd834a34695044a322f59949f10ffe4d353cc9fb4e1a4f75fb7bf8aa9887b0b5fc783ef772966add048eb5f9ab9fc SHA512 8cffffd75934242b4d6a449cb7f494de08158bad805bb21f23201be4a9d4f11aab849bb0a5a06515e0b08f7beb5c37baf6ae82c2b80f41597f0163c87726eaa0

View File

@ -17,7 +17,7 @@ for u in `cat $( echo $pkg | cut -d/ -f2 ).ebuild | grep IUSE= | cut -d\" -f2`;
MYUSE="$MYUSE$u "
fi
done
USE="$MYUSE" emerge --oneshot --autounmask --autounmask-write=y --autounmask-use=y --autounmask-backtrack=y --verbose-conflicts --backtrack=30 -va =$pkg
USE="$MYUSE" emerge --keep-going --oneshot --autounmask --autounmask-write=y --autounmask-use=y --autounmask-backtrack=y --verbose-conflicts --backtrack=30 -va =$pkg
dispatch-conf
USE="$MYUSE" emerge --oneshot --verbose-conflicts --backtrack=30 -va =$pkg
USE="$MYUSE" emerge --keep-going --oneshot --verbose-conflicts --backtrack=30 -va =$pkg
rm /etc/portage/package.use/zzzzz_tmp.use

View File

@ -1,3 +1,3 @@
DIST aioflo-2021.11.0.tar.gz 9692 BLAKE2B 030a658798f425922c3d948fb135eb0c82ebd96015176d872824f6ec05f327ba02614f477715fa9b162e21fa0fdb616dc18be35bfcdd4398098344096f71f9a8 SHA512 287b7c868aaec726e4ce7ed31193563cbd9c5c07959d347541f83f08faeaf33d4b649db83cc7b2653ec8f7542352fbd624002e22eb084c15f1892f80700546f5
EBUILD aioflo-2021.11.0.ebuild 670 BLAKE2B ec3624d7d083e9bbac994fbeb2646bd24f71a49321f2af6189e4a548a31fefbf7465e532c897f34c7fb1d293f229d8c871ef5ae0d47d98dde631ff2113b98845 SHA512 a4224c77295d04a04263c2148583a6bb60ca9c3356b0ed10ea3e398ecb83e388b8a782056f42da421485a3a224ffbf16b49453aa5fe922ecbfadfd65c4bcd028
EBUILD aioflo-2021.11.0.ebuild 666 BLAKE2B 107583918c0826edb9cd77cd3284531e990eb2aeb4256f1816495ad49e1105c5b1f738afe68375702d40d05a29bd18a2b0daeda6b9ac3a2f9e58dc548532ed1c SHA512 d729f7cfd722744fe88b86e1c2e836aa5360029cf36ffa04c6060f95573a1c7955cb55aa8a1b3f2f60053eaedc4e76a39c1c3c07b83d73acde17afa6d6805d35
MISC metadata.xml 504 BLAKE2B 71c62420bb206911f56b78aa1a23b1ef745799cc1f33b5eb5170c284b3dfa0ee63043cfe8293de9c8710a231e25c54a7e7ec7a4663d46eecea6a99d50b7569d6 SHA512 8f888a55aa8ef0ef90a428854bcf9bd46a9cd841d3fe9c2a53e7beebaf18941cbafe619c0b501f29df45266bddc07a059d3e21306a14920a72be735ce8ed942d

View File

@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
DISTUTILS_USE_PEP517=setuptools
DISTUTILS_USE_PEP517=poetry
inherit distutils-r1 pypi
DESCRIPTION="A Python3, async-friendly library for Flo by Moen Smart Water Detectors"
HOMEPAGE="https://github.com/bachya/aioflo https://pypi.org/project/aioflo/"

View File

@ -7,5 +7,5 @@ EBUILD aiohomekit-3.0.9.ebuild 1355 BLAKE2B 82a9ce0427f8314404ecfeb580799be1ea49
EBUILD aiohomekit-3.1.1.ebuild 1411 BLAKE2B 41ca6e965bc760c1e1eb054913b0488e9187081bb4c44ba5f4b75b616ea99a904944c2632b6a6744c79dac7181bf20a0f432dac6f37765a6c3800954c8505d6c SHA512 7dfd2e356a6d7f71ce1a250cdb858899cd75728724b65a8c73048d9a5194a78170436f5412d89b1d0d33e696986a671e7d3adb261cb82ad70c5e76937eba2c93
EBUILD aiohomekit-3.1.4.ebuild 1333 BLAKE2B 9283a6547b0cc266a33ea4a09e9568feee17d807be7c81ce766cdb85b28af06634006809d4fd36fc1f02d8b6b4b0f04ce3b27cceb41c1f994f3460c8956452b3 SHA512 2bd7430730c228c0f27d971471de9e2f11b0651510951df328f3d22882d03f35a39a94ea3cba613ff30a18a7138eaf5904d68ae7d70b606a068228573680f8a7
EBUILD aiohomekit-3.1.5.ebuild 1333 BLAKE2B 9283a6547b0cc266a33ea4a09e9568feee17d807be7c81ce766cdb85b28af06634006809d4fd36fc1f02d8b6b4b0f04ce3b27cceb41c1f994f3460c8956452b3 SHA512 2bd7430730c228c0f27d971471de9e2f11b0651510951df328f3d22882d03f35a39a94ea3cba613ff30a18a7138eaf5904d68ae7d70b606a068228573680f8a7
EBUILD aiohomekit-3.2.3.ebuild 1256 BLAKE2B b26d2dabc91fbcedd661b8b93e366c3557b9fc51f850220ace8862c138de7d686ed7e7005c74e37ca676507e2a183d31e610c78b4062f868ea53bb64ac5045c2 SHA512 ea3754fe80914db53c9c17a342945422049f6a53cbd225bf621f2ef5a879df7b1eed951e351422f345da7eca9f3af1874a00c50820d437bf17d896037e50f453
EBUILD aiohomekit-3.2.3.ebuild 1309 BLAKE2B 75c7402135222f7ef3d0b001307a12c3a644d36673858f111efcda53373db3feb2939b660d32f718424fa0e24c0275e8d9226a5746364d1c9fcd2a09dd41f6de SHA512 836e3a3b90a52f29a04cde6a1a1cad8d969adf6f56caa75b1c58024f2354a6641a3168efb703d4e2b81862911ceb0a86395e37cfb452c6e1f0cf70886d425453
MISC metadata.xml 513 BLAKE2B 3b29966ec8902954651b4ccbb4616a57c613bcd97ed45e8813502eda41fddc413c6769cd440752368e72ffe2915876006c8742cf757abd83f99a063ff7a0b073 SHA512 22f00394e813c4e51bf0b353c97509563966b6a50ee4d9315855d78c32e6c40ed9d540567d352ba3a257918c73dadcd69131d510da83c7759bcbc6644eb630c0

View File

@ -30,6 +30,7 @@ RDEPEND="
>=dev-python/chacha20poly1305-0.0.3[${PYTHON_USEDEP}]
>=dev-python/async-interrupt-1.1.1[${PYTHON_USEDEP}]
>=dev-python/aiohappyeyeballs-2.3.0[${PYTHON_USEDEP}]
~dev-python/python-otbr-api-2.6.0[${PYTHON_USEDEP}]
"
BDEPEND="
test? (

View File

@ -1,5 +1,5 @@
DIST aioruckus-0.34.tar.gz 17702 BLAKE2B 35411b3fd5838bde6cf07d3667c70765da4520eb31239bcf26d118491a8f13eca5079228351e1c9a92ee556dd614e9bcf03f29786f4c742374b5b2bea9f74044 SHA512 d0589a2a5005684897c0cdf7cd6897c73f298083424152d93ff8b43993641641e11d3b05ecf0b16e48dbe6826239719d7571e5983b06d206e77e443fb8d84352
DIST aioruckus-0.41.tar.gz 28714 BLAKE2B 461128e1f7c7d5d0b2533d7b1c2aa0b84baed92a6877dad7b9dcc7bc9691e00e40181a5a29d13029bce030b97275beaae77369a9f4e9ba6f4eee1d575a9f4cdb SHA512 3278962131c6c7769df62bf9d87db86156d8728dd00161b9d5d3b47a29100778f25ec8cc72591a3adb8722cc1a8a68d6175d31275fba5eac4dfff0b9791d914f
EBUILD aioruckus-0.34.ebuild 850 BLAKE2B a08956eab4def7399f71fd1594752e61e56c1c3532be00d6b7ae1e9185991099c233a1e2c5ea6f60c8d0b09cf69ead57281fa59f185d8406bdd5fa08eee03cb8 SHA512 ed4bacb412d83069a76e5e1f433eeb4683602242cd707396a202c7c4e0bac82766c52b858c8f8d2d8759da4aca3e1ae2ba32535fa2e2308865657835c40cec56
EBUILD aioruckus-0.41.ebuild 850 BLAKE2B a08956eab4def7399f71fd1594752e61e56c1c3532be00d6b7ae1e9185991099c233a1e2c5ea6f60c8d0b09cf69ead57281fa59f185d8406bdd5fa08eee03cb8 SHA512 ed4bacb412d83069a76e5e1f433eeb4683602242cd707396a202c7c4e0bac82766c52b858c8f8d2d8759da4aca3e1ae2ba32535fa2e2308865657835c40cec56
EBUILD aioruckus-0.41.ebuild 728 BLAKE2B 8582f8c300d68f7b811c3cad5b78732e793fe0fa0d0f9917c2da3f1fcd2f0290f31d9a3362bc8419363f1ed24ed3465a7beae1956ed4f09910fb6b8f1a2c00ce SHA512 a19a50085fdd3e1c6e224fb9eaec0962c1d2a24e8645210635765de4585dbcef04ced24c6217bb7df413c1f5e354275c09dc3d2930e1d97075f388129806582c
MISC metadata.xml 508 BLAKE2B e203d729651d2037139c1b965eaf0da43991b9f4ccfb9a2e8df5f0a6df936611a7de15f12bdcc44e689cf8193d4626904e9c9025d59206a5c515658360ad134e SHA512 89ad5b00c106d46222896a541fb9c6cb7cb120425749b83d0e2109fb2258d6bfa184c3c2ad786475bb04a2a68d09c5a308b3af059c2c2292a6247ae689534f49

View File

@ -31,7 +31,3 @@ python_test() {
distutils_enable_tests pytest
src_prepare() {
default
echo -ne "\n[options.packages.find]\nexclude =\n tests\n tests.*\n" >> setup.cfg || die
}

View File

@ -1,5 +1,5 @@
DIST bme680-1.0.5.tar.gz 10514 BLAKE2B 16f8a1c48c86e5532fd2a24113330fd7601e4e60973903663ac2de8d4a427cdf162d3fe4f12b0abb764387767d0f8f2c7fb1f8fde1ff1f300d6f96e704564f24 SHA512 5e6c8e620c9d3a3e6443ac8a295d6de16b0cd4b3d9607fe4ce3275a0b6b7934fa8cd08b0da3b8fd72ea22cf8c8d0af7f9b862d02d84d83c0fa0b64e584561971
DIST bme680-2.0.0.tar.gz 80399 BLAKE2B 3167cca40934d286dfa734e2b732a5cb8cb6a2a54c462d6e2d8710ed02cc5ca603f080e799c93cacbfa6b9d85b522ea4f54be7c5d033ab112c03ae5e23815caa SHA512 90bffd377c657a3a0cf83e6ee91d669eaca16ce69463e19228d39fac3a1410b0271a0258ce1ebe62a12ea9919bc317ee55b4979399dec367e0f031b31527abee
EBUILD bme680-1.0.5.ebuild 470 BLAKE2B 1e6c56269b798ea0e4c03d24561edc9d3071b1438344db332e5fd15c29a2a681f4f5f2e5ae7d3f952ee445a9bb04be8b60f25627d0b2c27e3d132ae81138e154 SHA512 02aae1f8414ff575ba33f8bacc6e20db975c4ab9ced7648036db115472641395e52297b4341a42fd042283edaff533ba7071b8425bf186e333b46b3f57b817f8
EBUILD bme680-2.0.0.ebuild 516 BLAKE2B d2526b891a940f685af1d660cb7faa47ec23d533019d834b2a37911449d13e4825360135f2e007e27a1bf2c2a3d619c3bca09c48c5c43d9adfcd033cd9754522 SHA512 a059c8bbed502d6eb882693cba7a00b8cc42f41f3ba2d61c9a6c332e6ee47c7dbfe318cd6d70b0b8c94ee8386fa2ae5ae5fddcbe6befcc078ca9161a1dd2ecff
EBUILD bme680-2.0.0.ebuild 601 BLAKE2B 79cde22ff86909a60345a38fd6a02d9d2b5477fcc2c2cb7100edf202e7a54f3242bb0b751fc0340a978812d1b08b33b49ea012ac3c8350a1a5663f17905de4ea SHA512 97fb4abc0ec28c3aa18c0eeeefc6c02a34a7af1b89452707eda08f59797e35488c766ad8c265f86bd184a07778e2d36a6df673018bf0d3de0d7bad36534dfceb
MISC metadata.xml 449 BLAKE2B 6a9814c457bc9ddb2c3559f83c8ab8df6328abd991b756d4e43d3cd1de70b153a022a25d357ef539b87e7ac62376a0c47d051ce549bde05c1e9fbfe6a7ada3f6 SHA512 249c9a67900c6575ff0c1cf6e775e923eb374c5084306888bbf92a26f61f233c0b0b56d3891f5660fc4a202f3b39e16ee3954b1c3f2c39c0f8aaa27bb671b411

View File

@ -16,5 +16,11 @@ IUSE="test"
RESTRICT="!test? ( test )"
RDEPEND="dev-python/smbus2[${PYTHON_USEDEP}]"
src_install() {
rm ${S}/LICENSE
rm ${S}/CHANGELOG.md
rm ${S}/README.md
default
}
distutils_enable_tests pytest

View File

@ -1,6 +1,6 @@
AUX debugpy-1.8.0-unbundle-pydevd.patch 1480 BLAKE2B 6694cbb68e8e5793f22fedc9351875810c86c1add4299bbb5360dedc24bcbdbb0128163cc11dab3effc611dbe5ef43ea45e9504914f6c55f4f66b76b9da0b804 SHA512 553ce357019e561e50770bf747adc33ac037cf5aa9fc08c44ce9c1cb87ecba28b7c632adb5b743c38067c1bb6b97f1d239ad8dee404332bc8028be44afd018ce
DIST debugpy-1.8.0.gh.tar.gz 6760323 BLAKE2B 99c4188c0b0383dc4dcbdd86c4d35e6eb973ca32ba56b757adea9668b161f20f17b436e0dc019790b1e85586387fc848712143c5e3d3814e2522850d97a4048e SHA512 f9e47371ca854c12811d1c0984f063b1ad5cac2bea769f91a67f9fa125cfcbeccbecafca9b9d5ea16a4ed8a1c123f34db3ba19efe1567b93a86cbd325239b355
DIST debugpy-1.8.1.gh.tar.gz 6900815 BLAKE2B f2abd2f852cc321dd7070f28100e45f463b318b2ff6e70d36f4a4d27a4b70d9da934db1148059bb2b996d4237c042d0b18ae323d4370c44ce479ef5222bc3c30 SHA512 3a64f82b984036bca868551de35babdb167b5f24da96bcee2b274039aa019d28aa376f31c89518725085279be05777454077805fa78f485a3ee4f09494886ff7
DIST debugpy-1.8.1.gh.tar.gz 6900806 BLAKE2B 5f9151a1a8d679c2f81d8eb1ce62b9e1f8a8cfeea7301e2f15113b95543e48ac971681c20bdc9bb9b85376be2b23cddbffe988f68b8f23cd0214905d11598905 SHA512 0eacee36904ee991a68da539b60768811606bbf57076efd07ffe2ee6a24e8a5e4cf86cd30ed948136466af71d1fb63b14f60334ffe94cf8c626b449a731ca0d8
EBUILD debugpy-1.8.0.ebuild 1019 BLAKE2B 3bcf2f8004ec890b9990ff9c8f7caa30a073b47f81a0576340f03abcfe99e44d3599398af7c0104976714fe55a7bf722187d5a7f6b0533df73dacc168a5c5ebe SHA512 a37ba3c19e6df3aaf90fcc5d8dc6f45ef54badc6601557fe42d21bf08d211542b2cbd4cd3e10ae06f8d16581e76457ca16a9a30430ff253d6d976d9e6a3ebcc9
EBUILD debugpy-1.8.1.ebuild 1907 BLAKE2B 7a544586710dd9043fb2fb59746da75031b28c7e365bb4d13340e4e1b7824b209c82535157b4bcd87861162567aca24285a793157f04b78d380eb610a6f53e42 SHA512 2e981f9ad89833ddcbdabeaaef7235bb61f70982f64f4cdbb37f2d4a05be8be6b018169bdc1ffa163e26222c8a43a386d5050af5e2aa4a4be590d0872097d937
MISC metadata.xml 522 BLAKE2B 9c9cf443d38c8de3516a488f67f81b68759d11283efd464dba3fe27191f2b66cdd622d32465c0820152bda74e92b6c8e3ade57c92a40d61dbbc7587df50f2c60 SHA512 f5a601e50c25ca8105b3a2307bb3b183db6a85644d7bf7e67c036ac2807006a77c9856b9058c96590cd7c1041890d2a9863d0ec0991c75cc462c1cd7df6d8b39

View File

@ -1,5 +1,6 @@
AUX elkm1-lib-rename-cmdr.patch 1267 BLAKE2B c5d8e705c9a3a0feef1b7703f79b667a276e60bf7712d06f54cdb495f2f645d904208bba2278a67131888720af8f3ef0864a9179d1809ee9c9b5779b84593cf0 SHA512 30d5b08e33a1fd718261aa79274cc79aebf7b2629ec12036f3c040ae11a1414d055c916ddb444e63c2e5329ce94b810b58076065acf486f51a01502dd67e71ee
DIST elkm1_lib-2.2.6.tar.gz 40748 BLAKE2B 0022066eabed75d7c21c52e4db091d88b89dabee63c15589a6eea7cdaff633859f6d9542dd507ef9a822cd732dce6674ba3e1b1f8bf385e53db5cabc3eea98ab SHA512 a4ce28144b09e18fc27c9150cb3c09e447bf1e1d57fd2c7eba29c61c3178de39bb1b55861b0e89d41931dbe2987b950978ef763e9b1ec522a7cfbdc495dd02bd
DIST elkm1_lib-2.2.7.tar.gz 42040 BLAKE2B edc370c62070a4664997a6ded8e51186d7053ef92004ddfb6d71af8939549cb54810705ef872e13385ae5ba4d840dd78eae3995a94979a6a624a0780828ad812 SHA512 efae47bcf7692a5ac9c3d631dbc666d068929db63a02eaa4cc163e9e33c4fe4e1779e9135e9b2a92b0deea99341f7aca7d86e6dde7de8dbfb75cbabc4e7427ee
EBUILD elkm1-lib-2.2.6.ebuild 903 BLAKE2B 3283c008eca15f27fa1600cfc14224536cc5f46b104767af730df9c26669613237bf62a89d75e73b1c0790a7aa8ffadf23b165a16ce1cd4f4ce4ede8ee818469 SHA512 b2434068f74f81e931a10a837f34d6b3a96e174d319e24f693efbb1275ddb0a07b5c8e55ad1be716594e61e14db88f68d40f69b6ec85442f3d22508d9fd8f935
EBUILD elkm1-lib-2.2.7.ebuild 830 BLAKE2B 7e59c9825148359deb3679bfb54786e278d4f9007180e35e777ad627e6baa6e61da95b0c9d37d35ff326cd04db9c56f256645ccc12849f471d2c3440eb1ce06e SHA512 564e1a2e1da7453f2ae43725230783a2c16f2ba360625e9d84b25b9da17423351aa5ff006081a15904a6ea02ff663e8fbcc6a9c4537d43c0bf0936b07a0aac97
EBUILD elkm1-lib-2.2.7.ebuild 1058 BLAKE2B 9c01564c892f549127033f18a035b867b5ab70d7ec5310256a0b5ad4ad09d823ecf3ff4482c92fc3cd3c0625115af2deac80ed403c1174fa6d7b834900efe909 SHA512 7e182acb412f80fe613541c21e4a5f25828aec408e21336a9d55d11db4a8e1f81f417d045a75e0456d4da70d709698e02740390252fa9eebaa06d7dd2da67b83
MISC metadata.xml 510 BLAKE2B 5286b277be43515fdf58afeff6b8dc8335aac67a9a0651409dbeeb4ee4694f04f2d08a259ad1aaee118706b247a862d05c628e3df9a31a31b638a5dcf2345724 SHA512 4a9ef72614886d20427c02f8b51ec524c8af29ec85896bcb4cab3fdca30d165ad744263fc4a85fbe7d069e9898739aa0a4e9680a319157206f84f2a47eb12568

View File

@ -31,5 +31,8 @@ distutils_enable_tests pytest
src_prepare() {
sed 's/"CHANGELOG.md",//g' -i pyproject.toml || die
eapply "${FILESDIR}/${PN}-rename-cmdr.patch"
mv "${WORKDIR}/elkm1_lib-${PV}/bin/cmdr.py" "${WORKDIR}/elkm1_lib-${PV}/bin/eklm1_cmdr.py"
mv "${WORKDIR}/elkm1_lib-${PV}/bin/simple" "${WORKDIR}/elkm1_lib-${PV}/bin/eklm1_simple"
eapply_user
}

View File

@ -0,0 +1,34 @@
--- a/bin/elk 2023-06-11 22:56:06.150889000 +0200
+++ b/bin/elk 2024-10-22 13:44:45.363541661 +0200
@@ -5,7 +5,7 @@
import os
import sys
-import cmdr
+import elkm1_cmdr as cmdr
from elkm1_lib import Elk
--- a/README.md 2022-12-01 02:06:13.075080200 +0100
+++ b/README.md 2024-10-22 13:59:38.608518572 +0200
@@ -151,9 +151,9 @@
A couple of things are hard coded in the mkdoc script, notably
the "no plans to implement" list.
-### `simple`
+### `elkm1_simple`
-The `simple` Python script is a trivial use of the ElkM1 library.
+The `elkm1_simple` Python script is a trivial use of the ElkM1 library.
It connects to the panel, syncs to internal memory, and continues
listening for any messages from the panel. The URL of the ElkM1 to
connect to is retrieved from an environment variable named `ELKM1_URL`.
@@ -162,7 +162,7 @@
The `elk` Python script is a bit of a command interpretor. It can run in
two modes. Non-interactive mode is the default. Just run the `elk` command.
-The non-interactive mode is similar to `simple` except there are a
+The non-interactive mode is similar to `elkm1_simple` except there are a
couple of message handlers (`timeout` and `unknown` handlers).
The `elk` can also be run in interactive mode by invoking it by

View File

@ -1,5 +1,5 @@
DIST homeconnect-0.7.2.tar.gz 8123 BLAKE2B d11f4fdcebc4d91c9d81707352af2d19814f1aa7e4cbda46514baf02d0f48dff0a40c4a0eabf6518641f3e31fc4384abc380178a8d0038a8be3a5799fa2df09d SHA512 49134749ae63dca2192702c4a74eaef81d1955bb353d5f246347a3085df77a8fb0d8cb353c661d567a1736da1c6c04e81e080fbb26592187c24af0398949117b
DIST homeconnect-0.8.0.tar.gz 9220 BLAKE2B 219e648b39b324201788d4d0cf10519f782c1cd17e6ddf53875b691d5ff2f995aa5d360451d9f8a3c92c237f2b35d1f0aec5e080c7ff7e2f1710224683e481e1 SHA512 a3d0100b8b970a8e540b4570177e5177961a5fd22621c7791eb0acf800d2927612de5717d3ce80ff445e9d796ade8f966ae2022fcc83554c01972a4be944f10a
EBUILD homeconnect-0.7.2.ebuild 704 BLAKE2B 7d2e14998eb0026692a1b8d4ee6848b45e374a7f576eafabeec78f51b8670164b173c247e53a43c1b607434a0ea82f83a1fb6b3583f63223d5b79da48af7ac23 SHA512 8e22f0abaa80a06a3af26439c5a9a753dbb98690ed744a23c5e8663e43ec872aba65c0bd3e279ea95bba0218f811a1c1006a3e501abcc80bb071236db023fc7a
EBUILD homeconnect-0.8.0.ebuild 704 BLAKE2B 7d2e14998eb0026692a1b8d4ee6848b45e374a7f576eafabeec78f51b8670164b173c247e53a43c1b607434a0ea82f83a1fb6b3583f63223d5b79da48af7ac23 SHA512 8e22f0abaa80a06a3af26439c5a9a753dbb98690ed744a23c5e8663e43ec872aba65c0bd3e279ea95bba0218f811a1c1006a3e501abcc80bb071236db023fc7a
EBUILD homeconnect-0.8.0.ebuild 749 BLAKE2B 85a2e2567474bbadbaf3c409a600665450b1e301539344c9e9c811d78f7ec2ab05f2307a07bc7df479d3540adf16b08d465e9bea788a2e67039e5051ce998307 SHA512 96db0cbbe18ac306ca8d41dc1cf675d989dbd955f0cd1f2a734792a0306798e1d13189077411e5222b215430e15e696e476c09331b750b21a6405e0320bce9b1
MISC metadata.xml 524 BLAKE2B 2da8ef5b0e771187f1e8728cb161da47202e42c56e8d1bffa3e229b4b96081ea86b731e90253089d9ec5d4e6923fb544c12b7e24c49b3688a51ec7107e26fcbf SHA512 856880918d70bf6374bbd26de09748a6d2924fbea15185c540c88551b0aa2ed54afcee8deaa7500072d4ee4f860820f332469a18a3f5d2a218ad88541df27bb0

View File

@ -28,5 +28,8 @@ BDEPEND="
python_test() {
py.test -v -v || die
}
src_install() {
rm -rf ${S}/tests
default
}
distutils_enable_tests pytest

View File

@ -1,5 +1,5 @@
DIST intellifire4py-2.2.2.tar.gz 21731 BLAKE2B 556ef8d4067269458843636e630da9a8b7fefa1d0956a2f436ce9dfa17be3ff87a4f98e7982d2cb6d65a8cc3fc8f75672132cc47b0758304cfc5d19a2e6c9f4f SHA512 f6a53e5c3dce95c0fd82e03503066e7a79ef6d0c695948523939ad9239dfd8525d905710e136196f2dbc86bec121039cba7aa83f1e5729562c1890fdeeec51dd
DIST intellifire4py-4.1.9.tar.gz 29392 BLAKE2B e73cdca3d2f00d65cf74af39185574eebdbd8ab1773022ceb2bd6b1acc1128f9b2b76bef6e3cc91ff91f495797d3834f60cd45c8ccf2c6ddb2ccf4929d03b9df SHA512 cca1238720b4280ba6f37247bfe76be06e0af8016c992f4b2f656c1bf35e322d663d0598602efd80e567e93abd5e26f01bf5398b503726626d51dbfa971c0d34
EBUILD intellifire4py-2.2.2.ebuild 737 BLAKE2B df5cb8cb65c7c9e7ffd57f95b7f8e1147cf03cf992ab5bc7053dfe59b4a02ee4412c5a9aa17b099ae01b9a0e5ef0349236d4d100c94dcd705f15b2a9836781e9 SHA512 78e81825ff6418e4fcb13262630cb4d1a54c6fccca9b1aca9b63cf409d6426fce1dbfdae91fedb69069aa7dd58a7325452adade16cd7294efe6c859f1236043c
EBUILD intellifire4py-4.1.9.ebuild 737 BLAKE2B df5cb8cb65c7c9e7ffd57f95b7f8e1147cf03cf992ab5bc7053dfe59b4a02ee4412c5a9aa17b099ae01b9a0e5ef0349236d4d100c94dcd705f15b2a9836781e9 SHA512 78e81825ff6418e4fcb13262630cb4d1a54c6fccca9b1aca9b63cf409d6426fce1dbfdae91fedb69069aa7dd58a7325452adade16cd7294efe6c859f1236043c
EBUILD intellifire4py-4.1.9.ebuild 733 BLAKE2B a63ef802bcb93d950d411ec6102fbdb8deb1473f3d66b639c18d0cf817128af37d5ff6c7806de6e5f7fdea41707ec7dc26e436c5023d690003e1a5ac6c07a0b8 SHA512 997a4831fa1aeb2836bf24a325efc5cc002c94b5b80dbc688cd41b81da7bbb07e05c378aba09b2b5e564d08dac23092f29740f7fb1c8f1c7f36ed61ede0d214c
MISC metadata.xml 397 BLAKE2B 9d7985d5d82a8b926705b012a4e4ea5d8c3d267533cd6f092d38bb30e2c0be98c5617f83612b2b1798318c9f38c86a94a6ee64549f1cf02a20b631579f5f2a42 SHA512 6d3dc0efd8b34e0ae2693eb7212ed9d404caa8ccec0d5fd9678fc8383ea81e37bf2bcfaadef5bd67ce59ae5a3bcf67369623b3697392c026c4483247f608d18e

View File

@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
DISTUTILS_USE_PEP517=setuptools
DISTUTILS_USE_PEP517=poetry
inherit distutils-r1 pypi
DESCRIPTION="An API to read the status of an intellifire wifi module"

View File

@ -3,5 +3,5 @@ DIST matrix_nio-0.24.0.tar.gz 150552 BLAKE2B a0e9d8326e2b9eefd70cadd42d3f1ce9f1c
DIST matrix_nio-0.25.2.tar.gz 155480 BLAKE2B 694b559d9ba2ab3267be5bb602548a9b1bb72b7bd0cb73d5422fb58d50f6f7f2290b1df154bb47645dfd5f0e3e99268e01b4d532d5a038bdfbd58a50bcfbf681 SHA512 55171b84654133700036343e651cb48468de953dd82263307e4ab524ee1ec4bb348f8b8679b82c9f5d2f19aba915faf70ffb617c2883a2ec1c8b6b8f088e1d07
EBUILD matrix-nio-0.22.1.ebuild 1017 BLAKE2B a8ab5633611c36f0d6b6eae06ae756294dc7c2699fe9698ea5b537474fdb09ad151c399f48368955da6509295e5668cd46f7e0be281b523ed2d9828550a0351f SHA512 2b1e00950502524669a5a8b9d384c1356c5a3f0bf2975d67413ce744c47fbd6e9af1e2e768eecb1c3214fe3f88c5012a3efed0eb2020ba9dbed46e9a3efbab43
EBUILD matrix-nio-0.24.0.ebuild 1010 BLAKE2B 67f5cd5834b60ce1fb131a24ff99d1c45bda9887dd696a9d818f31441c723ddbd944dd4b3598c23e0ac428e07fca2eb62e749007c18d2eb49db3b0587ea4fa7c SHA512 34b37e74d26da2cc0dcd9a254082074ed8c663a23a75ad8db2b5e4e29919600fbea208f539bd725b863142d60ecf2c9082a5c4288ed470bb0e23c94fb3a7a126
EBUILD matrix-nio-0.25.2.ebuild 1010 BLAKE2B 67f5cd5834b60ce1fb131a24ff99d1c45bda9887dd696a9d818f31441c723ddbd944dd4b3598c23e0ac428e07fca2eb62e749007c18d2eb49db3b0587ea4fa7c SHA512 34b37e74d26da2cc0dcd9a254082074ed8c663a23a75ad8db2b5e4e29919600fbea208f539bd725b863142d60ecf2c9082a5c4288ed470bb0e23c94fb3a7a126
EBUILD matrix-nio-0.25.2.ebuild 1078 BLAKE2B 4e4d2a3221e0a0d69ca5b81e03308bc40b31a19a374c1f062ee7bc07e4c97e4ecb68079f7492c29685e5602e951b546d43f0c203bf170fc360ea93973d8913ad SHA512 3b3ca5ebbf3531035dfe06bc8af10df4007e27d3793d66a119233d39ccd5d1fa5e2fa9406eda1e8ae987650514ac308b93b6c5ac3a81aad54e5095a977ca6445
MISC metadata.xml 515 BLAKE2B 5e6c8b74d86352220666004afd047fde6a35a83b0d016213fc76a03ab891d3126abfd9e1b4328b2d83c9107876b554275ec80598b045bd94b1f4df66d5678d96 SHA512 8519b2bd0785094b0bc659e9b0b03bf78017dce51e0e0c0860e67e0b7002cc7527bc53e8e73ba86bccc14345823b0168b70d47f8b01156f92611e29a18f6c14a

View File

@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{11..12} )
DISTUTILS_USE_PEP517=poetry
DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1 pypi
DESCRIPTION="A Python Matrix client library, designed according to sans I/O principles."
@ -13,20 +13,20 @@ HOMEPAGE="https://github.com/poljar/matrix-nio https://pypi.org/project/matrix-n
LICENSE="ISC"
SLOT="0"
KEYWORDS="amd64 arm arm64 x86"
IUSE="test"
IUSE="e2e test"
RESTRICT="!test? ( test )"
DOCS="README.md"
RDEPEND=">=dev-python/aiohttp-3.9.0[${PYTHON_USEDEP}]
>=dev-python/aiofiles-23.1.0[${PYTHON_USEDEP}]
RDEPEND=">=dev-python/aiohttp-3.10.0[${PYTHON_USEDEP}]
>=dev-python/aiofiles-24.1.0[${PYTHON_USEDEP}]
>=dev-python/h11-0.14.0[${PYTHON_USEDEP}]
>=dev-python/h2-4.0.0[${PYTHON_USEDEP}]
>=dev-python/jsonschema-4.14.0[${PYTHON_USEDEP}]
>=dev-python/unpaddedbase64-2.1.0[${PYTHON_USEDEP}]
>=dev-python/pycryptodome-3.10.1[${PYTHON_USEDEP}]
>=dev-python/peewee-3.14.4[${PYTHON_USEDEP}]
>=dev-python/cachetools-4.2.1[${PYTHON_USEDEP}]
>=dev-python/aiohttp-socks-0.7.0[${PYTHON_USEDEP}]"
>=dev-python/aiohttp-socks-0.8.0[${PYTHON_USEDEP}]
e2e? ( >=dev-python/atomicwrites-1.4.0[${PYTHON_USEDEP}] >=dev-python/cachetools-4.2.1[${PYTHON_USEDEP}] >=dev-python/peewee-3.14.4[${PYTHON_USEDEP}] )
"
distutils_enable_tests pytest

View File

@ -1,5 +1,5 @@
DIST monzopy-1.2.0.tar.gz 15669 BLAKE2B 38bc4bb628cf4e5fa0aff1bb4fe91d161284b3e8ea8764df9bc3bc68df4f14bb61caba603035426ebfe6102d682066dd13e978874258e8f25686a139eee644eb SHA512 7c974959e23c10a0c3766b5d8ceb20332640260c08d2a6f2728412d19ac06854cf5a5a49302b12d6a949ac3f6dace0cb85b9483a75d8a7f1bf20441fb28e7ac8
DIST monzopy-1.3.2.tar.gz 15844 BLAKE2B 11e209309cb546a5f81c07205fc92741ebb2ee6c91088a78b40d163f69402a39e4611afd8acf78f62e5fe7b9195d8a89a1d2b8117d280edfec5597c84cecdba1 SHA512 70bef813f707514712d0e04f7bf9fed477554b0838ed99f5c54cc62744a58081290d872bded96127d6cdafebed7b955a4d9e45cde3d4b256570271e0950e486a
EBUILD monzopy-1.2.0.ebuild 727 BLAKE2B 1f147e8b63f56a559d0b81ecdd4a07645f3e807ff6e90e7a05b6ff702494e39f2740f38c2ce524dd52844b8cb308390c608fdc892f65cccb29bb405d1cc1a1d2 SHA512 445c14213956f022a264cc6ae77cacf99ec953bf773f63a9dcb64a84733f7057a321e72b9a3e46ab7f3a842cede3f86fd6807ba4eb2cca1b2542cb71a937401b
EBUILD monzopy-1.3.2.ebuild 727 BLAKE2B 1f147e8b63f56a559d0b81ecdd4a07645f3e807ff6e90e7a05b6ff702494e39f2740f38c2ce524dd52844b8cb308390c608fdc892f65cccb29bb405d1cc1a1d2 SHA512 445c14213956f022a264cc6ae77cacf99ec953bf773f63a9dcb64a84733f7057a321e72b9a3e46ab7f3a842cede3f86fd6807ba4eb2cca1b2542cb71a937401b
EBUILD monzopy-1.3.2.ebuild 576 BLAKE2B 47d49281f9b22188468b624747f468a8aab5376d75700bbd15d531b699a3856d2f43892f475a1073333055153465f0bff5cf9be9f736492b2f96d6548dd52441 SHA512 6db251bdb11ba19cc3aae7391a65ae98d14654737cf2981fe05c72df680e3081ec30ea0d228808245cb557091e1cfa1174ce7b0de0409acc4f0207c9ca59dfa3
MISC metadata.xml 519 BLAKE2B 9b6dd9aa1cfd20f4c4211a81baf6fbf824047aedb479144c72ed3a60c350a947f24b00c4a2aef31003869c1921f08c9e9bd4ccbd40bda5b7a13d70e37962ede5 SHA512 fa0754eb974e27e83dc4eb8961ddab0c973dcc90720f75d0abbce52874126bcfc5093df0c9f424814402c2f3eb2cf9da9094962f2cfd65e4a838555ff29b6c14

View File

@ -20,7 +20,3 @@ DOCS="README.md"
RDEPEND="dev-python/aiohttp[${PYTHON_USEDEP}]"
src_prepare() {
echo -ne '\n[build-system]\nrequires = ["setuptools"]\nbuild-backend = "setuptools.build_meta"\n' >> pyproject.toml || die
default
}

View File

@ -1,2 +1,3 @@
AUX nose-wtf.patch 16093 BLAKE2B 5a2766aeeed39b6ceba8c0b3ef2356241ebd2966d8f7842754c56f769c38b66d514cf308a9b24327d14eb8be7e911f43b1a5415579a2867f45b7ce33fec38bc7 SHA512 12ee863ef9225e5a9323fab2a4a7d45a6d2c4335bfa8f686fffcf2e35411b087ca8069d7d95e2d5fe9f88627bf75c6ade87c1567ab88008593909864b3615426
DIST nose-1.3.7.tar.gz 280488 BLAKE2B 4bb479b2786f813f9e9a5fd401e30023a473a053ae013d7887be15af415422c09fb399af6058ae99ed65c5fa4da84eb274eb805e895ca74db159d952905f5be4 SHA512 e65c914f621f8da06b9ab11a0ff2763d6e29b82ce2aaed56da0e3773dc899d9deb1f20015789d44c65a5dad7214520f5b659b3f8d7695fb207ad3f78e5cf1b62
EBUILD nose-1.3.7.ebuild 440 BLAKE2B e0df0d614e45afc20a09db5884058c62b4858840af2ce857ec7843642f2f7b76ad818ce38c809a2ae908f6580d1bcd9e932e7760b282dd950aec49d14d79ee86 SHA512 4db445157105f09af1cdede311f5bed860eddcfb2a00474c0add9d5f689d132a7d4953fb34d39c902af4bc9f1be6cab6a7450decd208cb949958bffc1cd47ef0
EBUILD nose-1.3.7.ebuild 507 BLAKE2B a6d077574eb8245731fa6b1dd3c4a8c9fd61b48a9c04e5fa22c0c04ee60b8554611938cc4350b900a649f4967075f05fd81c48b9babe366bf36eb2f7d20d3a09 SHA512 887d42f0723bf2e9f16cd35359ff79922847603efc8eb99f6ecb5d5e6c6ae7bd1ad1e9747beb0fccae167af7cb827edd2ca3246f45f6e859c374023bc0bc6a61

View File

@ -0,0 +1,369 @@
--- a/nose/core.py 2015-04-04 10:52:52.000000000 +0200
+++ b/nose/core.py 2024-10-22 22:19:15.783743717 +0200
@@ -150,7 +150,7 @@
if self.config.options.version:
from nose import __version__
sys.stdout = sys.__stdout__
- print "%s version %s" % (os.path.basename(sys.argv[0]), __version__)
+ print( "%s version %s" % (os.path.basename(sys.argv[0]), __version__) )
sys.exit(0)
if self.config.options.showPlugins:
@@ -224,26 +224,26 @@
v = self.config.verbosity
self.config.plugins.sort()
for p in self.config.plugins:
- print "Plugin %s" % p.name
+ print( "Plugin %s" % p.name)
if v >= 2:
- print " score: %s" % p.score
- print '\n'.join(textwrap.wrap(p.help().strip(),
+ print( " score: %s" % p.score )
+ print( '\n'.join(textwrap.wrap(p.help().strip(),
initial_indent=' ',
- subsequent_indent=' '))
+ subsequent_indent=' ')) )
if v >= 3:
parser = DummyParser()
p.addOptions(parser)
if len(parser.options):
- print
- print " Options:"
+ print( )
+ print( " Options:" )
for opts, help in parser.options:
- print ' %s' % (', '.join(opts))
+ print( ' %s' % (', '.join(opts)) )
if help:
- print '\n'.join(
+ print( '\n'.join(
textwrap.wrap(help.strip(),
initial_indent=' ',
- subsequent_indent=' '))
- print
+ subsequent_indent=' ')) )
+ print( )
def usage(cls):
import nose
--- a/nose/config.py 2015-04-04 10:52:52.000000000 +0200
+++ b/nose/config.py 2024-10-22 22:40:33.377710694 +0200
@@ -65,7 +65,7 @@
cfg = ConfigParser.RawConfigParser()
try:
cfg.read(filename)
- except ConfigParser.Error, exc:
+ except( ConfigParser.Error, exc ) :
raise ConfigError("Error reading config file %r: %s" %
(filename, str(exc)))
config.extend(self._configTuples(cfg, filename))
@@ -79,7 +79,7 @@
filename = '<???>'
try:
cfg.readfp(fh)
- except ConfigParser.Error, exc:
+ except( ConfigParser.Error, exc ):
raise ConfigError("Error reading config file %r: %s" %
(filename, str(exc)))
return self._configTuples(cfg, filename)
@@ -113,12 +113,12 @@
continue
try:
self._processConfigValue(name, value, values, parser)
- except NoSuchOptionError, exc:
+ except( NoSuchOptionError, exc ):
self._file_error(
"Error reading config file %r: "
"no such option %r" % (filename, exc.name),
name=name, filename=filename)
- except optparse.OptionValueError, exc:
+ except( optparse.OptionValueError, exc ):
msg = str(exc).replace('--' + name, repr(name), 1)
self._file_error("Error reading config file %r: "
"%s" % (filename, msg),
@@ -128,12 +128,12 @@
values = self._parser.get_default_values()
try:
config = self._readConfiguration(config_files)
- except ConfigError, exc:
+ except( ConfigError, exc ):
self._error(str(exc))
else:
try:
self._applyConfigurationToValues(self._parser, config, values)
- except ConfigError, exc:
+ except( ConfigError, exc ):
self._error(str(exc))
return self._parser.parse_args(args, values)
--- a/nose/ext/dtcompat.py 2024-10-23 07:43:46.184868230 +0200
+++ b/nose/ext/dtcompat.py 2024-10-23 07:52:47.698854233 +0200
@@ -341,9 +341,9 @@
# [XX] Normalize with respect to os.path.pardir?
def _module_relative_path(module, path):
if not inspect.ismodule(module):
- raise TypeError, 'Expected a module: %r' % module
+ raise TypeError( 'Expected a module: %r' % module )
if path.startswith('/'):
- raise ValueError, 'Module-relative files may not have absolute paths'
+ raise ValueError( 'Module-relative files may not have absolute paths' )
# Find the base directory for the path.
if hasattr(module, '__file__'):
@@ -683,7 +683,7 @@
# This regular expression finds the indentation of every non-blank
# line in a string.
- _INDENT_RE = re.compile('^([ ]*)(?=\S)', re.MULTILINE)
+ _INDENT_RE = re.compile("^([ ]*)(?=\\S)", re.MULTILINE)
def _min_indent(self, s):
"Return the minimum indentation of any non-blank line in `s`"
@@ -875,7 +875,7 @@
add them to `tests`.
"""
if self._verbose:
- print 'Finding tests in %s' % name
+ print( 'Finding tests in %s' % name )
# If we've already processed this object, then ignore it.
if id(obj) in seen:
@@ -1179,8 +1179,8 @@
# keyboard interrupts.)
try:
# Don't blink! This is where the user's code gets run.
- exec compile(example.source, filename, "single",
- compileflags, 1) in test.globs
+ exec( compile(example.source, filename, "single",
+ compileflags, 1) in test.globs )
self.debugger.set_continue() # ==== Example Finished ====
exception = None
except KeyboardInterrupt:
@@ -1354,28 +1354,28 @@
failed.append(x)
if verbose:
if notests:
- print len(notests), "items had no tests:"
+ print( len(notests), "items had no tests:" )
notests.sort()
for thing in notests:
- print " ", thing
+ print( " ", thing )
if passed:
- print len(passed), "items passed all tests:"
+ print( len(passed), "items passed all tests:" )
passed.sort()
for thing, count in passed:
- print " %3d tests in %s" % (count, thing)
+ print( " %3d tests in %s" % (count, thing) )
if failed:
- print self.DIVIDER
- print len(failed), "items had failures:"
+ print( self.DIVIDER )
+ print( len(failed), "items had failures:" )
failed.sort()
for thing, (f, t) in failed:
- print " %3d of %3d in %s" % (f, t, thing)
+ print( " %3d of %3d in %s" % (f, t, thing) )
if verbose:
- print totalt, "tests in", len(self._name2ft), "items."
- print totalt - totalf, "passed and", totalf, "failed."
+ print( totalt, "tests in", len(self._name2ft), "items." )
+ print( totalt - totalf, "passed and", totalf, "failed." )
if totalf:
- print "***Test Failed***", totalf, "failures."
+ print( "***Test Failed***", totalf, "failures." )
elif verbose:
- print "Test passed."
+ print( "Test passed." )
return totalf, totalt
#/////////////////////////////////////////////////////////////////
@@ -1385,8 +1385,8 @@
d = self._name2ft
for name, (f, t) in other._name2ft.items():
if name in d:
- print "*** DocTestRunner.merge: '" + name + "' in both" \
- " testers; summing outcomes."
+ print( "*** DocTestRunner.merge: '" + name + "' in both" \
+ " testers; summing outcomes." )
f2, t2 = d[name]
f = f + f2
t = t + t2
@@ -1875,10 +1875,10 @@
def runstring(self, s, name):
test = DocTestParser().get_doctest(s, self.globs, name, None, None)
if self.verbose:
- print "Running string", name
+ print( "Running string", name )
(f,t) = self.testrunner.run(test)
if self.verbose:
- print f, "of", t, "examples failed in string", name
+ print( f, "of", t, "examples failed in string", name )
return (f,t)
def rundoc(self, object, name=None, module=None):
@@ -2247,7 +2247,7 @@
try:
execfile(srcfilename, globs, globs)
except:
- print sys.exc_info()[1]
+ print( sys.exc_info()[1] )
pdb.post_mortem(sys.exc_info()[2])
else:
# Note that %r is vital here. '%s' instead can, e.g., cause
--- a/nose/failure.py 2024-10-23 07:43:46.183868230 +0200
+++ b/nose/failure.py 2024-10-23 07:58:46.423844961 +0200
@@ -36,7 +36,7 @@
def runTest(self):
if self.tb is not None:
if is_base_exception(self.exc_val):
- raise self.exc_val, None, self.tb
- raise self.exc_class, self.exc_val, self.tb
+ raise self.exc_val( None, self.tb )
+ raise self.exc_class( self.exc_val, self.tb )
else:
raise self.exc_class(self.exc_val)
--- a/nose/inspector.py 2024-10-23 07:43:46.183868230 +0200
+++ b/nose/inspector.py 2024-10-23 07:58:15.625845757 +0200
@@ -38,7 +38,7 @@
try:
for tok in tokenize.generate_tokens(src.readline):
exp(*tok)
- except tokenize.TokenError, e:
+ except( tokenize.TokenError, e ) :
# this can happen if our inspectable region happens to butt up
# against the end of a construct like a docstring with the closing
# """ on separate line
--- a/nose/plugins/base.py 2024-10-23 07:43:46.184868230 +0200
+++ b/nose/plugins/base.py 2024-10-23 07:50:19.928858052 +0200
@@ -67,7 +67,7 @@
try:
self.options(parser, env)
self.can_configure = True
- except OptionConflictError, e:
+ except( OptionConflictError, e ):
warn("Plugin %s has conflicting option string: %s and will "
"be disabled" % (self, e), RuntimeWarning)
self.enabled = False
--- a/nose/plugins/cover.py 2024-10-23 07:43:46.184868230 +0200
+++ b/nose/plugins/cover.py 2024-10-23 07:49:47.027858903 +0200
@@ -194,14 +194,14 @@
log.debug("Generating HTML coverage report")
try:
self.coverInstance.html_report(modules, self.coverHtmlDir)
- except coverage.misc.CoverageException, e:
+ except( coverage.misc.CoverageException, e ):
log.warning("Failed to generate HTML report: %s" % str(e))
if self.coverXmlFile:
log.debug("Generating XML coverage report")
try:
self.coverInstance.xml_report(modules, self.coverXmlFile)
- except coverage.misc.CoverageException, e:
+ except( coverage.misc.CoverageException, e ):
log.warning("Failed to generate XML report: %s" % str(e))
# make sure we have minimum required coverage
--- a/nose/plugins/doctests.py 2024-10-23 07:43:46.184868230 +0200
+++ b/nose/plugins/doctests.py 2024-10-23 07:48:31.409860858 +0200
@@ -275,7 +275,7 @@
try:
fixture_context = __import__(
fixt_mod, globals(), locals(), ["nop"])
- except ImportError, e:
+ except( ImportError, e ):
log.debug(
"Could not import %s: %s (%s)", fixt_mod, e, sys.path)
log.debug("Fixture module %s resolved to %s",
@@ -413,7 +413,7 @@
if value is None:
return
setattr(builtin_mod, self._result_var, value)
- print repr(value)
+ print( repr(value) )
def tearDown(self):
super(DocTestCase, self).tearDown()
@@ -446,7 +446,7 @@
if value is None:
return
setattr(builtin_mod, self._result_var, value)
- print repr(value)
+ print( repr(value) )
def tearDown(self):
super(DocFileCase, self).tearDown()
--- a/nose/plugins/manager.py 2024-10-23 07:43:46.184868230 +0200
+++ b/nose/plugins/manager.py 2024-10-23 07:47:47.274861998 +0200
@@ -387,7 +387,7 @@
plugcls = ep.load()
except KeyboardInterrupt:
raise
- except Exception, e:
+ except( Exception, e ):
# never want a plugin load to kill the test run
# but we can't log here because the logger is not yet
# configured
--- a/nose/plugins/multiprocess.py 2024-10-23 07:43:46.184868230 +0200
+++ b/nose/plugins/multiprocess.py 2024-10-23 07:47:05.561863077 +0200
@@ -478,7 +478,7 @@
self.config.multiprocess_timeout-timeprocessing)
log.debug("Completed %s tasks (%s remain)", len(completed), len(tasks))
- except (KeyboardInterrupt, SystemExit), e:
+ except(KeyboardInterrupt, SystemExit, e):
log.info('parent received ctrl-c when waiting for test results')
thrownError = e
#resultQueue.get(False)
@@ -715,7 +715,7 @@
test(result)
currentaddr.value = bytes_('')
resultQueue.put((ix, test_addr, test.tasks, batch(result)))
- except KeyboardInterrupt, e: #TimedOutException:
+ except( KeyboardInterrupt, e ): #TimedOutException:
timeout = isinstance(e, TimedOutException)
if timeout:
keyboardCaught.set()
@@ -810,7 +810,7 @@
#log.debug('running test %s in suite %s', test, self);
try:
test(orig)
- except KeyboardInterrupt, e:
+ except( KeyboardInterrupt, e ):
timeout = isinstance(e, TimedOutException)
if timeout:
msg = 'Timeout when running test %s in suite %s'
--- a/nose/plugins/plugintest.py 2024-10-23 07:43:46.184868230 +0200
+++ b/nose/plugins/plugintest.py 2024-10-23 07:45:51.173864999 +0200
@@ -404,7 +404,7 @@
sys.stderr = stderr
sys.stdout = stdout
out = buffer.getvalue()
- print munge_nose_output_for_doctest(out)
+ print( munge_nose_output_for_doctest(out) )
def run_buffered(*arg, **kw):
--- a/nose/plugins/testid.py 2024-10-23 07:43:46.184868230 +0200
+++ b/nose/plugins/testid.py 2024-10-23 07:45:02.792866250 +0200
@@ -198,7 +198,7 @@
self.ids, self.tests, self.failed, self.source_names,
self.idfile)
fh.close()
- except ValueError, e:
+ except( ValueError, e ):
# load() may throw a ValueError when reading the ids file, if it
# was generated with a newer version of Python than we are currently
# running.
--- a/nose/twistedtools.py 2024-10-23 07:43:46.183868230 +0200
+++ b/nose/twistedtools.py 2024-10-23 07:57:01.757847666 +0200
@@ -166,7 +166,7 @@
# Re-raise all exceptions
if error is not None:
exc_type, exc_value, tb = error
- raise exc_type, exc_value, tb
+ raise exc_type( exc_value, tb )
wrapper = make_decorator(func)(wrapper)
return wrapper
return decorate

View File

@ -17,5 +17,8 @@ KEYWORDS="~amd64"
RDEPEND=""
BDEPEND=""
src_prepare() {
eapply "${FILESDIR}/nose-wtf.patch"
eapply_user
}
distutils_enable_tests pytest

View File

@ -1,3 +1,3 @@
DIST pysmarty2-0.10.1.tar.gz 9048 BLAKE2B 9cc4016d152fad34d708ffbaf7da28fbfdd30c4a11059459f6fd7f085e998498a110989750cef43ae186df64e58af9c1f287ad239c6261d6a05c871d9b0ef41e SHA512 e5c7b4f536b3c0548a1f2834420f69b1b4b92c3391ea1e9537f3e9d879898e2f25e8db5733db2a5cafbff0cd1a60859feed0c105e9b3aae7133df71331bc0bc0
EBUILD pysmarty2-0.10.1.ebuild 743 BLAKE2B 92e90cdf3e097e9db6e9697ddb853ae4f90ae49777b48c272f078df18f2abc4ab521368a3dadc768413fcc36d75f327fe83ca2738f5ef7d53b812bfe642b81b3 SHA512 e326eea7ef7aa3e64f9480c920ef802c766da120e070205acb8a3dee71b64569d3b58881d9bb74f01298c47085f491875d2399db138c85df9bbc5cb8d5ca0698
DIST v0.10.1.tar.gz 7875 BLAKE2B aa02e21d088523440ade184b95516fe06c0f95d3668502bc87671bea243cadcfebe48a6f22fd3a171fd6f2b26142b180ea71d1f3c407160501df8f0bb1673320 SHA512 3d9bab84803ab263fe79d8f4b46ab075cd70edc32bca91750a8694e23a4c213ee0191058bea3be9d5eda43bff9d1884c70f880adb8061e59b9974579460094ca
EBUILD pysmarty2-0.10.1.ebuild 782 BLAKE2B ff931e53292e2a7a734105608284f8a2025fd9ac7f12e73d5dd22deaa706e72058a7861a23a5107f329deb6a0a574654a8479894ebc1169c2214313befaa98cc SHA512 2c1ab670b0987bcd125bb43fcefe171a97c3dcebc130d14c2ec36037f01cd42f3deb6a0340f26937d882b71addac6a8df3538c2fe299110f4622b44beb14d069
MISC metadata.xml 519 BLAKE2B 9a9324d8db416cbf51c86928ffa90b78616ad477162be8166f1db4a71ee7bf2702f1cd5bccf8222157e6354959c042f6fc965b61533e3bef435fc6096d48e635 SHA512 b8643488b38ef38d427a74c066adea95d42752980d5ff6517ac8badc392111a7c67c1485551514946dfe550529d29f0828d74e01c5cfe347c6b6f379097e50d3

View File

@ -9,7 +9,7 @@ inherit distutils-r1 pypi
DESCRIPTION="Python API for Salda Smarty Modbus TCP"
HOMEPAGE="https://github.com/martinssipenko/pysmarty2 https://pypi.org/project/pysmarty2/"
SRC_URI="https://github.com/martinssipenko/${PN}/archive/refs/tags/v${PV}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="amd64 arm arm64 x86"
@ -18,7 +18,9 @@ RESTRICT="!test? ( test )"
DOCS="README.md"
RDEPEND="dev-python/pymodbus[${PYTHON_USEDEP}]"
RDEPEND="
>=dev-python/pymodbus-3.6.9[${PYTHON_USEDEP}] <dev-python/pymodbus-4.0.0[${PYTHON_USEDEP}]
"
BDEPEND="
test? (
dev-python/pytest[${PYTHON_USEDEP}]
@ -28,9 +30,4 @@ python_test() {
py.test -v -v || die
}
src_prepare() {
sed -i "s/pymodbus==1.5.2/pymodbus/g" -i requirements.txt || die
eapply_user
}
distutils_enable_tests pytest

View File

@ -1,5 +1,6 @@
AUX upb-lib-rename-cmdr.patch 2589 BLAKE2B f06c5ce3875c7983e6932e1996533fbebae7510f0b12e5558b65843e5c5258fbb4c0ae05597e9a53ca69cb112db96672156e1934a9981193de0bca7ded8ce71d SHA512 0096dd87fe098348361e2501c6ea747d12e862a604d259416cef6fcbfd4d5b927cd49070ed33b58e85eca794e4cb17e61a3586f69ea28251a9bcdadbc446d83b
DIST upb_lib-0.5.6.tar.gz 27994 BLAKE2B eafbf66d1fc328decd05f9af0a30ffce19a5e7a5e2e11817d20bfd610715e62017fd5a9707f46281f9fb5e127bf2125dd34ce109fcf2b5249f6c3c7d8454263e SHA512 8538529686192dce48c0e1fda709f137e9cb4c0f450160e57d9c63e8254a1dd1c7f6f36bd40aeb7d09b0f2e53fe96b4341cac870e2e2a20ceb1a883815e44e82
DIST upb_lib-0.5.8.tar.gz 28100 BLAKE2B 998cb1b6a25c7c77cd148f682424b2c99cdb09914ec76409efa3a95635d4c0608b1886861055a074f4a6302f17ec390c522bb4605881c8ec6cf4ebc7d4488627 SHA512 6a9d4fc9e4b8bd0980338264147524f8a7bb4d55cc61dd4dc4090cf3ba50973777c7eee642622e43e4f92f7a5beab318b1fdd440851f0a86d39389e70f0ba49e
EBUILD upb-lib-0.5.6.ebuild 690 BLAKE2B ae01032b488fd370a2bc68bccf534bcf3d4bbecc2c3ef1b643110293fd32f876433904654711c22d7725c4d4b7a1b43d1926c3b6a965a0779b140c37115fed07 SHA512 34e3c3a46662412e8d69cd10696c4c534683a41cab37bbdc2ba7ca17b4deab079614d58278b5a47b761c2fd5c9bde585ef6d2aae7534a446186cd17421725875
EBUILD upb-lib-0.5.8.ebuild 690 BLAKE2B ae01032b488fd370a2bc68bccf534bcf3d4bbecc2c3ef1b643110293fd32f876433904654711c22d7725c4d4b7a1b43d1926c3b6a965a0779b140c37115fed07 SHA512 34e3c3a46662412e8d69cd10696c4c534683a41cab37bbdc2ba7ca17b4deab079614d58278b5a47b761c2fd5c9bde585ef6d2aae7534a446186cd17421725875
EBUILD upb-lib-0.5.8.ebuild 908 BLAKE2B c2534f00a96dcc2a7a49c4a47c4b8e33d313777a032e3bda4e395749b9c8b09299d2acd8d152f0599efcf9887ec5ac0707e670368573d481ab8354b44222b619 SHA512 039e22d8935c9414975a22f2a004727b00df693dee0fe27e1b47ee8088565dba19e48f69fb4e2adc7552d0dcbf2511773e09e05517eec0becda1c028dfa3b037
MISC metadata.xml 508 BLAKE2B 736463a2fe1918a7e77ac79969c135f7e04c84a6f76dfaa3b9c9c715f9a9e06531379ced0c33d09be7c31e55676ddaf8edce721b7e3f5cd1060e0bea784d22d2 SHA512 362813f0fbc1324273fa4a533b86dbda47373f5a0402dab24d251bc3e3a0b973fa30bc1f1ae0d3120b953be19fa69d729a83e2d563e8dfc86bb9a4edc518f843

View File

@ -0,0 +1,43 @@
--- a/bin/upb 2024-07-11 17:34:13.449077000 +0200
+++ b/bin/upb 2024-10-22 13:32:30.947560644 +0200
@@ -5,7 +5,7 @@
import os
import sys
-import cmdr
+import upb_cmdr as cmdr
from upb_lib import UpbPim
LOG = logging.getLogger(__name__)
--- a/README.md 2023-01-26 16:49:21.898249100 +0100
+++ b/README.md 2024-10-22 14:06:22.942508121 +0200
@@ -24,9 +24,9 @@
## Overview
-Simplest thing right now is when in the root of the git repo that you have cloned is to enter the command `bin/simple`. This program requires that the environment variable `UPBPIM_URL` set to indicate how to connect to the PIM. For example, `serial:///dev/cu.KeySerial1` connects to the PIM on a serial port (`serial://`) `/dev/cu/KeySerial1`. On Windows something like `serial://COM1` might work.
+Simplest thing right now is when in the root of the git repo that you have cloned is to enter the command `bin/upb_simple`. This program requires that the environment variable `UPBPIM_URL` set to indicate how to connect to the PIM. For example, `serial:///dev/cu.KeySerial1` connects to the PIM on a serial port (`serial://`) `/dev/cu/KeySerial1`. On Windows something like `serial://COM1` might work.
-Also required is a `UPStart` export file. The `bin/simple` program looks for it
+Also required is a `UPStart` export file. The `bin/upb_simple` program looks for it
in the same directory as where the program is (i.e.: `bin`) and assumes that it is named `upb.upe`.
## Configuration
@@ -50,7 +50,7 @@
## First use of the API
-Read the code in `bin/simple`. That is the short use of the API around. Beyond that look at the file `lights.py` and `links.py`. Any method in those files that has a description that starts with `(Helper)` are generally UPB actions.
+Read the code in `bin/upb_simple`. That is the short use of the API around. Beyond that look at the file `lights.py` and `links.py`. Any method in those files that has a description that starts with `(Helper)` are generally UPB actions.
## Usage
@@ -59,7 +59,7 @@
UPB Links are named as a concatenation of the UPB network ID and the link number. For example, link number 6 on UPB network 142 would be `"142_6"`.
-See `bin/simple` for example code.
+See `bin/upb_simple` for example code.
### Transition Rate
Many UPB commands take a `rate`. This API supports the rate as a number of seconds, which is different than what the protocol uses. The protocol allows a set of distinct rates, listed below. For example in the UPB protocol if the rate 7 is sent to a device then the fade rate (for example) would be 20 seconds.

View File

@ -18,12 +18,17 @@ RESTRICT="!test? ( test )"
DOCS="CHANGELOG.md"
RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
dev-python/pyserial-asyncio-fast[${PYTHON_USEDEP}]"
RDEPEND="
dev-python/pytz[${PYTHON_USEDEP}]
dev-python/pyserial-asyncio-fast[${PYTHON_USEDEP}]
"
src_prepare() {
sed -e 's/"CHANGELOG.md",//' -i pyproject.toml || die
eapply "${FILESDIR}/${PN}-rename-cmdr.patch"
mv "${WORKDIR}/upb_lib-${PV}/bin/cmdr.py" "${WORKDIR}/upb_lib-${PV}/bin/upb_cmdr.py"
mv "${WORKDIR}/upb_lib-${PV}/bin/simple" "${WORKDIR}/upb_lib-${PV}/bin/upb_simple"
eapply_user
}
}
distutils_enable_tests pytest