From a335df0635d7db909787bf4866cd557d4519cd7b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 12 Mar 2019 00:36:40 +0000 Subject: Bump deps and fix string decoding. --- cscript | 2 +- wscript | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/cscript b/cscript index 7a12af1..26b4f12 100644 --- 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 55f162a..8b5169b 100644 --- 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: -- cgit v1.2.3