From 28169127676d9a02b9cf78db51cab053135f3150 Mon Sep 17 00:00:00 2001 From: Jordi Llonch Date: Mon, 22 Apr 2013 08:20:44 +1000 Subject: [PATCH 1/3] added a broad gitignore --- .gitignore | 46 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 26e0740..af5c047 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,41 @@ -*.pyc -build -dist +*.py[cod] + +# C extensions +*.so + +# Packages +*.egg *.egg-info -.settings -*plugin.xml -.idea +dist +build +eggs +parts +bin +var +sdist +develop-eggs +.installed.cfg +lib +lib64 +__pycache__ + +# Installer logs +pip-log.txt + +# Unit test / coverage reports +.coverage +.tox +nosetests.xml + +# Translations +*.mo + +# Mr Developer +.mr.developer.cfg +.project +.pydevproject + +# Sphinx documentation +doc/build/** + +*.log \ No newline at end of file From 5d6d31601574a66a082e262d424ff81ca603656b Mon Sep 17 00:00:00 2001 From: Jordi Llonch Date: Mon, 22 Apr 2013 08:22:29 +1000 Subject: [PATCH 2/3] setup.py tests tweak --- setup.cfg | 3 +++ setup.py | 2 ++ test.sh | 3 +-- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 setup.cfg diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..dbd743b --- /dev/null +++ b/setup.cfg @@ -0,0 +1,3 @@ +[nosetests] +with-freshen = 1 +verbosity = 2 diff --git a/setup.py b/setup.py index 6a97669..b1f6375 100644 --- a/setup.py +++ b/setup.py @@ -167,6 +167,8 @@ def run_rest_app(): tests_require=[ 'httplib2>=0.7.1', 'freshen>=0.2', + 'txZMQ' ], + test_suite='corepost.test', zip_safe = True ) diff --git a/test.sh b/test.sh index 9b352b2..7148d04 100755 --- a/test.sh +++ b/test.sh @@ -1,2 +1 @@ -nosetests --with-freshen -v - +python setup.py nosetests From 757d1a664707d9794a8ac6ba73f5de356d35b4b2 Mon Sep 17 00:00:00 2001 From: Jordi Llonch Date: Mon, 22 Apr 2013 08:22:57 +1000 Subject: [PATCH 3/3] fixed import bug (tests fail fix) --- corepost/ext/sql/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/corepost/ext/sql/__init__.py b/corepost/ext/sql/__init__.py index 7bc65eb..85387a6 100644 --- a/corepost/ext/sql/__init__.py +++ b/corepost/ext/sql/__init__.py @@ -5,7 +5,7 @@ ''' try: - import txZMQ + import txzmq except ImportError as ex: print "You need to have txZMQ and ZeroMQ installed in order to use multicore support in Corepost" raise ex