diff --git a/.github/workflows/pip-compile-upgrade.yml b/.github/workflows/pip-compile-upgrade.yml deleted file mode 100644 index b7eba4b..0000000 --- a/.github/workflows/pip-compile-upgrade.yml +++ /dev/null @@ -1,67 +0,0 @@ -name: pip-compile-upgrade - -on: - schedule: - - cron: '0 20 14,28 * *' - workflow_dispatch: - -jobs: - pip-compile-upgrade: - runs-on: ubuntu-latest - steps: - - name: Checkout repo - uses: actions/checkout@v6 - with: - ref: '17' - - - name: Upgrade java-api requirements - uses: coatl-dev/actions/pip-compile-upgrade@v5 - with: - path: requirements.txt - working-directory: java-api - - - name: Upgrade java-api-stubs requirements - uses: coatl-dev/actions/uv-pip-compile-upgrade@v5 - with: - path: requirements.txt - python-version: '3.12' - working-directory: java-api-stubs - - - name: Detect changes - id: git-diff - uses: coatl-dev/actions/simple-git-diff@v5 - with: - path: ${{ github.workspace }} - - - name: Import GPG key - if: ${{ steps.git-diff.outputs.diff == 'true' }} - uses: coatl-dev/actions/gpg-import@v5 - with: - passphrase: ${{ secrets.COATL_BOT_GPG_PASSPHRASE }} - private-key: ${{ secrets.COATL_BOT_GPG_PRIVATE_KEY }} - - - name: Build commit message - if: ${{ steps.git-diff.outputs.diff == 'true' }} - run: | - echo "chore(requirements): pip-compile upgrade" > "$RUNNER_TEMP/commit.txt" - { - echo "" - echo "updates:" - git status --porcelain | awk 'match($1, "M") {print " - " $2}' - } >> "$RUNNER_TEMP/commit.txt" - - - name: Commit and push changes - if: ${{ steps.git-diff.outputs.diff == 'true' }} - run: | - git checkout -B coatl-dev-pip-compile-upgrade - git add --update - git commit --file="${RUNNER_TEMP}/commit.txt" - git push --force --set-upstream origin coatl-dev-pip-compile-upgrade - - - name: Create pull request - if: ${{ steps.git-diff.outputs.diff == 'true' }} - uses: coatl-dev/actions/pr-create@v5 - with: - gh-token: ${{ secrets.COATL_BOT_GH_TOKEN }} - additional-args: | - --base 17 diff --git a/java-api-stubs/pyproject.toml b/java-api-stubs/pyproject.toml index 969967f..e948b5f 100644 --- a/java-api-stubs/pyproject.toml +++ b/java-api-stubs/pyproject.toml @@ -35,10 +35,6 @@ classifiers = [ "Typing :: Stubs Only", "Typing :: Typed", ] -dependencies = [ - "mypy[python2]==0.971", - "types-enum34", -] 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" diff --git a/java-api-stubs/requirements.txt b/java-api-stubs/requirements.txt deleted file mode 100644 index 834c051..0000000 --- a/java-api-stubs/requirements.txt +++ /dev/null @@ -1,82 +0,0 @@ -# This file was autogenerated by uv via the following command: -# uv pip compile --config-file=uv.toml pyproject.toml -mypy[python2]==0.971 \ - --hash=sha256:02ef476f6dcb86e6f502ae39a16b93285fef97e7f1ff22932b657d1ef1f28655 \ - --hash=sha256:0d054ef16b071149917085f51f89555a576e2618d5d9dd70bd6eea6410af3ac9 \ - --hash=sha256:19830b7dba7d5356d3e26e2427a2ec91c994cd92d983142cbd025ebe81d69cf3 \ - --hash=sha256:1f7656b69974a6933e987ee8ffb951d836272d6c0f81d727f1d0e2696074d9e6 \ - --hash=sha256:23488a14a83bca6e54402c2e6435467a4138785df93ec85aeff64c6170077fb0 \ - --hash=sha256:23c7ff43fff4b0df93a186581885c8512bc50fc4d4910e0f838e35d6bb6b5e58 \ - --hash=sha256:25c5750ba5609a0c7550b73a33deb314ecfb559c350bb050b655505e8aed4103 \ - --hash=sha256:2ad53cf9c3adc43cf3bea0a7d01a2f2e86db9fe7596dfecb4496a5dda63cbb09 \ - --hash=sha256:3fa7a477b9900be9b7dd4bab30a12759e5abe9586574ceb944bc29cddf8f0417 \ - --hash=sha256:40b0f21484238269ae6a57200c807d80debc6459d444c0489a102d7c6a75fa56 \ - --hash=sha256:4b21e5b1a70dfb972490035128f305c39bc4bc253f34e96a4adf9127cf943eb2 \ - --hash=sha256:5a361d92635ad4ada1b1b2d3630fc2f53f2127d51cf2def9db83cba32e47c856 \ - --hash=sha256:77a514ea15d3007d33a9e2157b0ba9c267496acf12a7f2b9b9f8446337aac5b0 \ - --hash=sha256:855048b6feb6dfe09d3353466004490b1872887150c5bb5caad7838b57328cc8 \ - --hash=sha256:9796a2ba7b4b538649caa5cecd398d873f4022ed2333ffde58eaf604c4d2cb27 \ - --hash=sha256:98e02d56ebe93981c41211c05adb630d1d26c14195d04d95e49cd97dbc046dc5 \ - --hash=sha256:b793b899f7cf563b1e7044a5c97361196b938e92f0a4343a5d27966a53d2ec71 \ - --hash=sha256:d1ea5d12c8e2d266b5fb8c7a5d2e9c0219fedfeb493b7ed60cd350322384ac27 \ - --hash=sha256:d2022bfadb7a5c2ef410d6a7c9763188afdb7f3533f22a0a32be10d571ee4bbe \ - --hash=sha256:d3348e7eb2eea2472db611486846742d5d52d1290576de99d59edeb7cd4a42ca \ - --hash=sha256:d744f72eb39f69312bc6c2abf8ff6656973120e2eb3f3ec4f758ed47e414a4bf \ - --hash=sha256:ef943c72a786b0f8d90fd76e9b39ce81fb7171172daf84bf43eaf937e9f220a9 \ - --hash=sha256:f2899a3cbd394da157194f913a931edfd4be5f274a88041c9dc2d9cdcb1c315c - # via java-api-stubs (pyproject.toml) -mypy-extensions==1.1.0 \ - --hash=sha256:1be4cccdb0f2482337c4743e60421de3a356cd97508abadd57d47403e94f5505 \ - --hash=sha256:52e68efc3284861e772bbcd66823fde5ae21fd2fdb51c62a211403730b916558 - # via mypy -typed-ast==1.5.5 \ - --hash=sha256:042eb665ff6bf020dd2243307d11ed626306b82812aba21836096d229fdc6a10 \ - --hash=sha256:045f9930a1550d9352464e5149710d56a2aed23a2ffe78946478f7b5416f1ede \ - --hash=sha256:0635900d16ae133cab3b26c607586131269f88266954eb04ec31535c9a12ef1e \ - --hash=sha256:118c1ce46ce58fda78503eae14b7664163aa735b620b64b5b725453696f2a35c \ - --hash=sha256:16f7313e0a08c7de57f2998c85e2a69a642e97cb32f87eb65fbfe88381a5e44d \ - --hash=sha256:1efebbbf4604ad1283e963e8915daa240cb4bf5067053cf2f0baadc4d4fb51b8 \ - --hash=sha256:2188bc33d85951ea4ddad55d2b35598b2709d122c11c75cffd529fbc9965508e \ - --hash=sha256:2b946ef8c04f77230489f75b4b5a4a6f24c078be4aed241cfabe9cbf4156e7e5 \ - --hash=sha256:335f22ccb244da2b5c296e6f96b06ee9bed46526db0de38d2f0e5a6597b81155 \ - --hash=sha256:381eed9c95484ceef5ced626355fdc0765ab51d8553fec08661dce654a935db4 \ - --hash=sha256:429ae404f69dc94b9361bb62291885894b7c6fb4640d561179548c849f8492ba \ - --hash=sha256:44f214394fc1af23ca6d4e9e744804d890045d1643dd7e8229951e0ef39429b5 \ - --hash=sha256:48074261a842acf825af1968cd912f6f21357316080ebaca5f19abbb11690c8a \ - --hash=sha256:4bc1efe0ce3ffb74784e06460f01a223ac1f6ab31c6bc0376a21184bf5aabe3b \ - --hash=sha256:57bfc3cf35a0f2fdf0a88a3044aafaec1d2f24d8ae8cd87c4f58d615fb5b6311 \ - --hash=sha256:597fc66b4162f959ee6a96b978c0435bd63791e31e4f410622d19f1686d5e769 \ - --hash=sha256:5f7a8c46a8b333f71abd61d7ab9255440d4a588f34a21f126bbfc95f6049e686 \ - --hash=sha256:5fe83a9a44c4ce67c796a1b466c270c1272e176603d5e06f6afbc101a572859d \ - --hash=sha256:61443214d9b4c660dcf4b5307f15c12cb30bdfe9588ce6158f4a005baeb167b2 \ - --hash=sha256:622e4a006472b05cf6ef7f9f2636edc51bda670b7bbffa18d26b255269d3d814 \ - --hash=sha256:6eb936d107e4d474940469e8ec5b380c9b329b5f08b78282d46baeebd3692dc9 \ - --hash=sha256:7f58fabdde8dcbe764cef5e1a7fcb440f2463c1bbbec1cf2a86ca7bc1f95184b \ - --hash=sha256:83509f9324011c9a39faaef0922c6f720f9623afe3fe220b6d0b15638247206b \ - --hash=sha256:8c524eb3024edcc04e288db9541fe1f438f82d281e591c548903d5b77ad1ddd4 \ - --hash=sha256:94282f7a354f36ef5dbce0ef3467ebf6a258e370ab33d5b40c249fa996e590dd \ - --hash=sha256:b445c2abfecab89a932b20bd8261488d574591173d07827c1eda32c457358b18 \ - --hash=sha256:be4919b808efa61101456e87f2d4c75b228f4e52618621c77f1ddcaae15904fa \ - --hash=sha256:bfd39a41c0ef6f31684daff53befddae608f9daf6957140228a08e51f312d7e6 \ - --hash=sha256:c631da9710271cb67b08bd3f3813b7af7f4c69c319b75475436fcab8c3d21bee \ - --hash=sha256:cc95ffaaab2be3b25eb938779e43f513e0e538a84dd14a5d844b8f2932593d88 \ - --hash=sha256:d09d930c2d1d621f717bb217bf1fe2584616febb5138d9b3e8cdd26506c3f6d4 \ - --hash=sha256:d40c10326893ecab8a80a53039164a224984339b2c32a6baf55ecbd5b1df6431 \ - --hash=sha256:d41b7a686ce653e06c2609075d397ebd5b969d821b9797d029fccd71fdec8e04 \ - --hash=sha256:d5c0c112a74c0e5db2c75882a0adf3133adedcdbfd8cf7c9d6ed77365ab90a1d \ - --hash=sha256:e1a976ed4cc2d71bb073e1b2a250892a6e968ff02aa14c1f40eba4f365ffec02 \ - --hash=sha256:e48bf27022897577d8479eaed64701ecaf0467182448bd95759883300ca818c8 \ - --hash=sha256:ed4a1a42df8a3dfb6b40c3d2de109e935949f2f66b19703eafade03173f8f437 \ - --hash=sha256:f0aefdd66f1784c58f65b502b6cf8b121544680456d1cebbd300c2c813899274 \ - --hash=sha256:fc2b8c4e1bc5cd96c1a823a885e6b158f8451cf6f5530e1829390b4d27d0807f \ - --hash=sha256:fd946abf3c31fb50eee07451a6aedbfff912fcd13cf357363f5b4e834cc5e71a \ - --hash=sha256:fe58ef6a764de7b4b36edfc8592641f56e69b7163bba9f9c8089838ee596bfb2 - # via mypy -types-enum34==1.1.8 \ - --hash=sha256:05058c7a495f6bfaaca0be4aeac3cce5cdd80a2bad2aab01fd49a20bf4a0209d \ - --hash=sha256:6f9c769641d06d73a55e11c14d38ac76fcd37eb545ce79cebb6eec9d50a64110 - # via java-api-stubs (pyproject.toml) -typing-extensions==4.15.0 \ - --hash=sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466 \ - --hash=sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548 - # via mypy diff --git a/java-api-stubs/stubs/java/nio/file/__init__.pyi b/java-api-stubs/stubs/java/nio/file/__init__.pyi index a407c48..26ad523 100644 --- a/java-api-stubs/stubs/java/nio/file/__init__.pyi +++ b/java-api-stubs/stubs/java/nio/file/__init__.pyi @@ -269,7 +269,7 @@ class LinkOption(Enum, CopyOption, OpenOption): class Path(Watchable): def compareTo(self, other: Path) -> int: ... - def endsWith(self, other: Union[Object, Path, str, unicode]) -> bool: ... + def endsWith(self, other: Union[str, unicode, Object, Path]) -> bool: ... def equals(self, other: Object) -> bool: ... def getFileName(self) -> Path: ... def getName(self, index: int) -> Path: ... diff --git a/java-api-stubs/stubs/java/util/__init__.pyi b/java-api-stubs/stubs/java/util/__init__.pyi index 8a56fad..fbbc6cf 100644 --- a/java-api-stubs/stubs/java/util/__init__.pyi +++ b/java-api-stubs/stubs/java/util/__init__.pyi @@ -393,7 +393,7 @@ class Currency(Object): def getCurrencyCode(self) -> Union[str, unicode]: ... def getDisplayName(self, locale: Optional[Locale] = ...) -> Union[str, unicode]: ... @staticmethod - def getInstance(arg: Union[Locale, str, unicode]) -> Currency: ... + def getInstance(arg: Union[str, unicode, Locale]) -> Currency: ... def getNumericCode(self) -> int: ... def getNumericCodeAsString(self) -> Union[str, unicode]: ... def getSymbol(self, locale: Optional[Locale] = ...) -> Union[str, unicode]: ... diff --git a/java-api-stubs/stubs/java/util/regex/__init__.pyi b/java-api-stubs/stubs/java/util/regex/__init__.pyi index 86efebf..a0c318e 100644 --- a/java-api-stubs/stubs/java/util/regex/__init__.pyi +++ b/java-api-stubs/stubs/java/util/regex/__init__.pyi @@ -33,9 +33,9 @@ class Matcher(Object, MatchResult): def region(self, start: int, end: int) -> Matcher: ... def regionEnd(self) -> int: ... def regionStart(self) -> int: ... - def replaceAll(self, arg: Union[Function, str, unicode]) -> Union[str, unicode]: ... + def replaceAll(self, arg: Union[str, unicode, Function]) -> Union[str, unicode]: ... def replaceFirst( - self, arg: Union[Function, str, unicode] + self, arg: Union[str, unicode, Function] ) -> Union[str, unicode]: ... def requireEnd(self) -> bool: ... def reset(self, input: Optional[CharSequence] = ...) -> Matcher: ... diff --git a/java-api-stubs/tox.ini b/java-api-stubs/tox.ini index 61fbea7..b625a3e 100644 --- a/java-api-stubs/tox.ini +++ b/java-api-stubs/tox.ini @@ -11,7 +11,7 @@ description = run type check on code base base_python = python3.12 skip_install = true deps = - --requirement requirements.txt + mypy[python2]==0.971 commands = mypy stubs diff --git a/java-api-stubs/uv.toml b/java-api-stubs/uv.toml deleted file mode 100644 index df242b6..0000000 --- a/java-api-stubs/uv.toml +++ /dev/null @@ -1,5 +0,0 @@ -[pip] -generate-hashes = true -no-strip-extras = true -output-file = "requirements.txt" -python = "3.12" diff --git a/java-api/requirements.in b/java-api/requirements.in index 88793f2..c997f36 100644 --- a/java-api/requirements.in +++ b/java-api/requirements.in @@ -1,2 +1 @@ -enum34 typing diff --git a/java-api/requirements.txt b/java-api/requirements.txt index a090cf9..e6eff73 100644 --- a/java-api/requirements.txt +++ b/java-api/requirements.txt @@ -4,11 +4,6 @@ # # pip-compile --generate-hashes requirements.in # -enum34==1.1.10 \ - --hash=sha256:a98a201d6de3f2ab3db284e70a33b0f896fbf35f8086594e8c9e74b909058d53 \ - --hash=sha256:c3858660960c984d6ab0ebad691265180da2b43f07e061c0f8dca9ef3cffd328 \ - --hash=sha256:cce6a7477ed816bd2542d03d53db9f0db935dd013b70f336a95c73979289f248 - # via -r requirements.in typing==3.10.0.0 \ --hash=sha256:12fbdfbe7d6cca1a42e485229afcb0b0c8259258cfb919b8a5e2a5c953742f89 \ --hash=sha256:13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130 \ diff --git a/java-api/setup.cfg b/java-api/setup.cfg index 8019421..c147ddb 100644 --- a/java-api/setup.cfg +++ b/java-api/setup.cfg @@ -38,7 +38,6 @@ project_urls = [options] packages = find: install_requires = - enum34 typing python_requires = ==2.7.18 package_dir = diff --git a/java-api/src/java/nio/file/__init__.py b/java-api/src/java/nio/file/__init__.py index f4e9c7d..532b16a 100644 --- a/java-api/src/java/nio/file/__init__.py +++ b/java-api/src/java/nio/file/__init__.py @@ -560,7 +560,7 @@ def compareTo(self, other): pass def endsWith(self, other): - # type: (Union[Object, Path, str, unicode]) -> bool + # type: (Union[str, unicode, Object, Path]) -> bool return True def equals(self, other): diff --git a/java-api/src/java/util/__init__.py b/java-api/src/java/util/__init__.py index 6fba882..e1a9d4d 100644 --- a/java-api/src/java/util/__init__.py +++ b/java-api/src/java/util/__init__.py @@ -1045,7 +1045,7 @@ def getDisplayName(self, locale=None): @staticmethod def getInstance(arg): - # type: (Union[Locale, str, unicode]) -> Currency + # type: (Union[str, unicode, Locale]) -> Currency pass def getNumericCode(self): diff --git a/java-api/src/java/util/regex/__init__.py b/java-api/src/java/util/regex/__init__.py index 2647737..58571b5 100644 --- a/java-api/src/java/util/regex/__init__.py +++ b/java-api/src/java/util/regex/__init__.py @@ -98,11 +98,11 @@ def regionStart(self): pass def replaceAll(self, arg): - # type: (Union[Function, str, unicode]) -> Union[str, unicode] + # type: (Union[str, unicode, Function]) -> Union[str, unicode] pass def replaceFirst(self, arg): - # type: (Union[Function, str, unicode]) -> Union[str, unicode] + # type: (Union[str, unicode, Function]) -> Union[str, unicode] pass def requireEnd(self):