Skip to content

Commit

Permalink
Merge branch 'main' into ganesh12/mdo3_enhance
Browse files Browse the repository at this point in the history
  • Loading branch information
v12ganesh authored Nov 20, 2024
2 parents f94f6aa + a2b83d6 commit 3785be9
Show file tree
Hide file tree
Showing 16 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check-api-for-breaking-changes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ on:
branches: [main]
jobs:
check-api-for-breaking-changes:
uses: tektronix/python-package-ci-cd/.github/workflows/[email protected].1
uses: tektronix/python-package-ci-cd/.github/workflows/[email protected].2
with:
package-name: tm_devices
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
- cron: 17 16 * * 4
jobs:
analyze:
uses: tektronix/python-package-ci-cd/.github/workflows/[email protected].1
uses: tektronix/python-package-ci-cd/.github/workflows/[email protected].2
with:
languages-array: '["python", "javascript"]'
codeql-queries: security-extended,security-and-quality
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/enforce-community-standards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ on:
branches: [main]
jobs:
enforce-community-standards:
uses: tektronix/python-package-ci-cd/.github/workflows/[email protected].1
uses: tektronix/python-package-ci-cd/.github/workflows/[email protected].2
2 changes: 1 addition & 1 deletion .github/workflows/package-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ concurrency:
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
jobs:
package-build:
uses: tektronix/python-package-ci-cd/.github/workflows/[email protected].1
uses: tektronix/python-package-ci-cd/.github/workflows/[email protected].2
with:
package-name: tm_devices
python-versions-array: '["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]' # when updating this, make sure to update all workflows that use this strategy
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/package-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ concurrency:
group: pypi
jobs:
package-release:
uses: tektronix/python-package-ci-cd/.github/workflows/[email protected].1
uses: tektronix/python-package-ci-cd/.github/workflows/[email protected].2
with:
package-name: tm_devices
repo-name: tektronix/tm_devices
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/package-testpypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ concurrency:
group: pypi
jobs:
package-testpypi:
uses: tektronix/python-package-ci-cd/.github/workflows/[email protected].1
uses: tektronix/python-package-ci-cd/.github/workflows/[email protected].2
with:
package-name: tm_devices
repo-name: tektronix/tm_devices
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-api-comparison.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
types: [completed]
jobs:
publish-api-comparison:
uses: tektronix/python-package-ci-cd/.github/workflows/[email protected].1
uses: tektronix/python-package-ci-cd/.github/workflows/[email protected].2
permissions:
checks: write
pull-requests: write
2 changes: 1 addition & 1 deletion .github/workflows/publish-test-results.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
types: [completed]
jobs:
publish-test-results:
uses: tektronix/python-package-ci-cd/.github/workflows/[email protected].1
uses: tektronix/python-package-ci-cd/.github/workflows/[email protected].2
with:
operating-systems-array: '["ubuntu", "windows", "macos"]'
permissions:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sbom-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
types: [published]
jobs:
sbom-scan:
uses: tektronix/python-package-ci-cd/.github/workflows/[email protected].1
uses: tektronix/python-package-ci-cd/.github/workflows/[email protected].2
permissions:
security-events: write
contents: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ concurrency:
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
jobs:
test-code:
uses: tektronix/python-package-ci-cd/.github/workflows/[email protected].1
uses: tektronix/python-package-ci-cd/.github/workflows/[email protected].2
with:
repo-name: tektronix/tm_devices
operating-systems-array: '["ubuntu", "windows", "macos"]'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ concurrency:
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
jobs:
test-docs:
uses: tektronix/python-package-ci-cd/.github/workflows/[email protected].1
uses: tektronix/python-package-ci-cd/.github/workflows/[email protected].2
with:
node-version: 20 # The node version needs to stay in sync with .readthedocs.yml
python-version: '3.11' # This needs to stay in sync with .readthedocs.yml and the tox config in pyproject.toml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ on:
jobs:
update-python-and-pre-commit-dependencies:
if: ${{ github.actor == 'dependabot[bot]' && contains(github.head_ref, '/pip/') }}
uses: tektronix/python-package-ci-cd/.github/workflows/[email protected].1
uses: tektronix/python-package-ci-cd/.github/workflows/[email protected].2
with:
commit-user-name: ${{ vars.TEK_OPENSOURCE_NAME }}
commit-user-email: ${{ vars.TEK_OPENSOURCE_EMAIL }}
dependency-dict: '{"tests": ["ruff"]}'
update-pre-commit: true
run-pre-commit: true
pre-commit-hook-skip-list: pylint,pyright,pyright-verifytypes,pyroma,poetry-audit
pre-commit-repo-update-skip-list: https://github.com/executablebooks/mdformat
pre-commit-repo-update-skip-list: https://github.com/executablebooks/mdformat,https://github.com/pappasam/toml-sort
export-dependency-groups: docs,tests
permissions:
contents: write
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ repos:
- id: actionlint
additional_dependencies: [pyflakes, shellcheck-py]
- repo: https://github.com/commitizen-tools/commitizen
rev: 665aa59a2794b47de0cae6fe51886d6366268194 # frozen: v3.30.1
rev: d3f092d98dc7585ce9cb3295bafb942ca5be1886 # frozen: v3.31.0
hooks:
- id: commitizen
stages: [commit-msg]
Expand Down Expand Up @@ -133,7 +133,7 @@ repos:
always_run: true
args: [audit, --json, --ignore-code=CVE-2019-8341]
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: 6a19e69c83fd6e3a3ffdd5e32a40e35c37b02218 # frozen: v0.7.3
rev: cafecb2f683a620516412e109877570ca7648cbd # frozen: v0.7.4
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
Expand Down
2 changes: 1 addition & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ soupsieve==2.6 ; python_version >= "3.8" and python_version < "4.0"
super-collections==0.5.3 ; python_version >= "3.8" and python_version < "4.0"
symspellpy==6.7.8 ; python_version >= "3.8" and python_version < "4.0"
termcolor==2.4.0 ; python_version >= "3.8" and python_version < "4.0"
tomli==2.0.2 ; python_version >= "3.8" and python_version < "4.0"
tomli==2.1.0 ; python_version >= "3.8" and python_version < "4.0"
typeguard==4.4.0 ; python_version >= "3.8" and python_version < "4.0"
typing-extensions==4.12.2 ; python_version >= "3.8" and python_version < "4.0"
urllib3==2.2.3 ; python_version >= "3.8" and python_version < "4.0"
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ pytest-env = "^1.1.3"
pytest-github-report = "^0.0.1"
pytest-html = "^4.1.1"
pytest-order = "^1.2.1"
ruff = "0.7.3"
ruff = "0.7.4"

[tool.poetry.scripts]
list-visa-resources = "tm_devices:print_available_visa_devices"
Expand Down
4 changes: 2 additions & 2 deletions tests/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ pytest-order==1.3.0 ; python_version >= "3.8" and python_version < "4.0"
python-dateutil==2.9.0.post0 ; python_version >= "3.8" and python_version < "4.0"
pytz==2024.2 ; python_version >= "3.8" and python_version < "4.0"
requests==2.32.3 ; python_version >= "3.8" and python_version < "4.0"
ruff==0.7.3 ; python_version >= "3.8" and python_version < "4.0"
ruff==0.7.4 ; python_version >= "3.8" and python_version < "4.0"
setuptools==75.3.0 ; python_version >= "3.8" and python_version < "4.0"
six==1.16.0 ; python_version >= "3.8" and python_version < "4.0"
soupsieve==2.6 ; python_version >= "3.8" and python_version < "4.0"
tabledata==1.3.3 ; python_version >= "3.8" and python_version < "4.0"
tcolorpy==0.1.6 ; python_version >= "3.8" and python_version < "4.0"
tomli==2.0.2 ; python_version >= "3.8" and python_full_version <= "3.11.0a6"
tomli==2.1.0 ; python_version >= "3.8" and python_full_version <= "3.11.0a6"
typepy==1.3.2 ; python_version >= "3.8" and python_version < "4.0"
typepy[datetime]==1.3.2 ; python_version >= "3.8" and python_version < "4.0"
urllib3==2.2.3 ; python_version >= "3.8" and python_version < "4.0"
Expand Down

0 comments on commit 3785be9

Please sign in to comment.