Merge pull request #328 from berkerpeksag/add-astor

Add astor to install_requires.
This commit is contained in:
Morten Linderud 2013-12-11 08:13:03 -08:00
commit c11b231c1c
2 changed files with 3 additions and 8 deletions

View File

@ -45,7 +45,7 @@ long_description = """Hy is a Python <--> Lisp layer. It helps
make things work nicer, and lets Python and the Hy lisp variant play make things work nicer, and lets Python and the Hy lisp variant play
nice together. """ nice together. """
install_requires = ['rply>=0.7.0'] install_requires = ['rply>=0.7.0', 'astor>=0.3']
if sys.version_info[:2] < (2, 7): if sys.version_info[:2] < (2, 7):
install_requires.append('argparse>=1.2.1') install_requires.append('argparse>=1.2.1')
install_requires.append('importlib>=1.0.2') install_requires.append('importlib>=1.0.2')

View File

@ -22,7 +22,6 @@
# DEALINGS IN THE SOFTWARE. # DEALINGS IN THE SOFTWARE.
import os import os
import subprocess import subprocess
import sys
from nose.plugins.skip import SkipTest from nose.plugins.skip import SkipTest
@ -42,8 +41,8 @@ def run_cmd(cmd, stdin_data=None):
# Read stdout and stderr otherwise if the PIPE buffer is full, we might # Read stdout and stderr otherwise if the PIPE buffer is full, we might
# wait for ever… # wait for ever…
while p.poll() is None: while p.poll() is None:
stdout += str(p.stdout.read()) stdout += p.stdout.read().decode('utf-8')
stderr += str(p.stderr.read()) stderr += p.stderr.read().decode('utf-8')
return p.returncode, stdout, stderr return p.returncode, stdout, stderr
@ -118,10 +117,6 @@ def test_bin_hyc_missing_file():
def test_hy2py(): def test_hy2py():
# XXX Astor doesn't seem to support Python3 :(
if sys.version_info[0] == 3:
return
# and running this script this way doesn't work on Windows # and running this script this way doesn't work on Windows
if os.name == "nt": if os.name == "nt":
raise SkipTest("doesn't work on Windows") raise SkipTest("doesn't work on Windows")