From 2ab35332a03e183922a6fcef28f8d92e300ae86d Mon Sep 17 00:00:00 2001 From: Nicolas Dandrimont Date: Fri, 1 Nov 2013 04:04:12 +0100 Subject: [PATCH 1/3] Ship the hy files in hy/contrib --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index ac0b028..8660cd7 100755 --- a/setup.py +++ b/setup.py @@ -63,6 +63,7 @@ setup( }, packages=find_packages(exclude=['tests*']), package_data={ + 'hy.contrib': ['*.hy'], 'hy.core': ['*.hy'], }, author="Paul Tagliamonte", From 5467d2f6bee47e1886424c18c446dbe91a76b8b2 Mon Sep 17 00:00:00 2001 From: Berker Peksag Date: Mon, 4 Nov 2013 16:12:11 +0200 Subject: [PATCH 2/3] Fix rply dependency. To test this, replace the https://github.com/hylang/rply/zipball/master#egg=rply-0.6.2 url with https://github.com/berkerpeksag/rply/zipball/master#egg=rply-0.6.2 in setup.py. $ cd hy $ virtualenv dummy $ . dummy/bin/activate $ pip install . $ pip install astor nose $ make test ... ... Ran 252 tests in 9.723s OK --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 8660cd7..f3e1814 100755 --- a/setup.py +++ b/setup.py @@ -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 nice together. """ -install_requires = [] +install_requires = ['rply>=0.6.2'] if sys.version_info[:2] < (2, 7): install_requires.append('argparse>=1.2.1') if os.name == 'nt': @@ -55,6 +55,7 @@ setup( name=PKG, version=__version__, install_requires=install_requires, + dependency_links=['https://github.com/hylang/rply/zipball/master#egg=rply-0.6.2'], entry_points={ 'console_scripts': [ 'hy = hy.cmdline:hy_main', From f77ff5a4821babc994d19c6e498cd9ccdfab0725 Mon Sep 17 00:00:00 2001 From: Paul Tagliamonte Date: Fri, 8 Nov 2013 19:53:18 -0500 Subject: [PATCH 3/3] Ignore me.