Merge pull request #57 from fossology/release/1.2.1

Release/1.2.1

Author: deveaud-m

.github/workflows/staticchecks.yml

@@ -33,3 +33,5 @@ jobs:
         run: poetry run black . --check
       - name: Lint with flake8
         run: poetry run flake8 .
+      - name: Sort imports with isort
+        run: poetry run isort .

docs-source/conf.py

@@ -9,21 +9,20 @@
 import os
 import sys
 
-sys.path.append("../")
-sys.path.append(os.path.dirname(__file__))
-
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.insert(0, os.path.abspath("../.."))
+current_dir = os.path.dirname(__file__)
+target_dir = os.path.abspath(os.path.join(current_dir, "../"))
+sys.path.insert(0, target_dir)
 
 # -- Project information -----------------------------------------------------
 
 project = "fossology"
 copyright = "2021, Siemens AG"
 
 # The full version, including major/minor/patch tags
-release = "1.2.0"
+release = "1.2.1"
 
 
 # -- General configuration ---------------------------------------------------

docs-source/index.rst

@@ -10,6 +10,7 @@ Welcome to fossology's documentation!
    fossology
    folders
    groups
+   license
    uploads
    jobs
    report

fossology/__init__.py

@@ -1,33 +1,34 @@
 # Copyright 2019-2021 Siemens AG
 # SPDX-License-Identifier: MIT
 
-import re
 import logging
-import requests
+import re
 from datetime import date, timedelta
-
 from typing import Dict, List
+
+import requests
+
+from fossology.exceptions import (
+    AuthenticationError,
+    AuthorizationError,
+    FossologyApiError,
+    FossologyUnsupported,
+)
+from fossology.folders import Folders
+from fossology.groups import Groups
+from fossology.jobs import Jobs
+from fossology.license import LicenseEndpoint
 from fossology.obj import (
     Agents,
-    Upload,
-    User,
     File,
-    TokenScope,
     SearchTypes,
+    TokenScope,
+    Upload,
+    User,
     get_options,
 )
-from fossology.folders import Folders
-from fossology.groups import Groups
-from fossology.license import LicenseEndpoint
-from fossology.uploads import Uploads
-from fossology.jobs import Jobs
 from fossology.report import Report
-from fossology.exceptions import (
-    AuthenticationError,
-    AuthorizationError,
-    FossologyApiError,
-    FossologyUnsupported,
-)
+from fossology.uploads import Uploads
 
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.DEBUG)

fossology/folders.py

@@ -3,8 +3,8 @@
 
 import logging
 
-from fossology.obj import Folder, get_options
 from fossology.exceptions import AuthorizationError, FossologyApiError
+from fossology.obj import Folder, get_options
 
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.DEBUG)

fossology/groups.py

@@ -2,11 +2,11 @@
 # SPDX-License-Identifier: MIT
 
 import logging
-import fossology
 from typing import List
 
-from fossology.obj import Group
+import fossology
 from fossology.exceptions import FossologyApiError, FossologyUnsupported
+from fossology.obj import Group
 
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.DEBUG)

fossology/jobs.py

@@ -2,11 +2,11 @@
 # SPDX-License-Identifier: MIT
 
 import json
-import time
 import logging
+import time
 
-from fossology.obj import Job, get_options
 from fossology.exceptions import AuthorizationError, FossologyApiError
+from fossology.obj import Job, get_options
 
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.DEBUG)

fossology/license.py

@@ -2,10 +2,10 @@
 # SPDX-License-Identifier: MIT
 
 import logging
-import fossology
 
-from fossology.obj import License
+import fossology
 from fossology.exceptions import FossologyApiError, FossologyUnsupported
+from fossology.obj import License
 
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.DEBUG)

fossology/report.py

@@ -1,13 +1,14 @@
 # Copyright 2019-2021 Siemens AG
 # SPDX-License-Identifier: MIT
 
+import logging
 import re
 import time
-import logging
 from typing import Tuple
 
-from tenacity import retry, TryAgain, stop_after_attempt, retry_if_exception_type
-from fossology.exceptions import FossologyApiError, AuthorizationError
+from tenacity import TryAgain, retry, retry_if_exception_type, stop_after_attempt
+
+from fossology.exceptions import AuthorizationError, FossologyApiError
 from fossology.obj import ReportFormat, Upload, get_options
 
 logger = logging.getLogger(__name__)

fossology/uploads.py

@@ -2,12 +2,13 @@
 # SPDX-License-Identifier: MIT
 
 import json
-import time
 import logging
+import time
+
+from tenacity import TryAgain, retry, retry_if_exception_type, stop_after_attempt
 
-from tenacity import retry, retry_if_exception_type, stop_after_attempt, TryAgain
-from fossology.obj import Upload, Summary, Licenses, get_options
 from fossology.exceptions import AuthorizationError, FossologyApiError
+from fossology.obj import Licenses, Summary, Upload, get_options
 
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.DEBUG)