bugfix/setup travis

* docs in package

* noqa for init

* complete MANIFEST

* fix test: call cannot be imported directly with pytest

* enable report cov report generation

* bump version

* bump version

* add coveragerc to pkg

* parse date with tz

* fix tests: expiration now handles tz

Author: kwarunek

.coveragerc

@@ -0,0 +1,13 @@
+[paths]
+source = src
+
+[run]
+branch = true
+source =
+    src
+    tests
+parallel = true
+
+[report]
+show_missing = true
+precision = 2

.travis.yml

@@ -1,16 +1,12 @@
 language: python
 sudo: false
 cache: pip
-env:
-  matrix:
-    - TOXENV=check
-    - TOXENV=docs
 matrix:
   include:
-    - python: '3.6'
+    - python: '3.5'
       env:
         - TOXENV=python3-cover,report
-    - python: '3.7'
+    - python: '3.6'
       env:
         - TOXENV=python3-cover,report
 before_install:

CHANGELOG.rst

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+0.2.1 (2018-03-28)
+------------------
+
+* fix tests, cov report,  MANIFEST.in
+
+
 0.1.1 (2018-03-02)
 ------------------
 

MANIFEST.in

@@ -4,14 +4,15 @@ graft tests
 include Pipfile
 include Pipfile.lock
 
-include CHANGELOG.md
-include README.md
+include .coveragerc
+
+include CHANGELOG.rst
+include README.rst
 include LICENSE
 include requirements.txt
 include test-requirements.txt
 
-include tox.ini
-include setup.cfg
+include tox.ini .travis.yml
 
 global-exclude *.py[cod] __pycache__ *.so *.dylib
-
+exclude .pytest_cache

requirements.txt

@@ -1,3 +1,4 @@
 aiohttp==3.0.0
 simplejson==3.13.2
 simple-rest-client==0.5.0
+python-dateutil==2.7.2

setup.py

@@ -1,7 +1,7 @@
 import io
 import re
-from setuptools import setup, find_packages
 from os.path import join, dirname, abspath
+from setuptools import setup, find_packages
 
 
 def read(name):
@@ -13,7 +13,7 @@ def read(name):
 
 setup(
     name="AsyncOpenStackClient",
-    version="0.2.0",
+    version="0.2.1",
     author='Dreamlab - PaaS KRK',
     author_email='[email protected]',
     url='https://github.com/DreamLab/AsyncOpenStackClient',

src/asyncopenstackclient/__init__.py

@@ -1,6 +1,6 @@
-from .client import Client
-from .nova import NovaClient
-from .glance import GlanceClient
-from .auth import AuthPassword
+from .auth import AuthPassword  # noqa
+from .client import Client  # noqa
+from .glance import GlanceClient  # noqa
+from .nova import NovaClient  # noqa
 
 __all__ = ['NovaClient', 'GlanceClient', 'AuthPassword']

src/asyncopenstackclient/auth.py

@@ -1,5 +1,6 @@
-from time import time, strptime, mktime
 import aiohttp
+from dateutil import parser
+from time import time
 
 
 class AuthModel:
@@ -51,7 +52,7 @@ async def get_token(self):
                 result = await response.json()
                 return (
                     response.headers['X-Subject-Token'],
-                    mktime(strptime(result['token']['expires_at'], "%Y-%m-%dT%H:%M:%S.000000Z")),
+                    parser.parse(result['token']['expires_at']).timestamp(),
                     result['token']['catalog']
                 )
 

tests/test_auth.py

@@ -1,7 +1,7 @@
-from unittest.mock import patch
-from aiounittest import AsyncTestCase, futurized
 from aioresponses import aioresponses
+from aiounittest import AsyncTestCase, futurized
 from asyncopenstackclient import AuthPassword
+from unittest.mock import patch
 
 
 class TestAuth(AsyncTestCase):
@@ -40,7 +40,7 @@ async def test_get_token(self):
 
             res = await self.auth.get_token()
 
-            self.assertEqual(res, (headers["X-Subject-Token"], 0, body["token"]["catalog"]))
+            self.assertEqual(res, (headers["X-Subject-Token"], 3600, body["token"]["catalog"]))
 
     def test_get_endpoint_url_existing_endpoint(self):
         self.auth.endpoints = [

tests/test_client.py

@@ -1,6 +1,6 @@
-from unittest.mock import patch, Mock, call, ANY
 from aiounittest import AsyncTestCase, futurized
 from asyncopenstackclient import Client
+from unittest import mock
 
 
 class TestClient(AsyncTestCase):
@@ -9,7 +9,7 @@ def setUp(self):
         pass
 
     def tearDown(self):
-        patch.stopall()
+        mock.patch.stopall()
 
     def test_create_object(self):
         api_name = 'mock_api'
@@ -28,7 +28,7 @@ def test_create_object_bad_session(self):
             Client('mock_name', 'mock_version', session=None)
 
     async def test_get_credentials(self):
-        session = Mock()
+        session = mock.Mock()
         session.authenticate.return_value = futurized(None)
         session.get_endpoint_url.return_value = futurized("mock_url")
 
@@ -38,13 +38,13 @@ async def test_get_credentials(self):
         self.assertEqual(client.api_url, "mock_url")
 
     async def test_init_api(self):
-        session = Mock()
+        session = mock.Mock()
         session.authenticate.return_value = futurized(None)
         session.get_endpoint_url.return_value = futurized("mock_url")
         session.token = 'mock_token'
-        mock_api = Mock()
+        mock_api = mock.Mock()
 
-        patch('asyncopenstackclient.client.API', new_callable=mock_api).start()
+        mock.patch('asyncopenstackclient.client.API', new_callable=mock_api).start()
 
         client = Client("mock_name", ['mock', 'resource', 'list'], session=session)
         await client.init_api()
@@ -56,7 +56,7 @@ async def test_init_api(self):
         )
 
         mock_api()().add_resource.assert_has_calls([
-            call(resource_name='mock', resource_class=ANY),
-            call(resource_name='resource', resource_class=ANY),
-            call(resource_name='list', resource_class=ANY),
+            mock.call(resource_name='mock', resource_class=mock.ANY),
+            mock.call(resource_name='resource', resource_class=mock.ANY),
+            mock.call(resource_name='list', resource_class=mock.ANY),
         ])