Skip to content

Commit 24e1485

Browse files
committed
Merge pull request #18 from cardforcoin/master
New endpoints, mocking utils, CircleCI, merchant / order support, and Python 3 compatibility
2 parents e168615 + 8edffd1 commit 24e1485

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+4222
-638
lines changed

.gitignore

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,11 @@ nosetests.xml
3434
.project
3535
.pydevproject
3636

37+
# Vim
38+
*.swp
39+
40+
# Other
41+
3742
/.idea/
38-
/coinbase_oauth2/secrets.py
43+
/coinbase_oauth2/secrets.py
44+
/MANIFEST

MANIFEST

Lines changed: 0 additions & 14 deletions
This file was deleted.

MANIFEST.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
README.md
2+
coinbase/ca_certs.txt

README.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,12 @@ Automatic installation using [pip](http://pypi.python.org/pypi):
2424

2525
```python
2626
from coinbase import CoinbaseAccount
27-
account = CoinbaseAccount(JSON_OAUTH2_TOKEN)
28-
transaction = account.send('[email protected]', 1.0)
29-
print transaction.status
27+
28+
print(CoinbaseAccount().exchange_rates['usd_to_btc'])
29+
30+
account = CoinbaseAccount(oauth2_credentials=JSON_OAUTH2_TOKEN)
31+
transaction = account.send('[email protected]', 1.0)
32+
print(transaction.status)
3033
```
3134

3235
## Examples / Quickstart
@@ -91,6 +94,7 @@ Contributions are greatly appreciated. Please make all requests using built in
9194
## Credits
9295

9396
- George Sibble <[email protected]>
97+
- Chris Martin <[email protected]>
9498

9599
## License
96100

circle.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
machine:
2+
python:
3+
version: 2.7.5
4+
dependencies:
5+
pre:
6+
- pyenv global 3.3.2
7+
override:
8+
- pip install tox
9+
test:
10+
override:
11+
- tox

0 commit comments

Comments
 (0)