Skip to content

Merge from develop #38

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Oct 23, 2017
Merged

Merge from develop #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
67f4a8e
Merge pull request #33 from Adyen/master
Aleffio Jul 17, 2017
d00831a
Changed version endpoint to v25
Aleffio Aug 7, 2017
fd0fab4
Merge pull request #34 from Adyen/Version-Changes
Aleffio Aug 15, 2017
03af966
PW-307 Use different version for Payment and Recurring service. (#37)
Aleffio Oct 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions Adyen/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@

BASE_PAL_url = "https://pal-{}.adyen.com/pal/servlet"
BASE_HPP_url = "https://{}.adyen.com/hpp"
API_VERSION = "v18"
API_VERSION = "v30"
API_RECURRING_VERSION = "v25"
API_CLIENT_ATTR = ["username","password","review_payout_user",
"review_payout_password","confirm_payout_user","confirm_payout_password",
"platform","merchant_account","merchant_specific_url","hmac"]
Expand Down Expand Up @@ -90,7 +91,7 @@ def __init__(self, username=None, password=None, review_payout_username=None,
self.skin_code = skin_code
self.psp_list = []
self.app_name = app_name
self.LIB_VERSION = "1.1.0";
self.LIB_VERSION = "1.2.0";
self.USER_AGENT_SUFFIX = "adyen-python-api-library/";
self.http_init = False
self.http_force = http_force
Expand All @@ -105,7 +106,11 @@ def _determine_api_url(self, platform, service, action):
action (str): the API action to perform.
"""
base_uri = BASE_PAL_url.format(platform)
return '/'.join([base_uri, service, API_VERSION, action])
if service == "Recurring":
api_version = API_RECURRING_VERSION
else:
api_version = API_VERSION
return '/'.join([base_uri, service, api_version, action])

def _determine_hpp_url(self, platform, action):
"""This returns the Adyen HPP endpoint based on the provided platform,
Expand Down
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
setup(
name = 'Adyen',
packages = ['Adyen'],
version = '1.1.0',
version = '1.2.0',
maintainer = 'Adyen',
maintainer_email= 'support@adyen.com',
description = 'Adyen Python Api',
long_description = "A Python client library for accessing Adyen APIs",
author = 'Adyen',
author_email = 'support@adyen.com',
url = 'https://github.com/Adyen/adyen-python-api-library',
download_url = 'https://github.com/Adyen/adyen-python-api-library/archive/1.1.0.tar.gz',
download_url = 'https://github.com/Adyen/adyen-python-api-library/archive/1.2.0.tar.gz',
keywords = ['payments', 'adyen', 'fintech'],
classifiers = [
'Development Status :: 5 - Production/Stable',
Expand Down