Skip to content

Commit f4dd344

Browse files
committed
Merge pull request #3 from payplug/customer-cards
V1.2
2 parents 296d898 + 4d08e85 commit f4dd344

25 files changed

+851
-160
lines changed

.python-version

100644100755
Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
3.5.0
2-
2.7.10
1+
3.5.1
2+
2.7.11
33
3.4.3
44
3.3.6
5-
3.2.6
6-
3.1.5
75
2.6.9
86
pypy3-2.4.0
9-
pypy-2.6.1
7+
pypy-4.0.1

.travis.yml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
language: python
2+
3+
python:
4+
- "2.6"
5+
- "2.7"
6+
- "3.3"
7+
- "3.4"
8+
- "3.5"
9+
- "pypy"
10+
- "pypy3"
11+
12+
env:
13+
- REQUESTS=1.0
14+
- REQUESTS=1.1
15+
- REQUESTS=1.2
16+
- REQUESTS=2.0
17+
- REQUESTS=2.1
18+
- REQUESTS=2.2
19+
- REQUESTS=2.3
20+
- REQUESTS=2.4
21+
- REQUESTS=2.5
22+
- REQUESTS=2.6
23+
- REQUESTS=2.7
24+
- REQUESTS=2.8
25+
- REQUESTS=2.9
26+
- REQUESTS=dev
27+
28+
cache: pip
29+
30+
matrix:
31+
fast_finish: true
32+
exclude:
33+
# No support for Python 3.4+ in requests 1.x
34+
- python: "3.4"
35+
env: REQUESTS=1.0
36+
- python: "3.4"
37+
env: REQUESTS=1.1
38+
- python: "3.4"
39+
env: REQUESTS=1.2
40+
- python: "3.5"
41+
env: REQUESTS=1.0
42+
- python: "3.5"
43+
env: REQUESTS=1.1
44+
- python: "3.5"
45+
env: REQUESTS=1.2
46+
47+
# No support for Python 3.2- in virtualenv 14+
48+
install:
49+
- travis_retry pip install "virtualenv<14.0.0" "tox>=1.9"
50+
51+
script:
52+
- tox -e py$(echo $(echo $TRAVIS_PYTHON_VERSION | sed -e 's/pypy/py/')-requests$REQUESTS | tr -d .) -- --cov=payplug

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
1.2.0
2+
-----
3+
4+
- **NEW**: Support for Customers and Cards. (see official documentation)
5+
- **NEW**: Add ability to abort payment objects.
6+
7+
```
8+
payment.abort()
9+
```
10+
11+
- **NEW**: This library is now under MIT Licence (Issue #4).
12+
- Minor fixes in tests.
13+
- Add this changelog.

LICENCE.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2016 Payplug
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

README.rst

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,25 @@
11
Python library for the PayPlug API
22
==================================
33

4+
.. image:: https://travis-ci.org/payplug/payplug-python.svg?branch=master
5+
:target: https://travis-ci.org/payplug/payplug-python
6+
:alt: CI Status
7+
8+
.. image:: https://img.shields.io/pypi/v/payplug.svg?maxAge=2592000
9+
:target: https://pypi.python.org/pypi/payplug/
10+
:alt: PyPi
11+
412
This is the documentation of PayPlug's Python library. It is designed to help developers to use PayPlug as
513
payment solution in a simple, yet robust way.
614

715
Prerequisites
816
-------------
917

1018
PayPlug's library relies on **python-requests>=1.0.1** to perform HTTP requests and requires **OpenSSL** to secure
11-
transactions. You also need either a **Python 2** newer than **Python 2.6** or a **Python 3** newer than **Python 3.1**.
19+
transactions. You also need either a **Python 2.6+** or a **Python 3.3+**. The library is known to work with these
20+
versions, pypy and pypy3. It may work on older versions or other Python implementations without warranty. If you use an
21+
implementation that is not listed above, do not hesitate to let us known if it worked for you or not, so that we can
22+
update this prerequisites.
1223
To ensure **Python 2** and **Python 3** compatibility, this library also depends on **six>=1.4.0**.
1324

1425
Installation

0 commit comments

Comments
 (0)