Mercurial > code > home > repos > homeauto

changeset 1136:1e43ec4a5f23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build and import updates for rdfdb, etc Ignore-this: 233cb2b31f03be51695f0fff40eecca7 darcs-hash:92c1c526292f9013ad41d2e3b6d11add8fff02ae
author drewp <drewp@bigasterisk.com>
date Mon, 19 Feb 2018 04:21:28 -0800
parents b9c6b8724d43
children 6ffff91eea2f
files lib/patchablegraph.py service/arduinoNode/arduinoNode.py service/arduinoNode/devices.py service/piNode/devices.py service/piNode/piNode.py service/piNode/requirements.txt
diffstat 6 files changed, 32 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/lib/patchablegraph.py	Sat Feb 17 23:44:51 2018 -0800
+++ b/lib/patchablegraph.py	Mon Feb 19 04:21:28 2018 -0800
@@ -22,11 +22,11 @@
 """
 import sys, json, logging
 import cyclone.sse
-sys.path.append("/my/proj/light9")
-from light9.rdfdb.grapheditapi import GraphEditApi
+sys.path.append("/my/proj/rdfdb")
+from rdfdb.grapheditapi import GraphEditApi
 from rdflib import ConjunctiveGraph
-from light9.rdfdb.rdflibpatch import patchQuads
-from light9.rdfdb.patch import Patch
+from rdfdb.rdflibpatch import patchQuads
+from rdfdb.patch import Patch
 from rdflib_jsonld.serializer import from_rdf
 from rdflib.parser import StringInputSource
 from cycloneerr import PrettyErrorHandler
--- a/service/arduinoNode/arduinoNode.py	Sat Feb 17 23:44:51 2018 -0800
+++ b/service/arduinoNode/arduinoNode.py	Mon Feb 19 04:21:28 2018 -0800
@@ -26,13 +26,12 @@
 
 sys.path.append("../../lib")
 from patchablegraph import PatchableGraph, CycloneGraphHandler, CycloneGraphEventsHandler
+from export_to_influxdb import InfluxExporter
 
-sys.path.append("/my/proj/light9")
-from light9.rdfdb.patch import Patch
-from light9.rdfdb.rdflibpatch import inContext
+sys.path.append("/my/proj/rdfdb")
+from rdfdb.patch import Patch
+from rdfdb.rdflibpatch import inContext
 
-sys.path.append("../piNode")
-from export_to_influxdb import InfluxExporter
 
 log = logging.getLogger()
 logging.getLogger('serial').setLevel(logging.WARN)
--- a/service/arduinoNode/devices.py	Sat Feb 17 23:44:51 2018 -0800
+++ b/service/arduinoNode/devices.py	Mon Feb 19 04:21:28 2018 -0800
@@ -1,8 +1,12 @@
 from __future__ import division
-import itertools, logging, struct, os
+
+import itertools, logging, struct, os, sys
 from rdflib import Namespace, RDF, URIRef, Literal
 import time
 
+sys.path.append('../../lib')
+from devices_shared import RgbPixelsAnimation
+
 ROOM = Namespace('http://projects.bigasterisk.com/room/')
 XSD = Namespace('http://www.w3.org/2001/XMLSchema#')
 log = logging.getLogger()
--- a/service/piNode/devices.py	Sat Feb 17 23:44:51 2018 -0800
+++ b/service/piNode/devices.py	Mon Feb 19 04:21:28 2018 -0800
@@ -7,6 +7,13 @@
 from rdflib import Namespace, URIRef, Literal
 from twisted.internet import reactor
 
+from devices_shared import RgbPixelsAnimation
+
+log = logging.getLogger()
+ROOM = Namespace('http://projects.bigasterisk.com/room/')
+XSD = Namespace('http://www.w3.org/2001/XMLSchema#')
+RDFS = Namespace('http://www.w3.org/2000/01/rdf-schema#')
+
 try:
     import pigpio
 except ImportError:
@@ -23,12 +30,6 @@
         raise ValueError('pwm actual=%s' % actual)
     pi.set_PWM_dutycycle(pinNumber, 0)
 
-import sys
-
-log = logging.getLogger()
-ROOM = Namespace('http://projects.bigasterisk.com/room/')
-XSD = Namespace('http://www.w3.org/2001/XMLSchema#')
-RDFS = Namespace('http://www.w3.org/2000/01/rdf-schema#')
 
 class DeviceType(object):
     deviceType = NotImplementedError
--- a/service/piNode/piNode.py	Sat Feb 17 23:44:51 2018 -0800
+++ b/service/piNode/piNode.py	Mon Feb 19 04:21:28 2018 -0800
@@ -8,7 +8,8 @@
 from docopt import docopt
 
 logging.basicConfig(level=logging.DEBUG)
-sys.path.append("/opt/homeauto_lib")
+
+sys.path.append("../../lib")
 from patchablegraph import PatchableGraph, CycloneGraphHandler, CycloneGraphEventsHandler
 from light9.rdfdb.rdflibpatch import inContext
 from light9.rdfdb.patch import Patch
@@ -31,8 +32,8 @@
 HOST = Namespace('http://bigasterisk.com/ruler/host/')
 
 hostname = socket.gethostname()
-
 CTX = ROOM['pi/%s' % hostname]
+bang6 = 'fcb8:4119:fb46:96f8:8b07:1260:0f50:fcfa'
 
 def patchRandid():
     """
--- a/service/piNode/requirements.txt	Sat Feb 17 23:44:51 2018 -0800
+++ b/service/piNode/requirements.txt	Mon Feb 19 04:21:28 2018 -0800
@@ -1,16 +1,19 @@
-cryptography==1.8.2
+cryptography
 rdflib==4.2.2
 rdflib-jsonld==0.3
 cyclone
 docopt
 python-dateutil
 w1thermsensor
-service_identity==16.0.0
-git+git://github.com/adafruit/Adafruit_Python_DHT#egg=DHT
+service_identity
+git+git://github.com/adafruit/Adafruit_Python_DHT
 http://abyz.co.uk/rpi/pigpio/pigpio.zip
-git+git://github.com/adafruit/Adafruit_Nokia_LCD#egg=Nokia_LCD
+git+git://github.com/adafruit/Adafruit_Nokia_LCD
 RPi.GPIO==0.6.2
 influxdb==3.0.0
 rpi_ws281x==3.0.4
-pyOpenSSL==16.2.0
-
+pyOpenSSL
+numpy==1.13.3
+pillow==5.0.0
+imageio==2.2.0
+https://projects.bigasterisk.com/rdfdb/rdfdb-0.3.0.tar.gz