From da9086ce2647be87234270e599c20f93b21efe80 Mon Sep 17 00:00:00 2001 From: Yusuke Tsutsumi Date: Wed, 3 Jul 2013 11:24:47 -0700 Subject: [PATCH 1/2] Fixing an issue with setup.py being run in a different directory that the egg root --- setup.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 9dc1a2e..0cd907f 100755 --- a/setup.py +++ b/setup.py @@ -32,11 +32,13 @@ from setuptools import setup HTTPretty.disable() +HTTPRETTY_PATH = os.path.abspath(os.path.join(__file__, os.pardir)) + def get_packages(): # setuptools can't do the job :( packages = [] - for root, dirnames, filenames in os.walk('httpretty'): + for root, dirnames, filenames in os.walk(os.path.join(HTTPRETTY_PATH, 'httpretty')): if '__init__.py' in filenames: packages.append(".".join(os.path.split(root)).strip(".")) @@ -44,7 +46,7 @@ def get_packages(): def test_packages(): - test_reqs = os.path.join(os.getcwd(), 'requirements.pip') + test_reqs = os.path.join(HTTPRETTY_PATH, 'requirements.pip') tests_require = [ line.strip() for line in open(test_reqs).readlines() if not line.startswith("#") From 3c2b25c46318f87a6e1e44d9ff2b85815cfb97f1 Mon Sep 17 00:00:00 2001 From: Yusuke Tsutsumi Date: Wed, 3 Jul 2013 13:55:10 -0700 Subject: [PATCH 2/2] fixing setup.py to find namespaces properly --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 0cd907f..4cd0497 100755 --- a/setup.py +++ b/setup.py @@ -39,8 +39,9 @@ def get_packages(): # setuptools can't do the job :( packages = [] for root, dirnames, filenames in os.walk(os.path.join(HTTPRETTY_PATH, 'httpretty')): + path = root.replace(HTTPRETTY_PATH, '').strip('/') if '__init__.py' in filenames: - packages.append(".".join(os.path.split(root)).strip(".")) + packages.append(".".join(os.path.split(path)).strip(".")) return packages