Mercurial > code > home > repos > homeauto

changeset 1680:cd77bcbfd522

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
checkpoint service/tradfri
author drewp@bigasterisk.com
date Mon, 27 Sep 2021 23:03:02 -0700
parents f88ff1021ee0
children 9d074317e16a
files service/tradfri/Dockerfile service/tradfri/requirements.txt service/tradfri/tradfri.py
diffstat 3 files changed, 19 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/service/tradfri/Dockerfile	Mon Sep 27 23:02:33 2021 -0700
+++ b/service/tradfri/Dockerfile	Mon Sep 27 23:03:02 2021 -0700
@@ -3,20 +3,22 @@
 WORKDIR /opt
 
 RUN apt-get install -y autoconf automake libtool
-# this is https://github.com/ggravlingen/pytradfri/blob/master/script/install-coap-client.sh
-RUN \
-git clone --depth 1 --recursive -b dtls https://github.com/home-assistant/libcoap.git \
-&& cd libcoap \
-&& ./autogen.sh \
-&& ./configure --disable-documentation --disable-shared --without-debug CFLAGS="-D COAP_DEBUG_FD=stderr" \
-&& make \
-&& make install
+## this is https://github.com/ggravlingen/pytradfri/blob/master/script/install-coap-client.sh
+#RUN \
+#git clone --depth 1 --recursive -b dtls https://github.com/home-assistant/libcoap.git \
+#&& cd libcoap \
+#&& ./autogen.sh \
+#&& ./configure --disable-documentation --disable-shared --without-debug CFLAGS="-D COAP_DEBUG_FD=stderr" \
+#&& make \
+#&& make install
 
 
 COPY requirements.txt ./
-RUN pip3 install -r requirements.txt
+RUN pip3 install --index-url https://projects.bigasterisk.com/ --extra-index-url https://pypi.org/simple -r requirements.txt
+# not sure why this doesn't work from inside requirements.txt
+RUN pip3 install --index-url https://projects.bigasterisk.com/ --extra-index-url https://pypi.org/simple -U 'https://github.com/drewp/cyclone/archive/python3.zip?v2'
 
-COPY static static
+
 COPY *.py req* ./
 
 EXPOSE 10009
--- a/service/tradfri/requirements.txt	Mon Sep 27 23:02:33 2021 -0700
+++ b/service/tradfri/requirements.txt	Mon Sep 27 23:03:02 2021 -0700
@@ -2,9 +2,13 @@
 cyclone
 docopt
 python-dateutil
-pytradfri[async]==6.0.1
+pytradfri[async]==6.4.0
 
 rdflib==4.2.2
 rdflib-jsonld==0.4.0
 
-https://projects.bigasterisk.com/rdfdb/rdfdb-0.21.0.tar.gz
+cycloneerr
+patchablegraph==0.11.0
+rdfdb==0.21.0
+standardservice==0.6.0
+
--- a/service/tradfri/tradfri.py	Mon Sep 27 23:02:33 2021 -0700
+++ b/service/tradfri/tradfri.py	Mon Sep 27 23:03:02 2021 -0700
@@ -106,7 +106,7 @@
                 #import ipdb;ipdb.set_trace()
 
                 lightUri = devUri(dev)
-                print lc.raw
+                print(lc.raw)
                 if not lc.raw[0][ATTR_LIGHT_STATE]:
                     level = 0
                 else: