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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request:
push:
branches:
- '17'
- main
workflow_call:
workflow_dispatch:

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: pr-build
on:
pull_request:
branches:
- '17'
- main
paths:
- .github/workflows/pr-build.yml
- '**/pyproject.toml'
Expand Down
1 change: 0 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
ci:
autoupdate_commit_msg: 'build(deps): pre-commit autoupdate'
autofix_commit_msg: 'style: apply auto fixes with pre-commit'
autoupdate_branch: '17'
skip:
- pylint

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# java-api: Python 2 package and Python 3 stubs

[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/ignition-devs/java-api/17.svg)](https://results.pre-commit.ci/latest/github/ignition-devs/java-api/17)
[![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)
[![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)
[![Join us on GitHub discussions](https://img.shields.io/badge/github-discussions-informational)](https://github.com/orgs/ignition-devs/discussions)

This repository contains the following projects:
Expand All @@ -11,5 +11,5 @@ This repository contains the following projects:
`java-api` package.

[`ignition-api`]: https://pypi.org/project/ignition-api
[java-api]: https://github.com/ignition-devs/java-api/tree/17/java-api
[java-api-stubs]: https://github.com/ignition-devs/java-api/tree/17/java-api-stubs
[java-api]: https://github.com/ignition-devs/java-api-17/tree/main/java-api
[java-api-stubs]: https://github.com/ignition-devs/java-api/tree/main/java-api-stubs
14 changes: 8 additions & 6 deletions java-api-stubs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ To use java-api-stubs, you may install it with `pip`. It requires Python
> Python 3.13 will not be supported.

```sh
python3 -m pip install git+https://github.com/ignition-devs/java-api.git#subdirectory=java-api-stubs
python3 -m pip install \
git+https://github.com/ignition-devs/java-api-17.git#subdirectory=java-api-stubs \
"mypy[python2]==0.971"
```

To run `mypy` against your code, execute the following command passing the
Expand Down Expand Up @@ -51,11 +53,11 @@ See the [LICENSE].
See [CODE_OF_CONDUCT.md].

<!-- Links -->
[CODE_OF_CONDUCT.md]: https://github.com/ignition-devs/.github/blob/java-17/CODE_OF_CONDUCT.md
[CONTRIBUTING.md]: https://github.com/ignition-devs/java-api/blob/java-17/CONTRIBUTING.md
[contributors]: https://github.com/ignition-devs/java-api-stubs/graphs/contributors
[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
[Discussions]: https://github.com/orgs/ignition-devs/discussions
[`java-api`]: https://github.com/ignition-devs/java-api
[LICENSE]: https://github.com/ignition-devs/java-api/blob/java-17/LICENSE
[`java-api`]: https://github.com/ignition-devs/java-api-17
[LICENSE]: https://github.com/ignition-devs/java-api-17/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 java-api-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"
urls.Source = "https://github.com/ignition-devs/java-api"
urls.Tracker = "https://github.com/ignition-devs/java-api/issues"
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"

[tool.setuptools]
include-package-data = true
Expand Down
8 changes: 4 additions & 4 deletions java-api/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ The preferred method is to install it by running `pip`. It requires Python
2.7.18.

```bash
python2 -m pip install git+https://github.com/ignition-devs/java-api.git#subdirectory=java-api
python2 -m pip install git+https://github.com/ignition-devs/java-api-17.git#subdirectory=java-api
```

This will install it as package to your Python installation, which will allow
Expand Down Expand Up @@ -97,9 +97,9 @@ See the [LICENSE].
This project has adopted the [Microsoft Open Source Code of Conduct].

<!-- Links -->
[CONTRIBUTING.md]: https://github.com/ignition-devs/java-api/blob/java-17/CONTRIBUTING.md#contributing-to-java-api
[CONTRIBUTORS]: https://github.com/ignition-devs/java-api/graphs/contributors
[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
[Discussions]: https://github.com/orgs/ignition-devs/discussions
[LICENSE]: https://github.com/ignition-devs/java-api/blob/java-17/LICENSE
[LICENSE]: https://github.com/ignition-devs/java-api-17/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/
6 changes: 3 additions & 3 deletions java-api/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = 17.25.0b3
description = Java 17 API Specification for ignition-api
long_description = file: README.md
long_description_content_type = text/markdown
url = https://github.com/ignition-devs/java-api
url = https://github.com/ignition-devs/java-api-17
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
Tracker = https://github.com/ignition-devs/java-api/issues
Source = https://github.com/ignition-devs/java-api-17
Tracker = https://github.com/ignition-devs/java-api-17/issues

[options]
packages = find:
Expand Down