From ce22e49b50f5e2f8a62cc55dd7f7dae6c23f9214 Mon Sep 17 00:00:00 2001 From: Nicolas Dandrimont Date: Mon, 8 Apr 2013 02:36:15 +0200 Subject: [PATCH] Add rply to dependencies Use the hylang fork until mainline grows the source position patch. --- requirements-dev.txt | 1 + requirements.txt | 3 ++- setup.py | 3 ++- tox.ini | 13 ++++++++++++- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index a8da309..2c3b353 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,3 +1,4 @@ +-r requirements.txt astor tox nose diff --git a/requirements.txt b/requirements.txt index 6624c34..a3b23d7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1,2 @@ -# Nothing, yet! (ish). Check site / dev for more deps! +# Check site / dev for more deps! +-e git+https://github.com/hylang/rply.git#egg=rply diff --git a/setup.py b/setup.py index 8b6ba62..9e9284a 100755 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ long_description = """Hy is a Python <--> Lisp layer. It helps make things work nicer, and lets Python and the Hy lisp variant play nice together. """ -install_requires = [] +install_requires = ["rply"] if sys.version_info[0] == 2: install_requires.append('argparse>=1.2.1') if os.name == 'nt': @@ -55,6 +55,7 @@ setup( package_data={ 'hy.core': ['*.hy'], }, + setup_requires=['rply'], author="Paul Tagliamonte", author_email="tag@pault.ag", long_description=long_description, diff --git a/tox.ini b/tox.ini index dc99df8..9b17b7a 100644 --- a/tox.ini +++ b/tox.ini @@ -5,6 +5,8 @@ commands = nosetests deps = nose setuptools + -e + git+https://github.com/hylang/rply.git#egg=rply [testenv:pypy] commands = nosetests @@ -12,6 +14,8 @@ deps = astor nose setuptools + -e + git+https://github.com/hylang/rply.git#egg=rply [testenv:py27] commands = nosetests @@ -19,6 +23,8 @@ deps = astor nose setuptools + -e + git+https://github.com/hylang/rply.git#egg=rply [testenv:py26] deps = @@ -27,7 +33,12 @@ deps = setuptools unittest2 importlib + -e + git+https://github.com/hylang/rply.git#egg=rply [testenv:flake8] -deps = flake8 +deps = + flake8 + -e + git+https://github.com/hylang/rply.git#egg=rply commands = flake8 hy bin tests