Permalink
Browse files

Merge branch 'testing'

  • Loading branch information...
2 parents be03d7b + 8fee9d7 commit e927c239d3ba8168bcca3541cad68c437a5fec43 @evan-stripe evan-stripe committed Jun 2, 2012
Showing with 24 additions and 2 deletions.
  1. +3 −0 .gitignore
  2. +4 −0 .travis.yml
  3. +7 −2 setup.py
  4. 0 test/__init__.py
  5. +10 −0 tox.ini
View
@@ -3,3 +3,6 @@
/MANIFEST
/stripe.egg-info
*.pyc
+*.egg
+.tox
+*.class
View
@@ -3,6 +3,7 @@ python:
- "2.5"
- "2.6"
- "2.7"
+ - "pypy"
before_install:
- sudo apt-get update
- sudo apt-get install libcurl4-gnutls-dev librtmp-dev
@@ -19,3 +20,6 @@ matrix:
# Requests doesn't support 2.5
- python: "2.5"
env: HTTPLIB=requests
+ # C extensions are not guaranteed to work with pypy
+ - python: "pypy"
+ env: HTTPLIB=pycurl
View
@@ -1,6 +1,10 @@
import os
import sys
-from distutils.core import setup
+
+try:
+ from setuptools import setup
+except ImportError:
+ from distutils.core import setup
# Don't import stripe module here, since deps may not be installed
sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'stripe'))
@@ -31,5 +35,6 @@
url='https://stripe.com/',
packages=['stripe'],
package_data={'stripe' : ['data/ca-certificates.crt', '../VERSION']},
- install_requires=install_requires
+ install_requires=install_requires,
+ test_suite='test',
)
View
No changes.
View
10 tox.ini
@@ -0,0 +1,10 @@
+# Tox (http://tox.testrun.org/) is a tool for running tests
+# in multiple virtualenvs. This configuration file will run the
+# test suite on all supported python versions. To use it, "pip install tox"
+# and then run "tox" from this directory.
+
+[tox]
+envlist = py26, py27, pypy
+
+[testenv]
+commands = {envpython} setup.py test

0 comments on commit e927c23

Please sign in to comment.