Merge pull request #386 from stripe/integration-v2

stripe-python 2.0.0

.coveragerc

@@ -0,0 +1,4 @@
+[run]
+source = stripe
+omit =
+    stripe/six.py

.flake8

@@ -0,0 +1,3 @@
+[flake8]
+exclude =
+    six.py

.gitignore

@@ -12,6 +12,7 @@
 .tox/
 .coverage
 .cache
+.pytest_cache
 nosetests.xml
 coverage.xml
 htmlcov/

.travis.yml

@@ -3,9 +3,7 @@ sudo: false
 language: python
 
 python:
-  - "2.6"
   - "2.7"
-  - "3.3"
   - "3.4"
   - "3.5"
   - "3.6"
@@ -14,22 +12,14 @@ python:
   - "pypy3"
 
 cache:
-  apt: true
   directories:
     - stripe-mock
   pip: false
 
 env:
   global:
-    - PYCURL_SSL_LIBRARY=gnutls
     - STRIPE_MOCK_VERSION=0.19.0
 
-addons:
-  apt:
-    packages:
-      - libcurl4-gnutls-dev
-      - librtmp-dev
-
 before_install:
   # Unpack and start stripe-mock so that the test suite can talk to it
   - |
@@ -43,20 +33,12 @@ before_install:
     STRIPE_MOCK_PID=$!
 
 install:
-  - pip install -U setuptools pip
-  - pip install unittest2 mock pycurl flake8 tox-travis coveralls
-  - python setup.py clean --all
-  - python setup.py install
+  - pip install --upgrade pipenv
+  - pipenv install --dev
 
 script:
-  - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then flake8 stripe tests; fi
-  - python -W all -bb -W error::BytesWarning -m coverage.__main__ run setup.py test
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then make lint; fi
+  - make ci
 
 after_success:
-  coveralls
-
-matrix:
-  allow_failures:
-    - python: 3.7-dev
-    - python: pypy
-    - python: pypy3
+  make coveralls

.vscode/settings.json

@@ -10,7 +10,7 @@
     "python.linting.flake8Enabled": true,
 
     // Tests
-    "python.unitTest.unittestEnabled": true,
-    "python.unitTest.pyTestEnabled": false,
+    "python.unitTest.unittestEnabled": false,
+    "python.unitTest.pyTestEnabled": true,
     "python.unitTest.nosetestsEnabled": false
 }

MANIFEST.in

@@ -1,2 +1,2 @@
-include CHANGELOG.md LICENSE LONG_DESCRIPTION.rst README.md VERSION tox.ini
+include .coveragerc .flake8 CHANGELOG.md LICENSE LONG_DESCRIPTION.rst README.md VERSION pytest.ini tox.ini
 recursive-include tests *.py

Makefile

@@ -0,0 +1,11 @@
+test:
+	pipenv run detox
+
+ci:
+	pipenv run pytest --cov=stripe -n 8
+
+coveralls:
+	pipenv run coveralls
+
+lint:
+	pipenv run tox -e lint

Pipfile

@@ -0,0 +1,27 @@
+[[source]]
+
+url = "https://pypi.python.org/simple"
+verify_ssl = true
+name = "pypi"
+
+
+[packages]
+
+"stripe" = {path = ".", editable = true}
+
+
+[dev-packages]
+
+pytest = ">=3.4"
+pytest-mock = ">=1.7"
+pytest-xdist = ">=1.22"
+pytest-cov = ">=2.5"
+tox = "*"
+detox = "*"
+"flake8" = "*"
+coveralls = "*"
+
+
+[requires]
+
+python_version = "3.7"