Skip to content

Commit

Permalink
get version string from installed package
Browse files Browse the repository at this point in the history
fallback to version control tag if used from source
  • Loading branch information
fricklerhandwerk committed Jul 3, 2017
1 parent c38b54f commit c80febb
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 32 deletions.
2 changes: 1 addition & 1 deletion figo/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
from .figo import *
from figo import *
61 changes: 30 additions & 31 deletions figo/figo.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,38 @@
# -*- coding:utf-8 -*-

from __future__ import unicode_literals
from __future__ import absolute_import

import base64
import json
import logging
import os
import re
import sys
from datetime import datetime, timedelta
from time import sleep

import requests
from datetime import datetime
from datetime import timedelta
from requests.exceptions import SSLError
from requests import Session
from requests_toolbelt.adapters.fingerprint import FingerprintAdapter
from time import sleep

from models import Account
from models import AccountBalance
from models import BankContact
from models import LoginSettings
from models import Notification
from models import Payment
from models import PaymentProposal
from models import ProcessToken
from models import Security
from models import Service
from models import TaskState
from models import TaskToken
from models import Transaction
from models import User
from models import WebhookNotification
from version import __version__

from .models import Account
from .models import AccountBalance
from .models import BankContact
from .models import LoginSettings
from .models import Notification
from .models import Payment
from .models import PaymentProposal
from .models import ProcessToken
from .models import Security
from .models import Service
from .models import TaskState
from .models import TaskToken
from .models import Transaction
from .models import User
from .models import WebhookNotification

if sys.version_info[0] > 2:
import urllib.parse as urllib
Expand Down Expand Up @@ -73,7 +76,11 @@ def __init__(self, api_endpoint=API_ENDPOINT, fingerprints=VALID_FINGERPRINTS):
- `api_endpoint` - base URI of the server to call
- `fingerprints` - list of the server's SSL fingerprints
"""
self.headers = {}
self.headers = {
'Accept': 'application/json',
'Content-Type': 'application/json',
'User-Agent': "python_figo/{0}".format(__version__),
}
self.api_endpoint = api_endpoint
self.fingerprints = fingerprints

Expand All @@ -90,7 +97,7 @@ def _request_api(self, path, data=None, method="GET"):

complete_path = self.api_endpoint + path

session = requests.Session()
session = Session()
session.headers.update(self.headers)

for fingerprint in self.fingerprints:
Expand Down Expand Up @@ -223,11 +230,7 @@ def __init__(self, client_id, client_secret, redirect_uri,
self.redirect_uri = redirect_uri
basic_auth = "{0}:{1}".format(self.client_id, self.client_secret).encode("ascii")
basic_auth_encoded = base64.b64encode(basic_auth).decode("utf-8")
self.headers = {
'Authorization': "Basic {0}".format(basic_auth_encoded),
'Accept': 'application/json',
'Content-Type': 'application/json',
'User-Agent': USER_AGENT}
self.headers = {'Authorization': "Basic {0}".format(basic_auth_encoded)}

def _query_api(self, path, data=None):
"""
Expand Down Expand Up @@ -440,11 +443,7 @@ def __init__(self, access_token, sync_poll_retry=20,
super(FigoSession, self).__init__(api_endpoint=api_endpoint, fingerprints=fingerprints)

self.access_token = access_token
self.headers = {
'Authorization': "Bearer %s" % self.access_token,
'Accept': 'application/json',
'Content-Type': 'application/json',
'User-Agent': USER_AGENT}
self.headers = {'Authorization': "Bearer {0}".format(self.access_token)}
self.sync_poll_retry = sync_poll_retry

@property
Expand Down
8 changes: 8 additions & 0 deletions figo/version.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
from pkg_resources import DistributionNotFound
from pkg_resources import get_distribution
from setuptools_scm import get_version

try:
__version__ = get_distribution('python_figo').version
except DistributionNotFound:
__version__ = get_version()
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
python-dateutil
requests
requests_toolbelt
setuptools_scm

0 comments on commit c80febb

Please sign in to comment.