diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 9f2f39c..ae8d3f3 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -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" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3a639a0..5818a5a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 + + 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: diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml deleted file mode 100644 index 1dc4128..0000000 --- a/.github/workflows/pr-build.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: pr-build - -on: - pull_request: - branches: - - main - paths: - - .github/workflows/pr-build.yml - - '**/pyproject.toml' - - '**/requirements.txt' - - '**/tox.ini' - - src/** - - setup.cfg - - setup.py - - tests/** - - stubs/stubs/** - workflow_call: - -jobs: - tox-java-api: - uses: coatl-dev/workflows/.github/workflows/tox-docker.yml@v6 - - tox-java-api-stubs: - uses: coatl-dev/workflows/.github/workflows/tox.yml@v6 - with: - python-versions: | - 3.9 - 3.10 - 3.11 - 3.12 - working-directory: stubs diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 38cfd7b..20ce309 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -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: - 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' diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bb837b0..8ebdba5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -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 @@ -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] @@ -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] diff --git a/README.md b/README.md index 3bb7ef1..5c7645e 100644 --- a/README.md +++ b/README.md @@ -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 @@ -108,10 +108,10 @@ See the [LICENSE]. This project has adopted the [Microsoft Open Source Code of Conduct]. -[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/ diff --git a/setup.cfg b/setup.cfg index 5b6c388..8d0aff2 100644 --- a/setup.cfg +++ b/setup.cfg @@ -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 @@ -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: diff --git a/stubs/README.md b/stubs/README.md index 5c0d436..dd809c0 100644 --- a/stubs/README.md +++ b/stubs/README.md @@ -60,10 +60,10 @@ See [CODE_OF_CONDUCT.md]. [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/ diff --git a/stubs/pyproject.toml b/stubs/pyproject.toml index 220ee1b..d429367 100644 --- a/stubs/pyproject.toml +++ b/stubs/pyproject.toml @@ -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