Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master #118

Merged
merged 21 commits into from
Aug 28, 2018
Merged

Merge master #118

merged 21 commits into from
Aug 28, 2018

Conversation

blueyed
Copy link

@blueyed blueyed commented Aug 28, 2018

No description provided.

alasdairnicol and others added 21 commits May 1, 2018 12:59
Use correct class name, and remove *args/**kwargs.

Fixes pinax#512
Stripe throws an error because we try to make a charge without having a card. Because we don't have a card for this user yet, it doesn't make sense to charge them immediately.
Fixes build failure when upgrading e.g. django-ipware
(https://circleci.com/gh/pinax/pinax-stripe/7999).
Require django-ipware==2.1.0

Closes pinax#562.
tox: use psycopg2-binary for postgres factor
CircleCI: do not use unversioned cache
Don't try to charge a customer with no card
Fix get_form_kwargs example in connect docs
Pin to greater than 2.0 for python-stripe
Conflicts:
	pinax/stripe/actions/coupons.py
	pinax/stripe/tests/test_actions.py
@codecov
Copy link

codecov bot commented Aug 28, 2018

Codecov Report

Merging #118 into next will not change coverage.
The diff coverage is 100%.

Impacted file tree graph

@@           Coverage Diff           @@
##             next     #118   +/-   ##
=======================================
  Coverage   98.77%   98.77%           
=======================================
  Files          33       33           
  Lines        1965     1965           
  Branches      180      180           
=======================================
  Hits         1941     1941           
  Misses         14       14           
  Partials       10       10
Flag Coverage Δ
#py27dj111 98.77% <100%> (ø) ⬆️
#py36dj20psql 98.77% <100%> (ø) ⬆️
Impacted Files Coverage Δ
pinax/stripe/management/commands/init_customers.py 100% <100%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1b00401...6249b28. Read the comment docs.

@blueyed blueyed merged commit f808df7 into lock8:next Aug 28, 2018
@blueyed blueyed deleted the merge-master branch August 28, 2018 14:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants