Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ on:

jobs:
pre-commit:
uses: coatl-dev/workflows/.github/workflows/pre-commit.yml@92e51b14907b5aac1a8af1fcd9c2a1a5369dc47a # v7.0.32
uses: coatl-dev/workflows/.github/workflows/pre-commit.yml@d7cf5f9059f9a5fa365b8c9e06ff63f5d968ddb0 # v7.1.0
with:
checkout-ref: ${{ github.ref }}
skip-hooks: 'pylint'

pylint:
uses: coatl-dev/workflows/.github/workflows/pylint.yml@92e51b14907b5aac1a8af1fcd9c2a1a5369dc47a # v7.0.32
uses: coatl-dev/workflows/.github/workflows/pylint.yml@d7cf5f9059f9a5fa365b8c9e06ff63f5d968ddb0 # v7.1.0
with:
path: src
checkout-ref: ${{ github.ref }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ jobs:
ref: ${{ github.event.release.tag_name }}

- name: Upload package to PyPI
uses: coatl-dev/actions/pypi-upload@283f0790110a211f3255faeda31417d81823fd02 # v7.1.1
uses: coatl-dev/actions/pypi-upload@499c77f2bc6f909d372849058517ca2e39ce16d4 # v7.1.3
with:
password: ${{ secrets.PYPI_API_TOKEN_IGNITION_API_PKG }}

- name: Upload stubs to PyPI
uses: coatl-dev/actions/pypi-upload@283f0790110a211f3255faeda31417d81823fd02 # v7.1.1
uses: coatl-dev/actions/pypi-upload@499c77f2bc6f909d372849058517ca2e39ce16d4 # v7.1.3
with:
python-version: '3.12'
password: ${{ secrets.PYPI_API_TOKEN_IGNITION_API_STUBS }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ on:

jobs:
tox-package:
uses: coatl-dev/workflows/.github/workflows/tox-docker.yml@92e51b14907b5aac1a8af1fcd9c2a1a5369dc47a # v7.0.32
uses: coatl-dev/workflows/.github/workflows/tox-docker.yml@d7cf5f9059f9a5fa365b8c9e06ff63f5d968ddb0 # v7.1.0
with:
checkout-ref: ${{ inputs.checkout-ref }}

tox-stubs:
uses: coatl-dev/workflows/.github/workflows/tox.yml@92e51b14907b5aac1a8af1fcd9c2a1a5369dc47a # v7.0.32
uses: coatl-dev/workflows/.github/workflows/tox.yml@d7cf5f9059f9a5fa365b8c9e06ff63f5d968ddb0 # v7.1.0
with:
python-versions: |
3.9
Expand Down
13 changes: 7 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,22 @@ repos:
name: sort-all
files: ^src/
- repo: https://github.com/bwhmather/ssort
rev: 0.17.0
rev: 0.19.0
hooks:
- id: ssort
files: ^src/
- repo: https://github.com/psf/black-pre-commit-mirror
rev: 26.5.1
rev: 26.10.1
hooks:
- id: black
- repo: https://github.com/hakancelikdev/unimport
rev: 1.4.0
rev: 1.5.0
hooks:
- id: unimport
language_version: python3.12
files: ^src/
- repo: https://github.com/PyCQA/isort
rev: 9.0.2
rev: 10.0.0b1
hooks:
- id: isort
name: isort-package
Expand All @@ -41,10 +42,10 @@ repos:
hooks:
- id: flake8
name: flake8-package
language_version: python3.12
args: [--config=tox.ini]
files: ^src/
additional_dependencies: [pydoclint]
language_version: python3.12
- repo: https://github.com/PyCQA/flake8
rev: 7.4.1
hooks:
Expand All @@ -62,7 +63,7 @@ repos:
exclude: ^src/(ch|com|org)/
args: [--config=tox.ini]
- repo: https://github.com/commitizen-tools/commitizen
rev: v4.19.0
rev: v4.19.3
hooks:
- id: commitizen
- id: commitizen-branch
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,14 @@
from typing import Any, Dict, List, Optional, Tuple, Union

from java.io import OutputStream, Writer
from java.lang import ArrayIndexOutOfBoundsException, Class
from java.lang import (
ArrayIndexOutOfBoundsException,
Class,
IllegalArgumentException,
Object,
UnsupportedOperationException,
)
from java.lang import Exception as JavaException
from java.lang import IllegalArgumentException, Object, UnsupportedOperationException
from java.util import Locale

from com.inductiveautomation.ignition.common import BasicDataset, Dataset
Expand Down
3 changes: 1 addition & 2 deletions src/org/python/core/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,8 @@
from enum import Enum
from java.io import PrintWriter
from java.lang import Class, Object, RuntimeException, StringBuilder, Throwable
from java.util import Collection
from java.util import Collection, ListIterator, Properties
from java.util import Iterator as JIterator
from java.util import ListIterator, Properties

from org.python.expose import TypeBuilder

Expand Down
4 changes: 1 addition & 3 deletions src/system/mongodb/types.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@

from org.bson.types import (
Binary,
)
from org.bson.types import BSONTimestamp as Timestamp
from org.bson.types import (
Code,
CodeWithScope,
CodeWScope,
Expand All @@ -14,6 +11,7 @@
ObjectId,
Symbol,
)
from org.bson.types import BSONTimestamp as Timestamp

__all__ = [
"Binary",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ from com.inductiveautomation.ignition.common.opc import BrowseElementType
from com.inductiveautomation.ignition.common.script.abc import AbstractJythonSequence
from com.inductiveautomation.ignition.common.script.message import Request
from java.io import OutputStream, Writer
from java.lang import Class
from java.lang import Class, Object
from java.lang import Exception as JavaException
from java.lang import Object
from java.util import Locale
from org.json import JSONObject
from org.python.core import PyFunction, PyList, PyObject, PySequence
Expand Down
3 changes: 1 addition & 2 deletions stubs/stubs/org/python/core/__init__.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ from typing import Any, Iterable, Iterator, List, Mapping, Optional, Tuple, Unio
from enum import Enum
from java.io import PrintWriter
from java.lang import Class, Object, RuntimeException, StringBuilder
from java.util import Collection
from java.util import Collection, ListIterator, Properties
from java.util import Iterator as JIterator
from java.util import ListIterator, Properties
from org.python.expose import TypeBuilder

class PyObject(Object):
Expand Down
Loading