Merge pull request #73 from UpCloudLtd/feat/user-agent-header

User agent to header

Author: Trdls

.gitignore

@@ -11,6 +11,7 @@ dist/
 docs/html/
 .tox
 .cache
+.vscode/
 
 # pyenv
 .python-version

.travis.yml

@@ -15,7 +15,7 @@ matrix:
   allow_failures:
   - python: "nightly"
   include:
-    - python: "2.6"
+    - python: "2.7"
       dist: trusty
     - python: "3.4"
       dist: xenial

README.md

@@ -31,7 +31,7 @@ python setup.py install
 
 **Supported versions as of 0.3.3** (offline tests pass with tox):
 
-* python 2.6
+* <del>python 2.6</del> removed due to deprecation
 * python 2.7
 * <del>python 3.2</del> removed due to python2/3 support
 * <del>python 3.3</del> removed due to deprecation

circle.yml

@@ -7,8 +7,8 @@ machine:
 dependencies:
   override:
     - pip install tox tox-pyenv
-    - pyenv install 2.6.9
-    - pyenv local 2.6.9 2.7.11 3.3.6 3.4.4 3.5.1
+    - pyenv install 2.7.11
+    - pyenv local 2.7.11 3.3.6 3.4.4 3.5.1
 
 test:
   override:

setup.py

@@ -1,12 +1,29 @@
 #!/usr/bin/env python
 
 from setuptools import setup
+import codecs
+import os.path
+
+
+def read(rel_path):
+    here = os.path.abspath(os.path.dirname(__file__))
+    with codecs.open(os.path.join(here, rel_path), 'r') as fp:
+        return fp.read()
+
+
+def get_version(rel_path):
+    for line in read(rel_path).splitlines():
+        if line.startswith('__version__'):
+            delim = '"' if '"' in line else "'"
+            return line.split(delim)[1]
+    else:
+        raise RuntimeError("Unable to find version string.")
 
 
-version = '0.4.6'
 with open('README.md') as f:
     long_description = f.read()
 
+version = get_version('upcloud_api/__init__.py')
 setup(
     name='upcloud-api',
     version=version,
@@ -20,7 +37,7 @@
     packages=['upcloud_api', 'upcloud_api.cloud_manager'],
     download_url='https://github.com/UpCloudLtd/upcloud-python-api/archive/%s.tar.gz' % version,
     license='MIT',
-    python_requires='>=2.6,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*',
+    python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*',
     install_requires=[
         'requests>=2.6.0',
         'six>=1.9.0'

tox.ini

@@ -1,10 +1,10 @@
-# Tox (http://tox.testrun.org/) is a tool for running tests
+# Tox (https://tox.readthedocs.io/) is a tool for running tests
 # in multiple virtualenvs. This configuration file will run the
 # test suite on all supported python versions. To use it, "pip install tox"
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py26, py27, py34, py35, py36, py37, py38, pypy3
+envlist = py27, py34, py35, py36, py37, py38, pypy3
 skip_missing_interpreters = True
 
 [testenv]

upcloud_api/__init__.py

@@ -7,11 +7,14 @@
 from __future__ import unicode_literals
 from __future__ import absolute_import
 
-__version__ = '0.3.9'
+
+__version__ = '0.4.6'		
 __author__ = 'Elias Nygren'
-__author_email__ = 'elias.nygren@upcloud.com'
-__license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2015 Elias Nygren'
+__author_email__ = 'elias.nygren@upcloud.com'		
+__maintainer__ = 'UpCloud'
+__maintainer_email__ = 'hello@upcloud.com'
+__license__ = 'MIT'		
+__copyright__ = 'Copyright (c) 2015 UpCloud'
 
 from upcloud_api.upcloud_resource import UpCloudResource
 from upcloud_api.errors import UpCloudClientError, UpCloudAPIError

upcloud_api/cloud_manager/base.py

@@ -3,7 +3,7 @@
 import json
 import requests
 
-from upcloud_api import UpCloudAPIError
+from upcloud_api import UpCloudAPIError, __version__
 
 
 class BaseAPI(object):
@@ -29,7 +29,8 @@ def request(self, method, endpoint, body=None, timeout=-1, request_to_api=True):
 
         url = 'https://api.upcloud.com/' + self.api_v + endpoint if request_to_api else endpoint
         headers = {
-            'Authorization': self.token
+            'Authorization': self.token,
+            'User-Agent': 'upcloud-python-api/{}'.format(__version__)
         }
 
         headers['Content-Type'] = 'application/json' if request_to_api else 'application/octet-stream'