From 85df1377acc5d1f3b65f90ee394126e5f49f53b1 Mon Sep 17 00:00:00 2001 From: Richard Marmorstein Date: Mon, 13 Jul 2020 11:50:50 -0400 Subject: [PATCH 1/4] Allow paths to PIP and PYTHON to be parameterized in the makefile --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 9899803a3..ddda90e6f 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,12 @@ VENV_NAME?=venv +PIP?=pip +PYTHON?=python venv: $(VENV_NAME)/bin/activate $(VENV_NAME)/bin/activate: setup.py - pip install --upgrade pip virtualenv - @test -d $(VENV_NAME) || python -m virtualenv --clear $(VENV_NAME) + $(PIP) install --upgrade pip virtualenv + @test -d $(VENV_NAME) || $(PYTHON) -m virtualenv --clear $(VENV_NAME) ${VENV_NAME}/bin/python -m pip install -U pip tox ${VENV_NAME}/bin/python -m pip install -e . @touch $(VENV_NAME)/bin/activate @@ -16,7 +18,7 @@ ci: venv @${VENV_NAME}/bin/python setup.py test -a "-n auto --cov=stripe" coveralls: venv - @${VENV_NAME}/bin/pip install --upgrade coveralls + @${VENV_NAME}/bin/$(PIP) install --upgrade coveralls @${VENV_NAME}/bin/coveralls fmt: venv From da1acf43315beb88a079ebb9ade8e289947e2528 Mon Sep 17 00:00:00 2001 From: Richard Marmorstein Date: Mon, 13 Jul 2020 11:51:19 -0400 Subject: [PATCH 2/4] Add support for 'stripe_version' to File.create --- stripe/api_resources/file.py | 13 ++++++++++--- tests/api_resources/test_account_link.py | 4 ++-- tests/api_resources/test_file.py | 20 ++++++++++++++++++++ 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/stripe/api_resources/file.py b/stripe/api_resources/file.py index 857077c6d..7d93b8dd3 100644 --- a/stripe/api_resources/file.py +++ b/stripe/api_resources/file.py @@ -21,12 +21,19 @@ def class_url(cls): @classmethod def create( - cls, api_key=None, api_version=None, stripe_account=None, **params + # 'api_version' is deprecated, please use 'stripe_version' + cls, + api_key=None, + api_version=None, + stripe_version=None, + stripe_account=None, + **params ): + version = api_version or stripe_version requestor = api_requestor.APIRequestor( api_key, api_base=stripe.upload_api_base, - api_version=api_version, + api_version=version, account=stripe_account, ) url = cls.class_url() @@ -35,7 +42,7 @@ def create( "post", url, params=params, headers=supplied_headers ) return util.convert_to_stripe_object( - response, api_key, api_version, stripe_account + response, api_key, version, stripe_account ) diff --git a/tests/api_resources/test_account_link.py b/tests/api_resources/test_account_link.py index 4b6082568..b4c5f9376 100644 --- a/tests/api_resources/test_account_link.py +++ b/tests/api_resources/test_account_link.py @@ -7,8 +7,8 @@ class TestAccountLink(object): def test_is_creatable(self, request_mock): resource = stripe.AccountLink.create( account="acct_123", - failure_url="https://stripe.com/failure", - success_url="https://stripe.com/success", + refresh_url="https://stripe.com/failure", + return_url="https://stripe.com/success", type="custom_account_verification", ) request_mock.assert_requested("post", "/v1/account_links") diff --git a/tests/api_resources/test_file.py b/tests/api_resources/test_file.py index b8e3891bd..a214b5c0e 100644 --- a/tests/api_resources/test_file.py +++ b/tests/api_resources/test_file.py @@ -50,6 +50,26 @@ def test_is_creatable(self, setup_upload_api_base, request_mock): ) assert isinstance(resource, stripe.File) + def test_create_respects_stripe_version(self, setup_upload_api_base, request_mock): + test_file = tempfile.TemporaryFile() + stripe.File.create( + purpose="dispute_evidence", + file=test_file, + stripe_version="foo" + ) + request_mock.assert_api_version("foo") + + # You can use api_version instead of stripe_version + # in File.create. We preserve it for backwards compatibility + def test_create_respects_api_version(self, setup_upload_api_base, request_mock): + test_file = tempfile.TemporaryFile() + stripe.File.create( + purpose="dispute_evidence", + file=test_file, + api_version="foo" + ) + request_mock.assert_api_version("foo") + def test_deserializes_from_file(self): obj = stripe.util.convert_to_stripe_object({"object": "file"}) assert isinstance(obj, stripe.File) From 9da59218e5b72bff47a88d2667d87a4bb23a912e Mon Sep 17 00:00:00 2001 From: Richard Marmorstein Date: Mon, 13 Jul 2020 12:14:37 -0400 Subject: [PATCH 3/4] Bump stripe-mock --- .travis.yml | 2 +- tests/conftest.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 59d11d58d..e66959aaa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ cache: env: global: # If changing this number, please also change it in `tests/conftest.py`. - - STRIPE_MOCK_VERSION=0.90.0 + - STRIPE_MOCK_VERSION=0.93.0 before_install: # Unpack and start stripe-mock so that the test suite can talk to it diff --git a/tests/conftest.py b/tests/conftest.py index 2f724f67d..814a7148b 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -16,7 +16,7 @@ # When changing this number, don't forget to change it in `.travis.yml` too. -MOCK_MINIMUM_VERSION = "0.90.0" +MOCK_MINIMUM_VERSION = "0.93.0" # Starts stripe-mock if an OpenAPI spec override is found in `openapi/`, and # otherwise fall back to `STRIPE_MOCK_PORT` or 12111. From 1b4d81cfad96b25f9fb231f5626a1b37ad20c70d Mon Sep 17 00:00:00 2001 From: Richard Marmorstein Date: Mon, 13 Jul 2020 12:18:12 -0400 Subject: [PATCH 4/4] fmt --- tests/api_resources/test_file.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/api_resources/test_file.py b/tests/api_resources/test_file.py index a214b5c0e..c9d237b46 100644 --- a/tests/api_resources/test_file.py +++ b/tests/api_resources/test_file.py @@ -50,23 +50,23 @@ def test_is_creatable(self, setup_upload_api_base, request_mock): ) assert isinstance(resource, stripe.File) - def test_create_respects_stripe_version(self, setup_upload_api_base, request_mock): + def test_create_respects_stripe_version( + self, setup_upload_api_base, request_mock + ): test_file = tempfile.TemporaryFile() stripe.File.create( - purpose="dispute_evidence", - file=test_file, - stripe_version="foo" + purpose="dispute_evidence", file=test_file, stripe_version="foo" ) request_mock.assert_api_version("foo") # You can use api_version instead of stripe_version # in File.create. We preserve it for backwards compatibility - def test_create_respects_api_version(self, setup_upload_api_base, request_mock): + def test_create_respects_api_version( + self, setup_upload_api_base, request_mock + ): test_file = tempfile.TemporaryFile() stripe.File.create( - purpose="dispute_evidence", - file=test_file, - api_version="foo" + purpose="dispute_evidence", file=test_file, api_version="foo" ) request_mock.assert_api_version("foo")