Skip to content

Commit

Permalink
Merge branch 'dev' into pipeline_int_tests
Browse files Browse the repository at this point in the history
  • Loading branch information
vilit1 authored Oct 7, 2024
2 parents 640da49 + fc9bfd0 commit c4cbb71
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/azdev_linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- uses: actions/setup-python@v5
name: Setup python
with:
python-version: "3.11"
python-version: "3.12"

# Lint
- name: azdev linter
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
- name: Setup python
uses: actions/setup-python@v5
with:
python-version: "3.9"
python-version: "3.12"
- name: Build Wheel
run: |
pip install wheel
pip install -r dev_requirements.txt
python -m setup bdist_wheel -d dist
- name: Upload Wheel Artifact
uses: actions/upload-artifact@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/int_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ jobs:
- name: "Setup python"
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.12"
- name: "Create k3s cluster"
run: |
# vars
Expand Down Expand Up @@ -164,8 +164,8 @@ jobs:
path: ${{ env.EXTENSION_SOURCE_DIRECTORY }}
- name: "Build and install local IoT Ops extension from source"
run: |
pip install wheel==0.30.0
cd ${{ env.EXTENSION_SOURCE_DIRECTORY }}
pip install -r dev_requirements.txt
python -m setup bdist_wheel -d dist
wheel=$(find ./dist/*.whl)
az extension add --source $wheel -y
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ jobs:
- name: Setup python
uses: actions/setup-python@v5
with:
python-version: "3.9"
python-version: "3.12"

- uses: actions/checkout@v4

- name: Build Wheel
run: |
pip install wheel==0.30.0
pip install -r dev_requirements.txt
python -m setup bdist_wheel -d dist
- name: Determine Wheel Version
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stage_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Setup python
uses: actions/setup-python@v5
with:
python-version: "3.9"
python-version: "3.12"
- name: Install and determine version
run: |
wheel=$(find ./release/*.whl)
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/tox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
- windows-2022
- macos-13
py:
- "3.12"
- "3.11"
- "3.10"
- "3.9"
Expand Down
2 changes: 1 addition & 1 deletion azext_edge/edge/util/version_check.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def check_latest(cli_ctx, force_refresh: Optional[bool] = False, throw_if_upgrad
only_show_errors = getattr(cli_ctx, "only_show_errors", False)
if not only_show_errors:
console.print(
f":dim_button: [italic]{update_text.format('[yellow]','[/yellow]','[green]', '[/green]')}",
f":dim_button: [italic]{update_text.format('[yellow]', '[/yellow]', '[green]', '[/green]')}",
)


Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
]

short_description = "The Azure IoT Operations extension for Azure CLI."
Expand Down
8 changes: 5 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ description =
py39: Python 3.9
py310: Python 3.10
py311: Python 3.11
py312: Python 3.12

# tox-gh matrix (github action -> tox python environment)
[gh]
Expand All @@ -33,6 +34,7 @@ python =
3.9 = py39
3.10 = py310
3.11 = py311
3.12 = py312

# lint - flake8 and pylint
[testenv:lint]
Expand All @@ -44,7 +46,7 @@ commands =
flake8 azext_edge/ --statistics --config=setup.cfg
pylint azext_edge/ --rcfile=.pylintrc

[testenv:py{thon,38,39,310,311}]
[testenv:py{thon,38,39,310,311,312}]
skip_install = True
description =
{[base]description}
Expand All @@ -66,7 +68,7 @@ commands =
# You can pass additional positional args to pytest using `tox -e [env] -- -s -vv`

# init integration tests
[testenv:py{thon,38,39,310,311}-init-int]
[testenv:py{thon,38,39,310,311,312}-init-int]
skip_install = True
description =
{[base]description}
Expand Down Expand Up @@ -94,7 +96,7 @@ commands =
# You can pass additional positional args to pytest using `tox -e [env] -- -s -vv`

# integration tests
[testenv:py{thon,38,39,310,311}-int]
[testenv:py{thon,38,39,310,311,312}-int]
skip_install = True
description =
{[base]description}
Expand Down

0 comments on commit c4cbb71

Please sign in to comment.