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/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
interval: "quarterly"
labels: ["dependencies"]
commit-message:
prefix: "ci"
include: scope
include: "scope"
17 changes: 15 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,23 @@ on:
push:
branches:
- main
workflow_call:
workflow_dispatch:

jobs:
tox-package:
if: ${{ github.event_name == 'pull_request' }}
uses: coatl-dev/workflows/.github/workflows/tox-docker.yml@v6
Comment on lines +10 to +12
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

question (testing): Tox jobs are restricted to pull requests and will not run on pushes to main.

Because tox-package (and tox-stubs) is guarded by if: ${{ github.event_name == 'pull_request' }}, these checks won’t run on push events to main—only pylint will. If you want tox to run on direct pushes (e.g., release or admin pushes), consider adjusting the condition to also allow push to main (e.g., via github.ref == 'refs/heads/main'). If tox-on-PR-only is intentional, no change needed.


tox-stubs:
if: ${{ github.event_name == 'pull_request' }}
uses: coatl-dev/workflows/.github/workflows/tox.yml@v6
with:
python-versions: |
3.9
3.10
3.11
3.12
working-directory: stubs

pylint:
uses: coatl-dev/workflows/.github/workflows/pylint.yml@v6
with:
Expand Down
31 changes: 0 additions & 31 deletions .github/workflows/pr-build.yml

This file was deleted.

12 changes: 2 additions & 10 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,18 @@ on:
- published

jobs:
ci:
uses: ./.github/workflows/ci.yml

pr-build:
needs: ci
uses: ./.github/workflows/pr-build.yml

pypi-upload:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

issue (bug_risk): Removing the needs chain allows PyPI upload without any CI/pr-build gating.

pypi-upload will now run on every release event even if CI/pr-build fails. If you still want uploads blocked by tests/builds, please add an explicit dependency (e.g., on a check job or reusable workflow). If this decoupling is intentional, verify that nothing else still assumes the old gated behavior.

needs: pr-build
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@v6

- name: Upload java-api to PyPI
- name: Upload package to PyPI
uses: coatl-dev/actions/pypi-upload@v5
with:
password: ${{ secrets.PYPI_API_TOKEN_JAVA_API_PKG }}

- name: Upload java-api-stubs to PyPI
- name: Upload stubs to PyPI
uses: coatl-dev/actions/pypi-upload@v5
with:
python-version: '3.12'
Expand Down
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ repos:
rev: 7.0.0
hooks:
- id: isort
name: isort-java-api
name: isort-package
files: ^src/
args: [--settings-file, tox.ini]
- repo: https://github.com/PyCQA/isort
rev: 7.0.0
hooks:
- id: isort
name: isort-java-api-stubs
name: isort-stubs
files: ^stubs/stubs/
args: [--settings-file, stubs/tox.ini]
- repo: https://github.com/PyCQA/docformatter
Expand All @@ -50,7 +50,7 @@ repos:
rev: 5.0.4
hooks:
- id: flake8
name: flake8-java-api
name: flake8-package
files: ^src/
args: [--config, tox.ini]
additional_dependencies: [pydoclint]
Expand All @@ -59,7 +59,7 @@ repos:
rev: 7.3.0
hooks:
- id: flake8
name: flake8-java-api-stubs
name: flake8-stubs
types: [file]
files: \.(pyi)$
additional_dependencies: [flake8-pyi]
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/java-api)](https://pypi.org/project/java-api/)
[![PyPI - Version](https://img.shields.io/pypi/v/java-api)](https://pypi.org/project/java-api/)
[![PyPI - Downloads](https://static.pepy.tech/badge/java-api)](https://pepy.tech/projects/java-api)
[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/ignition-devs/java-api-17/main.svg)](https://results.pre-commit.ci/latest/github/ignition-devs/java-api-17/main)
[![ci](https://github.com/ignition-devs/java-api-17/actions/workflows/ci.yml/badge.svg)](https://github.com/ignition-devs/java-api-17/actions/workflows/ci.yml)
[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/ignition-devs/java-api/main.svg)](https://results.pre-commit.ci/latest/github/ignition-devs/java-api/main)
[![ci](https://github.com/ignition-devs/java-api/actions/workflows/ci.yml/badge.svg)](https://github.com/ignition-devs/java-api/actions/workflows/ci.yml)
[![Join us on GitHub discussions](https://img.shields.io/badge/github-discussions-informational)](https://github.com/orgs/ignition-devs/discussions)

java-api is a Python package that allows developers to get code completion
Expand Down Expand Up @@ -108,10 +108,10 @@ See the [LICENSE].
This project has adopted the [Microsoft Open Source Code of Conduct].

<!-- Links -->
[CONTRIBUTING.md]: https://github.com/ignition-devs/java-api-17/blob/main/CONTRIBUTING.md#contributing-to-java-api
[CONTRIBUTORS]: https://github.com/ignition-devs/java-api-17/graphs/contributors
[CONTRIBUTING.md]: https://github.com/ignition-devs/java-api/blob/main/CONTRIBUTING.md#contributing-to-java-api
[CONTRIBUTORS]: https://github.com/ignition-devs/java-api/graphs/contributors
[Discussions]: https://github.com/orgs/ignition-devs/discussions
[`java-api-stubs`]: https://pypi.org/project/java-api-stubs/
[LICENSE]: https://github.com/ignition-devs/java-api-17/blob/main/LICENSE
[LICENSE]: https://github.com/ignition-devs/java-api/blob/main/LICENSE
[Microsoft Open Source Code of Conduct]: https://opensource.microsoft.com/codeofconduct/
[Python 2.7.18]: https://www.python.org/downloads/release/python-2718/
8 changes: 4 additions & 4 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[metadata]
name = java_api
version = 17.25.0b6
description = Java 17 API Specification for ignition-api
description = Java API Specification for ignition-api
long_description = file: README.md
long_description_content_type = text/markdown
url = https://github.com/ignition-devs/java-api-17
url = https://github.com/ignition-devs/java-api
author = César Román
author_email = cesar@coatl.dev
license = MIT
Expand All @@ -31,8 +31,8 @@ keywords =
project_urls =
Documentation = https://docs.inductiveautomation.com/docs/8.1/appendix/scripting-functions
Funding = https://github.com/sponsors/cesarcoatl
Source = https://github.com/ignition-devs/java-api-17
Tracker = https://github.com/ignition-devs/java-api-17/issues
Source = https://github.com/ignition-devs/java-api/tree/main
Tracker = https://github.com/ignition-devs/java-api/issues

[options]
packages = find:
Expand Down
8 changes: 4 additions & 4 deletions stubs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ See [CODE_OF_CONDUCT.md].

<!-- Links -->
[CODE_OF_CONDUCT.md]: https://github.com/ignition-devs/.github/blob/main/CODE_OF_CONDUCT.md
[CONTRIBUTING.md]: https://github.com/ignition-devs/java-api-17/blob/main/CONTRIBUTING.md
[contributors]: https://github.com/ignition-devs/java-api-17/graphs/contributors
[CONTRIBUTING.md]: https://github.com/ignition-devs/java-api/blob/main/CONTRIBUTING.md
[contributors]: https://github.com/ignition-devs/java-api/graphs/contributors
[Discussions]: https://github.com/orgs/ignition-devs/discussions
[`java-api`]: https://github.com/ignition-devs/java-api-17
[LICENSE]: https://github.com/ignition-devs/java-api-17/blob/main/LICENSE
[`java-api`]: https://github.com/ignition-devs/java-api
[LICENSE]: https://github.com/ignition-devs/java-api/blob/main/LICENSE
[`stubgen`]: https://coatl-mypy.readthedocs.io/en/v0.971/stubgen.html
[stubs]: https://www.python.org/dev/peps/pep-484/
6 changes: 3 additions & 3 deletions stubs/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ classifiers = [
"Typing :: Typed",
]
urls.Funding = "https://github.com/sponsors/cesarcoatl"
urls.Homepage = "https://github.com/ignition-devs/java-api-17"
urls.Source = "https://github.com/ignition-devs/java-api-17"
urls.Tracker = "https://github.com/ignition-devs/java-api-17/issues"
urls.Homepage = "https://github.com/ignition-devs/java-api"
urls.Source = "https://github.com/ignition-devs/java-api/tree/main"
urls.Tracker = "https://github.com/ignition-devs/java-api/issues"

[tool.setuptools]
include-package-data = true
Expand Down