Permalink
Browse files

depend on python 2.7 (rather than 2.6) and remove subprocesshelp

Ignore-this: a476062e3a7683934b468720708dae36

darcs-hash:20130718201157-3a4db-11aef523032282d6062a26a2769c57d113a095a0
  • Loading branch information...
1 parent a7bb733 commit 79f9ed7d6b6704e75889e611a7858522a4506226 @MattShannon committed Jul 18, 2013
Showing with 5 additions and 30 deletions.
  1. +1 −1 README.markdown
  2. +4 −6 bisque/sge_queuer.py
  3. +0 −23 bisque/subprocesshelp.py
View
@@ -34,7 +34,7 @@ armspeech has the following dependencies:
- if you want to generate audio, STRAIGHT vocoder (which requires MATLAB)
- if you want to generate audio, an appropriate HTS demo-style `Config.pm` file
- the [codedep][codedep] package for code-level dependency tracking
-- python (>= 2.6) with recent numpy, scipy and matplotlib
+- python (>= 2.7) with recent numpy, scipy and matplotlib
- if using the HTS demo to generate the required files above (recommended),
you should use the STRAIGHT version of the English speaker dependent training
demo (which requires HTS, which in turn requires HTK).
View
@@ -20,7 +20,7 @@
import re
import os
import sys
-from bisque import subprocesshelp
+import subprocess
@codeDeps(qr.Queuer)
class SgeQueuer(qr.Queuer):
@@ -89,9 +89,7 @@ def qsub(self, jobName, liveJobDir, parentJids, verbosity):
qsubRe = re.compile(r'Your job.* ([0-9]+) \("(.*)"\) has been submitted\n$')
-@codeDeps(SgeQueuer, persist.secHashObject, qsubRe, sge_runner,
- subprocesshelp.check_output
-)
+@codeDeps(SgeQueuer, persist.secHashObject, qsubRe, sge_runner)
class QsubSgeQueuer(SgeQueuer):
def __init__(self, buildRepo, project, email = None, emailOpts = 'n',
jointLog = False, pythonExec = None):
@@ -112,7 +110,7 @@ def __init__(self, buildRepo, project, email = None, emailOpts = 'n',
# check there is a grid available for us to use
try:
- subprocesshelp.check_output(['qstat'])
+ subprocess.check_output(['qstat'])
except OSError:
raise RuntimeError('grid not found (running qstat failed)')
@@ -152,7 +150,7 @@ def qsub(self, jobName, liveJobDir, parentJids, verbosity):
print 'queuer: command:'
print '\t', ' '.join(args)
- stdoutdata = subprocesshelp.check_output(args)
+ stdoutdata = subprocess.check_output(args)
match = qsubRe.match(stdoutdata)
if not match:
View
@@ -1,23 +0,0 @@
-"""Helper functions for running external processes using subprocess."""
-
-# Copyright 2011, 2012, 2013 Matt Shannon
-
-# This file is part of armspeech.
-# See `License` for details of license and warranty.
-
-
-from __future__ import division
-
-from codedep import codeDeps
-
-import subprocess
-from subprocess import PIPE
-
-# emulate python 2.7 function (roughly -- in particular, exception generated is not the same)
-@codeDeps()
-def check_output(*popenargs, **kwargs):
- p = subprocess.Popen(stdout = PIPE, *popenargs, **kwargs)
- stdout = p.communicate()[0]
- if p.returncode != 0:
- raise subprocess.CalledProcessError('process had non-zero return code', p.returncode)
- return stdout

0 comments on commit 79f9ed7

Please sign in to comment.