Merge pull request #2 from ARMmbed/fix-clone

Fix for clones of private repositories

Author: acabarbaye

Pipfile

@@ -16,8 +16,11 @@ pytest = "*"
 pyfakefs = "*"
 pytest-cov = "*"
 wheel = "*"
-continuous-delivery-scripts = {editable = true, path = "."}
+continuous-delivery-scripts = {path = "."}
 pre-commit = "*"
 
 [pipenv]
 allow_prereleases = true
+
+[packages]
+continuous-delivery-scripts = {path = "."}

continuous_delivery_scripts/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020 Arm. All rights reserved.
+# Copyright (C) 2020-2021 Arm. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 """Scripts and utilities used by the CI pipeline."""

continuous_delivery_scripts/_version.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020 Arm. All rights reserved.
+# Copyright (C) 2020-2021 Arm. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 """The version number is based on semantic versioning.

continuous_delivery_scripts/assert_news.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020 Arm. All rights reserved.
+# Copyright (C) 2020-2021 Arm. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 """Checks if valid news files are created for changes in the project."""

continuous_delivery_scripts/create_news_file.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020 Arm. All rights reserved.
+# Copyright (C) 2020-2021 Arm. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 """Easy news files generation.

continuous_delivery_scripts/generate_docs.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020 Arm. All rights reserved.
+# Copyright (C) 2020-2021 Arm. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 """Generates documentation."""

continuous_delivery_scripts/generate_news.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020 Arm. All rights reserved.
+# Copyright (C) 2020-2021 Arm. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 """Handles usage of towncrier for automated changelog generation and pyautoversion for versioning."""
@@ -57,7 +57,7 @@ def _calculate_version(commit_type: CommitType, use_news_files: bool) -> Tuple[b
     new_version: Optional[str] = None
     is_new_version: bool = False
     with cd(os.path.dirname(project_config_path)):
-        old, _, updates = auto_version_tool.main(
+        old, new_version, updates = auto_version_tool.main(
             release=is_release,
             enable_file_triggers=enable_file_triggers,
             commit_count_as=bump,
@@ -66,7 +66,9 @@ def _calculate_version(commit_type: CommitType, use_news_files: bool) -> Tuple[b
         # Autoversion second returned value is not actually the new version
         # There seem to be a bug in autoversion.
         # This is why the following needs to be done to determine the version
-        new_version = updates["__version__"]
+        for k, v in updates.items():
+            if "version" in str(k).lower():
+                new_version = updates[k]
         is_new_version = old != new_version
     logger.info(":: Determining the new version")
     logger.info(f"Version: {new_version}")

continuous_delivery_scripts/get_config.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020 Arm. All rights reserved.
+# Copyright (C) 2020-2021 Arm. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 """Retrieves configuration values."""

continuous_delivery_scripts/language_specifics.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020 Arm. All rights reserved.
+# Copyright (C) 2020-2021 Arm. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 """Language plugins Loader."""

continuous_delivery_scripts/license_files.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020 Arm. All rights reserved.
+# Copyright (C) 2020-2021 Arm. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 """Apply copyright and licensing to all source files present in a project.