build(deps): remove enum34, types-enum34 and mypy (#2)

cesarcoatl · web-flow · commit 4edda7dfa472 · 2025-12-08T11:34:19.000-08:00
reorder types on some type comments
diff --git a/.github/workflows/pip-compile-upgrade.yml b/.github/workflows/pip-compile-upgrade.yml
diff --git 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
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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):

Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,6 @@`
`4`	`4`	`#`
`5`	`5`	`# pip-compile --generate-hashes requirements.in`
`6`	`6`	`#`
`7`		`-enum34==1.1.10 \`
`8`		`- --hash=sha256:a98a201d6de3f2ab3db284e70a33b0f896fbf35f8086594e8c9e74b909058d53 \`
`9`		`- --hash=sha256:c3858660960c984d6ab0ebad691265180da2b43f07e061c0f8dca9ef3cffd328 \`
`10`		`- --hash=sha256:cce6a7477ed816bd2542d03d53db9f0db935dd013b70f336a95c73979289f248`
`11`		`- # via -r requirements.in`
`12`	`7`	`typing==3.10.0.0 \`
`13`	`8`	`--hash=sha256:12fbdfbe7d6cca1a42e485229afcb0b0c8259258cfb919b8a5e2a5c953742f89 \`
`14`	`9`	`--hash=sha256:13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130 \`