Skip to content

Commit

Permalink
Merge pull request #51 from Adyen/develop
Browse files Browse the repository at this point in the history
New release 1.3.0
  • Loading branch information
rikterbeek authored Nov 16, 2018
2 parents 993d1b8 + 1dcbde4 commit 28eb420
Show file tree
Hide file tree
Showing 30 changed files with 1,115 additions and 538 deletions.
7 changes: 7 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
**Python version**: x.y.z
**Library version**: x.y.z
**Description**
<!--
- please provide description of the issue. In case of bug report, please provide the necessary steps to reproduce.
- For merchant specific requests, please use https://support.adyen.com
-->
7 changes: 7 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
**Description**
<!-- Please provide a description of the changes proposed in the Pull Request -->

**Tested scenarios**
<!-- Description of tested scenarios -->

**Fixed issue**: <!-- #-prefixed issue number -->
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
*.DS_Store
*.pypirc
releaseguide.md

venv/
.idea/
9 changes: 4 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@ python:
- "3.6"
cache: pip
install:
- pip install requests
- pip install pycurl
- pip install mock
- pip install coveralls
- pip install requests pycurl mock coveralls pylint pycodestyle
script:
- coverage run -m unittest discover -s test -p '*Test.py'
- pycodestyle -v
after_success:
coveralls
- coveralls
- pylint Adyen
14 changes: 5 additions & 9 deletions Adyen/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/python

from __future__ import absolute_import, division, print_function, unicode_literals
from __future__ import absolute_import, division, unicode_literals

from . import util
from .util import generate_hpp_sig
Expand All @@ -17,27 +17,23 @@
AdyenBase,
AdyenRecurring,
AdyenPayment,
AdyenThirdPartyPayout,
AdyenHPP)

from .httpclient import HTTPClient

import datetime

username = ""
password = ""
platform = ""
merchant_account = ""
merchant_specific_url = ""
hmac = ""

class Adyen(AdyenBase):
def __init__(self, **kwargs):
self.client = AdyenClient(**kwargs)
self.payment = AdyenPayment(client=self.client)
self.payout = AdyenThirdPartyPayout(client=self.client)
self.hpp = AdyenHPP(client=self.client)
self.recurring = AdyenRecurring(client=self.client)


_base_adyen_obj = Adyen()
recurring = _base_adyen_obj.recurring
hpp = _base_adyen_obj.hpp
payment = _base_adyen_obj.payment
payout = _base_adyen_obj.payout
Loading

0 comments on commit 28eb420

Please sign in to comment.