Merge master

.circleci/config.yml

@@ -6,8 +6,7 @@ common: &common
     - checkout
     - restore_cache:
         keys:
-          - v2-deps-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}
-          - v2-deps-
+          - v3-deps-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}
     - run:
         name: install dependencies
         command: pip install --user tox
@@ -29,7 +28,7 @@ common: &common
           - ~/.cache/pip
           - ~/.local
           - ./eggs
-        key: v2-deps-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}
+        key: v3-deps-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}
 
 jobs:
   lint:

.gitignore

@@ -1,4 +1,6 @@
 .DS_Store
+Pipfile
+Pipfile.lock
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

docs/about/release-notes.md

@@ -1,5 +1,15 @@
 # Release Notes
 
+## 4.4.0 - 2018-08-04
+
+* Pin `python-stripe` to `>2.0` after the merge of [PR 574](https://github.com/pinax/pinax-stripe/pull/574) which fixed compatibility. [PR 581](https://github.com/pinax/pinax-stripe/pull/581)
+
+
+## 4.3.1 - 2018-08-04
+
+* Pin `python-stripe` to `<2.0` as that major release broke things in `pinax-stripe` [PR 580](https://github.com/pinax/pinax-stripe/pull/580)
+
+
 ## 3.4.1 - 2017-04-21
 
 This fixes a bug that was introduced in `3.4.0` with customer creation taking a `quantity` parameter.

docs/user-guide/connect.md

@@ -86,12 +86,10 @@ class CreateCustomAccountView(FormView):
     form_class = InitialCustomAccountForm
     template_name = '<path to your template>'
 
-    def get_form_kwargs(self, *args, **kwargs):
+    def get_form_kwargs(self):
         form_kwargs = super(
-            CreateBankAccountView, self
-        ).get_form_kwargs(
-            *args, **kwargs
-        )
+            CreateCustomAccountView, self
+        ).get_form_kwargs()
         initial = form_kwargs.pop('initial', {})
         form_kwargs['request'] = self.request
         form_kwargs['country'] = 'US'

pinax/stripe/management/commands/init_customers.py

@@ -11,5 +11,5 @@ class Command(BaseCommand):
     def handle(self, *args, **options):
         User = get_user_model()
         for user in User.objects.filter(customer__isnull=True):
-            customers.create(user=user)
+            customers.create(user=user, charge_immediately=False)
             self.stdout.write("Created customer for {0}\n".format(user.email))

setup.py

@@ -63,7 +63,7 @@
     author_email=AUTHOR_EMAIL,
     description=DESCRIPTION,
     long_description=LONG_DESCRIPTION,
-    version="4.3.0",
+    version="4.4.0",
     license="MIT",
     url=URL,
     packages=find_packages(),
@@ -88,11 +88,11 @@
     install_requires=[
         "django-appconf>=1.0.1",
         "jsonfield>=1.0.3",
-        "stripe>=1.7.9",
+        "stripe>=2.0",
         "django>=1.8",
         "pytz",
         "six",
-        "django-ipware==1.1.6"
+        "django-ipware==2.1.0"
     ],
     extras_require={
         "pytest": ["pytest", "pytest-django"] + tests_require,

tox.ini

@@ -38,7 +38,7 @@ deps =
     dj111: Django>=1.11a1,<2.0
     dj20: Django<2.1
     master: https://github.com/django/django/tarball/master
-    postgres: psycopg2
+    postgres: psycopg2-binary
 extras =
     pytest: pytest
 usedevelop = True