From 2fab5ab92ae7411d4d690f590234fdcadac84fdc Mon Sep 17 00:00:00 2001 From: Vikas <84580678+vikas0212git@users.noreply.github.com> Date: Thu, 24 Mar 2022 15:41:08 -0700 Subject: [PATCH] Updated simulator version at 0.14.14, upgraded version to 3.3.4 and resolved dependebot alerts. --- CHANGELOG.md | 3 +++ azure-pipelines.yml | 8 -------- iotedgedev/__init__.py | 2 +- requirements.txt | 2 +- requirements_dev.txt | 4 ++-- setup.cfg | 2 +- setup.py | 6 +++--- tests/__init__.py | 2 +- .../modules/sample_module/sample_module.csproj | 2 +- .../sample_module_2/sample_module_2.csproj | 2 +- 10 files changed, 14 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e316f728..5575ed00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ # Changelog All notable changes to this project since 0.82.0 will be documented in this file. +## [3.3.4] - 2022-03-24 +- Lock simulator version at 0.14.14 + ## [3.3.3] - 2022-03-15 - Add support for python 3.8, 3.9 - Lock simulator version at 0.14.12 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9313166a..88521f07 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -63,14 +63,6 @@ steps: targetType: 'inline' script: 'sed -i "/__AIkey__/c __AIkey__ = ''$(TEST_AIKEY)''" ./iotedgedev/__init__.py' -- task: AzureKeyVault@2 - displayName: 'Azure Key Vault: azure-iot-edgetools-kv' - inputs: - azureSubscription: 'Azure IoT DDE team subscription (377c3343-75bb-4244-98a3-0fb84a830c4b)-IoTEdgeDev' - KeyVaultName: 'azure-iot-edgetools-kv' - SecretsFilter: '*' - RunAsPreJob: true - - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 displayName: 'SBOM Generation Task' inputs: diff --git a/iotedgedev/__init__.py b/iotedgedev/__init__.py index 9608d92e..29d23b82 100644 --- a/iotedgedev/__init__.py +++ b/iotedgedev/__init__.py @@ -2,5 +2,5 @@ __author__ = 'Microsoft Corporation' __email__ = 'opencode@microsoft.com' -__version__ = '3.3.3' +__version__ = '3.3.4' __AIkey__ = '95b20d64-f54f-4de3-8ad5-165a75a6c6fe' diff --git a/requirements.txt b/requirements.txt index 2c39d293..4ce9fa96 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ python-dotenv==0.19.0 requests==2.25.1 fstrings==0.1.0 msrestazure==0.4.34 -iotedgehubdev==0.14.12 +iotedgehubdev==0.14.14 applicationinsights==0.11.9 commentjson==0.9.0 azure-cli-core==2.25.0 diff --git a/requirements_dev.txt b/requirements_dev.txt index c5e3491e..4b0964a6 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -8,9 +8,9 @@ pycodestyle==2.7.0 autopep8==1.5.7 tox==3.24.1 coverage==4.1 -Sphinx==1.4.8 +Sphinx==4.4.0 cookiecutter==1.7.3 -PyYAML==4.2b4 +PyYAML>=5.4 pylint==2.3.0 pytest==6.2.4 setuptools==57.0.0 diff --git a/setup.cfg b/setup.cfg index 276bcb7e..f44754c1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.3.3 +current_version = 3.3.4 commit = True tag = True diff --git a/setup.py b/setup.py index 42906284..40566c32 100644 --- a/setup.py +++ b/setup.py @@ -13,10 +13,10 @@ 'requests >= 2.20.0, <= 2.25.1', 'fstrings', 'azure-cli-core >= 2.25.0', - 'iotedgehubdev == 0.14.12', + 'iotedgehubdev == 0.14.14', 'applicationinsights == 0.11.9', 'commentjson == 0.9.0', - 'pyyaml>=4.1,<=4.2b4', + 'pyyaml>=5.4', 'pypiwin32==219; sys_platform == "win32" and python_version < "3.6"', 'pypiwin32==223; sys_platform == "win32" and python_version >= "3.6"', 'more-itertools < 8.1.0' @@ -31,7 +31,7 @@ setup( name='iotedgedev', - version='3.3.3', + version='3.3.4', description='The Azure IoT Edge Dev Tool greatly simplifies the IoT Edge development process by automating many routine manual tasks, such as building, deploying, pushing modules and configuring the IoT Edge Runtime.', long_description='See https://github.com/azure/iotedgedev for usage instructions.', author='Microsoft Corporation', diff --git a/tests/__init__.py b/tests/__init__.py index 625370a0..880b5e9d 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -2,4 +2,4 @@ __author__ = 'Microsoft Corporation' __email__ = 'opencode@microsoft.com' -__version__ = '3.3.3' +__version__ = '3.3.4' diff --git a/tests/assets/test_solution_shared_lib/modules/sample_module/sample_module.csproj b/tests/assets/test_solution_shared_lib/modules/sample_module/sample_module.csproj index c9f8d141..993925bb 100644 --- a/tests/assets/test_solution_shared_lib/modules/sample_module/sample_module.csproj +++ b/tests/assets/test_solution_shared_lib/modules/sample_module/sample_module.csproj @@ -10,7 +10,7 @@ - + diff --git a/tests/assets/test_solution_shared_lib/sample_module_2/sample_module_2.csproj b/tests/assets/test_solution_shared_lib/sample_module_2/sample_module_2.csproj index 24eee8d2..6adad315 100644 --- a/tests/assets/test_solution_shared_lib/sample_module_2/sample_module_2.csproj +++ b/tests/assets/test_solution_shared_lib/sample_module_2/sample_module_2.csproj @@ -10,7 +10,7 @@ - +