From caff06ce1b20f4cfead946ea58e28dba12de54e5 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 21 May 2024 17:10:54 -0700 Subject: [PATCH 1/5] pin tox versions and update unit/int file specifiers --- .github/workflows/tox.yml | 4 ++-- dev_requirements | 2 +- tox.ini | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index 23c9d3c15..6603c0309 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -40,7 +40,7 @@ jobs: python-version: ${{ matrix.py }} - uses: actions/checkout@v4 - name: Install tox-gh - run: python -m pip install tox-gh + run: python -m pip install tox-gh tox==4.12.1 - name: Setup test suite run: tox r -vv --notest - name: Run test suite @@ -53,7 +53,7 @@ jobs: - uses: actions/checkout@v4 - name: Run code coverage run: | - python -m pip install tox + python -m pip install tox==4.12.1 tox -e coverage coverage=$(jq .totals.percent_covered coverage.json | cut -c1-4) echo "Code coverage: $coverage%" >> $GITHUB_STEP_SUMMARY diff --git a/dev_requirements b/dev_requirements index 845c1a7c2..ba09c721a 100644 --- a/dev_requirements +++ b/dev_requirements @@ -11,4 +11,4 @@ pylint<=2.13.8 flake8 pytest-xdist pytest-rerunfailures -tox +tox==4.12.1 diff --git a/tox.ini b/tox.ini index 4cc2e357d..34d799417 100644 --- a/tox.ini +++ b/tox.ini @@ -70,8 +70,8 @@ commands = az -v # run tests # You can pass additional positional args to pytest using `-- {args}` - unit: pytest -k _unit ./azext_iot/tests {posargs} - int: pytest -k _int ./azext_iot/tests {posargs} + unit: pytest -k _unit.py ./azext_iot/tests {posargs} + int: pytest -k _int.py ./azext_iot/tests {posargs} # tox-gh matrix (github action -> tox python environment) [gh] From 1f087d0c2a5af3e8716c40c0be756c11bb65228f Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 21 May 2024 17:25:17 -0700 Subject: [PATCH 2/5] pin pytest --- dev_requirements | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev_requirements b/dev_requirements index ba09c721a..f95ac203d 100644 --- a/dev_requirements +++ b/dev_requirements @@ -1,4 +1,4 @@ -pytest +pytest==8.1.1 pytest-mock==3.12.0 pytest-cov pytest-env From 757c4fa8362bc31396fe67553eedb7110817f2e6 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 21 May 2024 17:40:59 -0700 Subject: [PATCH 3/5] bump min cli version --- HISTORY.rst | 3 +++ README.md | 2 +- docs/tox-testing.md | 2 +- tox.ini | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 469e91549..e86b3b644 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -7,6 +7,9 @@ Release History 0.24.0 +++++++++++++++ +**General updates** + +* Updated the minimum core CLI version to 2.46.0 **IoT Product** diff --git a/README.md b/README.md index f44eaf2d2..fc5409cbe 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ Please refer to the official `az iot` reference on [Microsoft Docs](https://docs ## Installation 1. Install the [Azure CLI](https://docs.microsoft.com/en-us/cli/azure/install-azure-cli) - - You must have at least `v2.32.0` for the latest versions of `azure-iot`, which you can verify with `az --version` + - You must have at least `v2.46.0` for the latest versions of `azure-iot`, which you can verify with `az --version` 1. Add, Update or Remove the IoT extension with the following commands: - Add: `az extension add --name azure-iot` - Update: `az extension update --name azure-iot` diff --git a/docs/tox-testing.md b/docs/tox-testing.md index 17699a435..8c140d93d 100644 --- a/docs/tox-testing.md +++ b/docs/tox-testing.md @@ -10,7 +10,7 @@ Currently, our testing matrix is broken up into the following groups: - 3.10 - 3.11 - Azure CLI Core versions to test extension against: - - `azmin` installs the minimum supported CLI version (currently `2.32.0`) + - `azmin` installs the minimum supported CLI version (currently `2.46.0`) - `azcur` installs the latest released CLI version from PyPi - `azdev` installs the CLI from your local CLI instance (located at `../azure-cli`) - Types of tests to run: diff --git a/tox.ini b/tox.ini index 34d799417..7a7cabc8e 100644 --- a/tox.ini +++ b/tox.ini @@ -56,7 +56,7 @@ deps = # base deps {[base]deps} # azure-cli deps - azmin: azure-cli==2.32.0 + azmin: azure-cli==2.46.0 azcur: azure-cli azdev: ../azure-cli/src/azure-cli azdev: ../azure-cli/src/azure-cli-core From 66e2227d851572129e34142131295d97452584f6 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 21 May 2024 17:45:21 -0700 Subject: [PATCH 4/5] remove tox from dev_requirements, should not be installed inside tox env --- dev_requirements | 1 - 1 file changed, 1 deletion(-) diff --git a/dev_requirements b/dev_requirements index f95ac203d..2c822fdcd 100644 --- a/dev_requirements +++ b/dev_requirements @@ -11,4 +11,3 @@ pylint<=2.13.8 flake8 pytest-xdist pytest-rerunfailures -tox==4.12.1 From ffcf510b4dde00d9559a7d4f154edea19afd816a Mon Sep 17 00:00:00 2001 From: Victoria Litvinova Date: Wed, 22 May 2024 10:56:57 -0700 Subject: [PATCH 5/5] azext metadata json bump --- azext_iot/azext_metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azext_iot/azext_metadata.json b/azext_iot/azext_metadata.json index fb043f28f..950a93d6e 100644 --- a/azext_iot/azext_metadata.json +++ b/azext_iot/azext_metadata.json @@ -1,3 +1,3 @@ { - "azext.minCliCoreVersion": "2.37.0" + "azext.minCliCoreVersion": "2.46.0" }