Merge branch 'master' into contributors-update

Author: tsolakoua

.github/workflows/build.yml

@@ -6,11 +6,11 @@ on:
     branches: [ master ]
 jobs:
   build:
-    runs-on: Ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.4, 3.5, 3.6.8]
+        python-version: ['3.8', '3.9', '3.10']
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python ${{ matrix.python-version }}
@@ -20,12 +20,8 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install sphinx==1.7.2
-          pip install tox
-          python -m pip install sphinx_rtd_theme==0.2.4
-          pip install virtualenv==20.0.1
+          python -m pip install --ignore-installed sphinx==3.4.1 tox==3.20.0 sphinx_rtd_theme==0.5.2 "Jinja2<3.1"
       - name: Test with tox
-        if: ${{ matrix.python-version != '3.5' }}
         run: |
           tox -e py
       - name: Before deploy 
@@ -34,5 +30,5 @@ jobs:
           pip install --upgrade setuptools
           make docs
       - name: Build binary wheel and a source tarball
-        if: ${{ matrix.python-version == '3.6.8' }}
-        run: python setup.py sdist
+        if: ${{ matrix.python-version == '3.10' }}
+        run: python setup.py sdist

.github/workflows/publish.yml

@@ -6,11 +6,11 @@ on:
       - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
 jobs:
   build:
-    runs-on: Ubuntu-18.04
+    runs-on: Ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.6.8]
+        python-version: [3.10]
 
     steps:
       - uses: actions/checkout@v2
@@ -21,10 +21,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install sphinx==1.7.2
-          pip install tox
-          pip install sphinx_rtd_theme==0.2.4
-          pip install virtualenv==20.0.1
+          python -m pip install --ignore-installed sphinx==3.4.1 tox==3.20.0 sphinx_rtd_theme==0.5.2 "Jinja2<3.1"
       - name: Test with tox
         run: |
           tox -e py

README.rst

@@ -9,7 +9,7 @@ Amadeus provides a rich set of APIs for the travel industry. For more details, c
 Installation
 ------------
 
-This SDK requires Python 3.4+ (Python 2+ is no longer supported). You can install it directly with pip:
+This SDK requires Python 3.8+. You can install it directly with pip:
 
 .. code:: sh
 

amadeus/__init__.py

@@ -2,6 +2,7 @@
 from .version import version
 
 from .client.location import Location
+from .client.hotel import Hotel
 from .client.direction import Direction
 from .client.request import Request
 from .client.response import Response
@@ -13,5 +14,5 @@
     'Client', 'Location', 'Direction', 'version', 'ResponseError',
     'ParserError', 'ServerError', 'AuthenticationError',
     'NotFoundError', 'ClientError', 'Request', 'Response',
-    'NetworkError'
+    'NetworkError', 'Hotel'
 ]

amadeus/mixins/parser.py

@@ -15,8 +15,8 @@ def _detect_error(self, client):
         if error is not None:
             self.__raise_error(error, client)
 
-    @staticmethod  # noqa: C901
-    def error_for(status_code, parsed):
+    @staticmethod
+    def error_for(status_code, parsed):  # noqa: C901
         if status_code is None:
             return NetworkError
         if status_code >= 500:

requirements.txt

@@ -1,9 +1,7 @@
-mamba==0.9.3
-expects==0.8.0
-doublex==1.8.4
-doublex-expects==0.7.0rc2
-flake8==3.5.0
-flake8-quotes==0.14.0
-tox==2.9.1
-sphinx==1.7.2
-sphinx-rtd-theme==0.2.4
+flake8==3.8.0
+flake8-quotes==2.1.1
+tox==3.20.0
+sphinx==3.4.1
+sphinx-rtd-theme==0.5.2
+pytest==7.2.0
+pytest-cov==4.0.0

specs/client/access_token_spec.py

@@ -0,0 +1,53 @@
+import pytest
+import mock
+from amadeus import Client
+from amadeus.client.access_token import AccessToken
+
+
+class TokenResponse:
+    def __init__(self, result):
+        self.result = result
+
+
+@pytest.fixture
+def self():
+    self.request = mock.MagicMock(
+        return_value=TokenResponse({'access_token': 'abc', 'expires_in': 1799}))
+    self.client = mock.MagicMock(Client)
+    self.client._unauthenticated_request = self.request
+    self.client.client_id = '123'
+    self.client.client_secret = '234'
+    self.access_token = AccessToken(self.client)
+    return self
+
+
+def test_bearer_token(self):
+    token = self.access_token._bearer_token()
+    assert token == 'Bearer abc'
+    self.client._unauthenticated_request.assert_called_with(
+        'POST', '/v1/security/oauth2/token',
+        {
+            'grant_type': 'client_credentials',
+            'client_id': '123',
+            'client_secret': '234'
+        })
+
+
+def test_cached_token_valid(self):
+    access_token = self.access_token
+    token = access_token._bearer_token()
+    assert token == 'Bearer abc'
+    self.client._unauthenticated_request.assert_called_once()
+    token2 = access_token._bearer_token()
+    assert token2 == 'Bearer abc'
+    self.client._unauthenticated_request.assert_called_once()
+
+
+def test_cached_token_expired(self):
+    access_token = self.access_token
+    token = access_token._bearer_token()
+    assert token == 'Bearer abc'
+    access_token.expires_at = 0
+    token2 = access_token._bearer_token()
+    assert token2 == 'Bearer abc'
+    assert self.client._unauthenticated_request.call_count == 2