Skip to content

Commit e53434b

Browse files
authored
chore: reflect the repo name change for packaging metadata (#7)
streamline ci
1 parent 29fc699 commit e53434b

File tree

9 files changed

+39
-65
lines changed

9 files changed

+39
-65
lines changed

.github/dependabot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ updates:
44
- package-ecosystem: "github-actions"
55
directory: "/"
66
schedule:
7-
interval: "weekly"
7+
interval: "quarterly"
88
labels: ["dependencies"]
99
commit-message:
1010
prefix: "ci"
11-
include: scope
11+
include: "scope"

.github/workflows/ci.yml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,23 @@ on:
55
push:
66
branches:
77
- main
8-
workflow_call:
9-
workflow_dispatch:
108

119
jobs:
10+
tox-package:
11+
if: ${{ github.event_name == 'pull_request' }}
12+
uses: coatl-dev/workflows/.github/workflows/tox-docker.yml@v6
13+
14+
tox-stubs:
15+
if: ${{ github.event_name == 'pull_request' }}
16+
uses: coatl-dev/workflows/.github/workflows/tox.yml@v6
17+
with:
18+
python-versions: |
19+
3.9
20+
3.10
21+
3.11
22+
3.12
23+
working-directory: stubs
24+
1225
pylint:
1326
uses: coatl-dev/workflows/.github/workflows/pylint.yml@v6
1427
with:

.github/workflows/pr-build.yml

Lines changed: 0 additions & 31 deletions
This file was deleted.

.github/workflows/publish.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,18 @@ on:
66
- published
77

88
jobs:
9-
ci:
10-
uses: ./.github/workflows/ci.yml
11-
12-
pr-build:
13-
needs: ci
14-
uses: ./.github/workflows/pr-build.yml
15-
169
pypi-upload:
17-
needs: pr-build
1810
runs-on: ubuntu-latest
1911
steps:
2012
- name: Checkout repo
2113
uses: actions/checkout@v6
2214

23-
- name: Upload java-api to PyPI
15+
- name: Upload package to PyPI
2416
uses: coatl-dev/actions/pypi-upload@v5
2517
with:
2618
password: ${{ secrets.PYPI_API_TOKEN_JAVA_API_PKG }}
2719

28-
- name: Upload java-api-stubs to PyPI
20+
- name: Upload stubs to PyPI
2921
uses: coatl-dev/actions/pypi-upload@v5
3022
with:
3123
python-version: '3.12'

.pre-commit-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ repos:
2929
rev: 7.0.0
3030
hooks:
3131
- id: isort
32-
name: isort-java-api
32+
name: isort-package
3333
files: ^src/
3434
args: [--settings-file, tox.ini]
3535
- repo: https://github.com/PyCQA/isort
3636
rev: 7.0.0
3737
hooks:
3838
- id: isort
39-
name: isort-java-api-stubs
39+
name: isort-stubs
4040
files: ^stubs/stubs/
4141
args: [--settings-file, stubs/tox.ini]
4242
- repo: https://github.com/PyCQA/docformatter
@@ -50,7 +50,7 @@ repos:
5050
rev: 5.0.4
5151
hooks:
5252
- id: flake8
53-
name: flake8-java-api
53+
name: flake8-package
5454
files: ^src/
5555
args: [--config, tox.ini]
5656
additional_dependencies: [pydoclint]
@@ -59,7 +59,7 @@ repos:
5959
rev: 7.3.0
6060
hooks:
6161
- id: flake8
62-
name: flake8-java-api-stubs
62+
name: flake8-stubs
6363
types: [file]
6464
files: \.(pyi)$
6565
additional_dependencies: [flake8-pyi]

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/java-api)](https://pypi.org/project/java-api/)
55
[![PyPI - Version](https://img.shields.io/pypi/v/java-api)](https://pypi.org/project/java-api/)
66
[![PyPI - Downloads](https://static.pepy.tech/badge/java-api)](https://pepy.tech/projects/java-api)
7-
[![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)
8-
[![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)
7+
[![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)
8+
[![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)
99
[![Join us on GitHub discussions](https://img.shields.io/badge/github-discussions-informational)](https://github.com/orgs/ignition-devs/discussions)
1010

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

110110
<!-- Links -->
111-
[CONTRIBUTING.md]: https://github.com/ignition-devs/java-api-17/blob/main/CONTRIBUTING.md#contributing-to-java-api
112-
[CONTRIBUTORS]: https://github.com/ignition-devs/java-api-17/graphs/contributors
111+
[CONTRIBUTING.md]: https://github.com/ignition-devs/java-api/blob/main/CONTRIBUTING.md#contributing-to-java-api
112+
[CONTRIBUTORS]: https://github.com/ignition-devs/java-api/graphs/contributors
113113
[Discussions]: https://github.com/orgs/ignition-devs/discussions
114114
[`java-api-stubs`]: https://pypi.org/project/java-api-stubs/
115-
[LICENSE]: https://github.com/ignition-devs/java-api-17/blob/main/LICENSE
115+
[LICENSE]: https://github.com/ignition-devs/java-api/blob/main/LICENSE
116116
[Microsoft Open Source Code of Conduct]: https://opensource.microsoft.com/codeofconduct/
117117
[Python 2.7.18]: https://www.python.org/downloads/release/python-2718/

setup.cfg

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[metadata]
22
name = java_api
33
version = 17.25.0b6
4-
description = Java 17 API Specification for ignition-api
4+
description = Java API Specification for ignition-api
55
long_description = file: README.md
66
long_description_content_type = text/markdown
7-
url = https://github.com/ignition-devs/java-api-17
7+
url = https://github.com/ignition-devs/java-api
88
author = César Román
99
author_email = cesar@coatl.dev
1010
license = MIT
@@ -31,8 +31,8 @@ keywords =
3131
project_urls =
3232
Documentation = https://docs.inductiveautomation.com/docs/8.1/appendix/scripting-functions
3333
Funding = https://github.com/sponsors/cesarcoatl
34-
Source = https://github.com/ignition-devs/java-api-17
35-
Tracker = https://github.com/ignition-devs/java-api-17/issues
34+
Source = https://github.com/ignition-devs/java-api/tree/main
35+
Tracker = https://github.com/ignition-devs/java-api/issues
3636

3737
[options]
3838
packages = find:

stubs/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ See [CODE_OF_CONDUCT.md].
6060

6161
<!-- Links -->
6262
[CODE_OF_CONDUCT.md]: https://github.com/ignition-devs/.github/blob/main/CODE_OF_CONDUCT.md
63-
[CONTRIBUTING.md]: https://github.com/ignition-devs/java-api-17/blob/main/CONTRIBUTING.md
64-
[contributors]: https://github.com/ignition-devs/java-api-17/graphs/contributors
63+
[CONTRIBUTING.md]: https://github.com/ignition-devs/java-api/blob/main/CONTRIBUTING.md
64+
[contributors]: https://github.com/ignition-devs/java-api/graphs/contributors
6565
[Discussions]: https://github.com/orgs/ignition-devs/discussions
66-
[`java-api`]: https://github.com/ignition-devs/java-api-17
67-
[LICENSE]: https://github.com/ignition-devs/java-api-17/blob/main/LICENSE
66+
[`java-api`]: https://github.com/ignition-devs/java-api
67+
[LICENSE]: https://github.com/ignition-devs/java-api/blob/main/LICENSE
6868
[`stubgen`]: https://coatl-mypy.readthedocs.io/en/v0.971/stubgen.html
6969
[stubs]: https://www.python.org/dev/peps/pep-484/

stubs/pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ classifiers = [
3636
"Typing :: Typed",
3737
]
3838
urls.Funding = "https://github.com/sponsors/cesarcoatl"
39-
urls.Homepage = "https://github.com/ignition-devs/java-api-17"
40-
urls.Source = "https://github.com/ignition-devs/java-api-17"
41-
urls.Tracker = "https://github.com/ignition-devs/java-api-17/issues"
39+
urls.Homepage = "https://github.com/ignition-devs/java-api"
40+
urls.Source = "https://github.com/ignition-devs/java-api/tree/main"
41+
urls.Tracker = "https://github.com/ignition-devs/java-api/issues"
4242

4343
[tool.setuptools]
4444
include-package-data = true

0 commit comments

Comments
 (0)