Bump deps and fix string decoding.

diff --git a/cscript b/cscript
index 7a12af10a51130cfde063009fa3a9df087f2c540..26b4f120298093af334b369765c8c2b517cb1214 100644 (file)
--- a/cscript
+++ b/cscript
@@ -1,7 +1,7 @@
 import os
 
 def dependencies(target):
-    return (('asdcplib-cth', '6648afc'), ('libcxml', 'v0.16.0'), ('libdcp', 'v1.6.2'))
+    return (('asdcplib-cth', '6648afc'), ('libcxml', 'v0.16.1'), ('libdcp', 'v1.6.3'))
 
 def build(target, options):
     cmd = './waf configure --prefix=%s' % target.directory

diff --git a/wscript b/wscript
index 55f162ab4183c39f7d10adf7633eade70af80e11..8b5169b1241c98fc5082f08e26d58481ba38bdab 100644 (file)
--- a/wscript
+++ b/wscript
@@ -26,11 +26,6 @@ APPNAME = 'libsub'
 this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE).communicate()[0]
 last_version = subprocess.Popen(shlex.split('git describe --tags --abbrev=0'), stdout=subprocess.PIPE).communicate()[0]
 
-if isinstance(this_version, bytes):
-    this_version = this_version.decode('UTF-8')
-if isinstance(last_version, bytes):
-    last_version = last_version.decode('UTF-8')
-
 if this_version == '':
     VERSION = '%sdevel' % last_version[1:].strip()
 else: