Skip to content
Browse files

Merge pull request #131 from cloudant-labs/tests

tests and travis
  • Loading branch information...
2 parents 9b328db + 86b8182 commit 27de4a99617fc1ee73816f8a9d4fad4e4235c3f9 @BigBlueHat BigBlueHat committed Nov 13, 2013
Showing with 24 additions and 16 deletions.
  1. +2 −0 .gitignore
  2. +14 −0 .travis.yml
  3. +5 −15 setup.py
  4. +2 −0 tests/__init__.py
  5. +1 −1 tests/test_ignores.py
View
2 .gitignore
@@ -1,3 +1,5 @@
+venv
+*.egg
*.gem
*.swp
*.pyc
View
14 .travis.yml
@@ -0,0 +1,14 @@
+language: python
+python:
+ - "2.7"
+branches:
+ only:
+ - master
+services:
+ - couchdb
+before_script:
+ - pip install coveralls
+script:
+ - nosetests tests
+after_success:
+ - coveralls
View
20 setup.py
@@ -4,7 +4,6 @@
# See the NOTICE for more information.
from setuptools import setup, find_packages
-from distutils.command.install_data import install_data
import glob
from imp import load_source
import os
@@ -137,21 +136,15 @@ def get_py2exe_datafiles():
DATA_FILES = get_py2exe_datafiles()
-class install_package_data(install_data):
- def finalize_options(self):
- self.set_undefined_options('install',
- ('install_lib', 'install_dir'))
- install_data.finalize_options(self)
-
def main():
# read long description
with open(os.path.join(os.path.dirname(__file__), 'README.rst')) as f:
long_description = f.read()
INSTALL_REQUIRES=[
- 'restkit',
- 'watchdog']
+ 'restkit==4.2.2',
+ 'watchdog==0.6.0']
try:
import json
@@ -167,15 +160,16 @@ def main():
author_email = 'benoitc@e-engura.org',
description = 'Standalone CouchDB Application Development Made Simple.',
long_description = long_description,
+ test_suite="tests",
keywords = 'couchdb couchapp',
platforms = ['any'],
classifiers = CLASSIFIERS,
packages = find_packages(),
data_files = DATA_FILES,
include_package_data=True,
- zip_safe=False,
+ zip_safe = False,
install_requires = INSTALL_REQUIRES,
- scripts=get_scripts(),
+ scripts = get_scripts(),
options = dict(py2exe={
'dll_excludes': [
"kernelbase.dll",
@@ -200,7 +194,6 @@ def main():
"subprocess"
]
},
-
bdist_mpkg=dict(zipdist=True,
license='LICENSE',
readme='resources/macosx/Readme.html',
@@ -212,6 +205,3 @@ def main():
if __name__ == "__main__":
main()
-
-
-
View
2 tests/__init__.py
@@ -0,0 +1,2 @@
+import test_cli
+import test_ignores
View
2 tests/test_ignores.py
@@ -21,7 +21,7 @@
from shutil import rmtree
from couchapp.localdoc import LocalDoc as doc
-import couchapp.simplejson as json
+import json
class IgnoresTests(unittest.TestCase):

0 comments on commit 27de4a9

Please sign in to comment.
Something went wrong with that request. Please try again.