diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bffa22d..37b238e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,10 +9,10 @@ on: jobs: pre-commit: - uses: coatl-dev/workflows/.github/workflows/pre-commit.yml@v2 + uses: coatl-dev/workflows/.github/workflows/pre-commit.yml@v3 with: skip-hooks: 'pylint' pylint: needs: pre-commit - uses: coatl-dev/workflows/.github/workflows/pylint.yml@v2 + uses: coatl-dev/workflows/.github/workflows/pylint.yml@v3 diff --git a/.github/workflows/pip-compile-upgrade.yml b/.github/workflows/pip-compile-upgrade.yml index ba26c38..1318231 100644 --- a/.github/workflows/pip-compile-upgrade.yml +++ b/.github/workflows/pip-compile-upgrade.yml @@ -7,9 +7,10 @@ on: jobs: pip-compile-upgrade: - uses: coatl-dev/workflows/.github/workflows/pip-compile-upgrade.yml@v2 + uses: coatl-dev/workflows/.github/workflows/pip-compile-upgrade.yml@v3 with: path: requirements.txt + python-version: '2.7' secrets: gh-token: ${{ secrets.COATL_BOT_GH_TOKEN }} gpg-sign-passphrase: ${{ secrets.COATL_BOT_GPG_PASSPHRASE }} diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index 735bc51..6f674f8 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -13,4 +13,6 @@ on: jobs: tox: - uses: coatl-dev/workflows/.github/workflows/tox-docker.yml@v2 + uses: coatl-dev/workflows/.github/workflows/tox-docker.yml@v3 + with: + python-version: '3.12' diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml index a9e30d7..af2381a 100644 --- a/.github/workflows/pre-commit-autoupdate.yml +++ b/.github/workflows/pre-commit-autoupdate.yml @@ -7,7 +7,7 @@ on: jobs: pre-commit-autoupdate: - uses: coatl-dev/workflows/.github/workflows/pre-commit-autoupdate.yml@v2 + uses: coatl-dev/workflows/.github/workflows/pre-commit-autoupdate.yml@v3 with: skip-repos: 'flake8' secrets: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 100dd2f..390586f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -7,26 +7,26 @@ on: jobs: pre-commit: - uses: coatl-dev/workflows/.github/workflows/pre-commit.yml@v2 + uses: coatl-dev/workflows/.github/workflows/pre-commit.yml@v3 with: skip-hooks: 'pylint' pylint: needs: pre-commit - uses: coatl-dev/workflows/.github/workflows/pylint.yml@v2 + uses: coatl-dev/workflows/.github/workflows/pylint.yml@v3 tox: needs: - pre-commit - pylint - uses: coatl-dev/workflows/.github/workflows/tox-docker.yml@v2 + uses: coatl-dev/workflows/.github/workflows/tox-docker.yml@v3 pypi-publish: needs: - pre-commit - pylint - tox - uses: coatl-dev/workflows/.github/workflows/pypi-upload.yml@v2 + uses: coatl-dev/workflows/.github/workflows/pypi-upload.yml@v3 with: python-version: '2.7' secrets: diff --git a/.pylintrc b/.pylintrc index 2fd6aae..3c77525 100644 --- a/.pylintrc +++ b/.pylintrc @@ -88,7 +88,7 @@ persistent=yes # Minimum Python version to use for version dependent checks. Will default to # the version used to run pylint. -py-version=3.11 +py-version=3.12 # Discover python modules and packages in the file system subtree. recursive=no @@ -428,7 +428,7 @@ disable=consider-using-f-string, unnecessary-pass, unused-argument, useless-object-inheritance, - useless-super-delegation, + useless-parent-delegation, wrong-import-order, # Enable the message, report, category or checker with the given id(s). You can diff --git a/src/com/inductiveautomation/ignition/common/script/__init__.py b/src/com/inductiveautomation/ignition/common/script/__init__.py index 3951c06..34d16fe 100644 --- a/src/com/inductiveautomation/ignition/common/script/__init__.py +++ b/src/com/inductiveautomation/ignition/common/script/__init__.py @@ -2,7 +2,6 @@ __all__ = ["ScriptFunction", "ScriptManager"] -from copy import PyStringMap from typing import Any, List, Mapping, Optional, Set from com.codahale.metrics import Timer @@ -11,7 +10,7 @@ from java.io import OutputStream from java.lang import Class, Object from java.util import UUID -from org.python.core import PyObject, PySystemState +from org.python.core import PyObject, PyStringMap, PySystemState class ScriptFunction(object): diff --git a/src/org/python/core/__init__.py b/src/org/python/core/__init__.py index d6d0690..5e106ca 100644 --- a/src/org/python/core/__init__.py +++ b/src/org/python/core/__init__.py @@ -1,6 +1,6 @@ from __future__ import print_function -from copy import PyStringMap +from copy import PyStringMap # pylint: disable=no-name-in-module __all__ = [ "CodeFlag", diff --git a/tox.ini b/tox.ini index 0d41e1a..bc27a41 100644 --- a/tox.ini +++ b/tox.ini @@ -62,7 +62,7 @@ allowlist_externals = base_python = python2.7 [py3] -base_python = python3.11 +base_python = python3.12 [type] base_python = {[py3]base_python}