Mercurial > code > home > repos > light9

changeset 686:a301a0039c66

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
buildout and rdflib updates Ignore-this: 912b5b138f73771434f6cc1b077841c0
author Drew Perttula <drewp@bigasterisk.com>
date Tue, 05 Jun 2012 20:40:35 +0000
parents d9e61d97c578
children 454e381cd24f
files bin/ascoltami bin/ascoltami2 bin/curvecalc bin/dmxserver buildout.cfg light9/Submaster.py light9/showconfig.py show/dance2011/config.n3
diffstat 8 files changed, 31 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/bin/ascoltami	Sun Jun 26 00:52:09 2011 +0000
+++ b/bin/ascoltami	Tue Jun 05 20:40:35 2012 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!bin/python
 
 # this is a fork from semprini/ascotalmi to use mpd
 
--- a/bin/ascoltami2	Sun Jun 26 00:52:09 2011 +0000
+++ b/bin/ascoltami2	Tue Jun 05 20:40:35 2012 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!bin/python
 import web, thread, gobject, sys, optparse, logging
 from rdflib import URIRef
 sys.path.append(".")
--- a/bin/curvecalc	Sun Jun 26 00:52:09 2011 +0000
+++ b/bin/curvecalc	Tue Jun 05 20:40:35 2012 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!bin/python
 
 """
 now launches like this:
@@ -26,7 +26,7 @@
 from twisted.internet.defer import succeed
 from twisted.web.iweb import IBodyProducer
 from rdflib import Literal, URIRef, RDF, RDFS
-from rdflib.Graph import Graph
+from rdflib import Graph
 import rdflib
 import logging
 log = logging.getLogger()
@@ -500,7 +500,7 @@
 
 def currentlyPlayingSong():
     """ask the music player what song it's on"""
-    t = jsonlib.read(restkit.Resource(networking.musicUrl()).get("time").body)
+    t = jsonlib.read(restkit.Resource(networking.musicPlayer.url).get("time").body)
     if t['song'] is None:
         raise ValueError("music player is not playing any song")
     return URIRef(t['song'])
--- a/bin/dmxserver	Sun Jun 26 00:52:09 2011 +0000
+++ b/bin/dmxserver	Tue Jun 05 20:40:35 2012 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!bin/python
 """
 
 this is the only process to talk to the dmx hardware. other clients
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/buildout.cfg	Tue Jun 05 20:40:35 2012 +0000
@@ -0,0 +1,21 @@
+[buildout]
+parts = external_libs 
+bin-directory = bin
+download-cache = /tmp/
+
+
+
+[external_libs]
+recipe = zc.recipe.egg
+eggs = web.py==0.36
+       cyclone==1.0-rc4
+       rdflib==3.2.1
+       restkit==4.1.2
+
+python = python
+interpreter = python
+extra-paths = 
+
+[python]
+executable = /usr/bin/python2.7
+
--- a/light9/Submaster.py	Sun Jun 26 00:52:09 2011 +0000
+++ b/light9/Submaster.py	Tue Jun 05 20:40:35 2012 +0000
@@ -1,6 +1,6 @@
 from __future__ import division
 import os, logging
-from rdflib.Graph import Graph
+from rdflib import Graph
 from rdflib import RDFS, Literal, BNode
 from light9.namespaces import L9, XSD
 from light9.TLUtility import dict_scale, dict_max
--- a/light9/showconfig.py	Sun Jun 26 00:52:09 2011 +0000
+++ b/light9/showconfig.py	Tue Jun 05 20:40:35 2012 +0000
@@ -1,6 +1,6 @@
 import time, logging
 from os import path, getenv
-from rdflib.Graph import Graph
+from rdflib import Graph
 from rdflib import URIRef
 from namespaces import MUS, L9
 log = logging.getLogger('showconfig')
--- a/show/dance2011/config.n3	Sun Jun 26 00:52:09 2011 +0000
+++ b/show/dance2011/config.n3	Tue Jun 05 20:40:35 2012 +0000
@@ -19,8 +19,8 @@
 
 show:dance2011 :networking sh:netHome .
 sh:netHome  
-  :musicPlayer <http://plus:8040/>;
-  :dmxServer <http://plus:8030/>;
+  :musicPlayer <http://dash:8040/>;
+  :dmxServer <http://dash:8030/>;
   :keyboardComposer <http://dash:8050/> .
 
 :Song is rdf:type of sh:song1, sh:song2, sh:song3, sh:song4,