raspyrfm-client: fix several issues:

- #175
    - #161
    - #176
This commit is contained in:
Andreas Billmeier 2020-09-10 21:18:11 +02:00 committed by Andreas Billmeier
parent c2efbc35ff
commit 84ed999e0d
Signed by: onkelbeh
GPG Key ID: E6DB12C8C550F3C0
4 changed files with 31 additions and 3 deletions

View File

@ -9,6 +9,10 @@
* update hass-nabucasa-0.37.0
* keba-kecontact: fix https://git.edevau.net/onkelbeh/HomeAssistantRepository/issues/137
* volkszaehler: fix https://git.edevau.net/onkelbeh/HomeAssistantRepository/issues/168
* raspyrfm-client: fix several issues:
- https://git.edevau.net/onkelbeh/HomeAssistantRepository/issues/175
- https://git.edevau.net/onkelbeh/HomeAssistantRepository/issues/161
- https://git.edevau.net/onkelbeh/HomeAssistantRepository/issues/176
2020-09-08 homeassistant-0.115.0_beta2
* cleanup PyDispatcher vs pydispatcher

View File

@ -1,3 +1,4 @@
AUX raspyrfm-client_catch_git_queries.patch 770 BLAKE2B 745c0744e38cd19d355b8a11a26ce4700b977b59a849368163983779fb997d4cfaf50d72d0a6867f517ade0d002adf4c85be0865de9f1f6de754f91ee3cffa74 SHA512 32702fba24cac5752e80af79087e135ee5acf7fe30d6f4181a530a36eecd965f820f233318c9deb3b6e5c870d3408388d1aa1062f8b907f8febc1fae1c887379
DIST raspyrfm-client-1.2.8.tar.gz 34643 BLAKE2B e5caf8e9f4eda5a027c3b22a0ae1b92229c2c7e698487a4e6b09667ab24cb81bb4ea113f9704e25018420c23e906b24178f185ad3e8de204f8d94231476585c4 SHA512 9eee488a2cb2989177f2bae8de4e6018322094308663b87fc00829919f76e27f4f6353fbce7d3d543057844cad7622e67f668fb9cbe10f292fa4c8278fdda018
EBUILD raspyrfm-client-1.2.8.ebuild 795 BLAKE2B 29258bdf0b284e7c3e19554ff84da7260280b480b5fb5b21b0783d29b458937df16bb2ac6515d5e8a2e567f939f8ffd3ee2c39c339aa47540ae5d3ac9e8bbc11 SHA512 3b11be2f7521d78544121a0dd2af0391f2afbb95a8b169ad3fd2b659b3b47fc3670e9f490673ee35aa5c1e57704f3483e01df263958f0f07784798b36c6150fc
EBUILD raspyrfm-client-1.2.8.ebuild 932 BLAKE2B f6ad426c3539256829028345febba8c0d7649c5483fa113a2a5d6020b8096c4c5db07adb8b10f66a0b4818e3d9d35e8a8b27e7d57823e6e5b5fde916ed1d1500 SHA512 60bf83b1dec15e8267868bf49cca83ca1bd53d4c19720f9b6ef51b2bd23ece99a417829e5793e359e81f90a3b085169d69c29c34e8898ac0274ddd1c8387c528
MISC metadata.xml 461 BLAKE2B f2bbfd4544554e79be85fa6971c5ff67f5570fb75cc7026cbcef0acb461d21c7e2944cdfc7bed479f8d3047291f2f6c53fedfbbf9095f0c10d2b864fa9d27d2f SHA512 5b6e815ef90d4ecd7960504ca38316856fcedce03ef9abbeb8c83c7eb32e269c9d51a8688262d6a52a0ab387588f4e2578d25eb49d6927df6695c06312b96c70

View File

@ -0,0 +1,20 @@
diff --git a/setup.py b/setup.py
index 9d805a1..ef07485 100644
--- a/setup.py
+++ b/setup.py
@@ -4,9 +4,12 @@ from setuptools import setup, find_packages
VERSION_NUMBER = "1.2.8"
-GIT_BRANCH = subprocess.check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"])
-GIT_BRANCH = GIT_BRANCH.decode() # convert to standard string
-GIT_BRANCH = GIT_BRANCH.rstrip() # remove unnecessary whitespace
+try:
+ GIT_BRANCH = subprocess.check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"])
+ GIT_BRANCH = GIT_BRANCH.decode() # convert to standard string
+ GIT_BRANCH = GIT_BRANCH.rstrip() # remove unnecessary whitespace
+except:
+ GIT_BRANCH = "master"
if GIT_BRANCH == "master":
DEVELOPMENT_STATUS = "Development Status :: 5 - Production/Stable"

View File

@ -7,7 +7,6 @@ PYTHON_COMPAT=( python3_{6,7,8} )
inherit distutils-r1
MY_PN=${PN/-/_}
DESCRIPTION="A library to send rc signals with the RaspyRFM module"
HOMEPAGE="https://github.com/markusressel/raspyrfm-client https://pypi.org/project/raspyrfm-client/"
SRC_URI="https://github.com/markusressel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@ -25,7 +24,11 @@ DEPEND="${REDEPEND}
dev-python/pytest[${PYTHON_USEDEP}]
)"
S="${WORKDIR}/${MY_PN}-${PV}"
src_prepare() {
sed -i "s/packages=find_packages()/packages=find_packages(exclude=['tests'])/g" -i setup.py || die
eapply "${FILESDIR}/${PN}_catch_git_queries.patch"
eapply_user
}
python_test() {
nosetests --verbose || die