build: pyinstaller: use __pyinstaller

efiop · efiop · commit 20f13eeab58c · 2023-07-03T01:26:21.000+03:00
diff --git a/dvc/__pyinstaller/__init__.py b/dvc/__pyinstaller/__init__.py
@@ -0,0 +1,5 @@
+import os
+
+
+def get_hook_dirs():
+    return [os.path.dirname(__file__)]
diff --git a/dvc/__pyinstaller/hook-asyncssh.py b/dvc/__pyinstaller/hook-asyncssh.py
@@ -1 +1,2 @@
+# ruff: disable=N999
 hiddenimports = ["win32timezone"]
diff --git a/dvc/__pyinstaller/hook-celery.py b/dvc/__pyinstaller/hook-celery.py
@@ -1,3 +1,4 @@
+# ruff: disable=N999
 # pylint: disable=import-error
 from PyInstaller.utils.hooks import collect_submodules, is_module_or_submodule
 
diff --git a/dvc/__pyinstaller/hook-dvc.py b/dvc/__pyinstaller/hook-dvc.py
@@ -1,3 +1,4 @@
+# ruff: disable=N999
 from PyInstaller.utils.hooks import copy_metadata  # pylint:disable=import-error
 
 # needed for `dvc doctor` to show dep versions
diff --git a/dvc/__pyinstaller/hook-dvc.system.py b/dvc/__pyinstaller/hook-dvc.system.py
@@ -1,3 +1,4 @@
+# ruff: disable=N999
 import os
 
 if os.name == "nt":
diff --git a/dvc/__pyinstaller/hook-dvc.tree.gs.py b/dvc/__pyinstaller/hook-dvc.tree.gs.py
@@ -1,3 +1,4 @@
+# ruff: disable=N999
 from PyInstaller.utils.hooks import copy_metadata  # pylint:disable=import-error
 
 datas = copy_metadata("google-cloud-storage")
diff --git a/dvc/__pyinstaller/hook-dvc.utils.flatten.py b/dvc/__pyinstaller/hook-dvc.utils.flatten.py
@@ -1,3 +1,4 @@
+# ruff: disable=N999
 from PyInstaller.utils.hooks import copy_metadata  # pylint:disable=import-error
 
 datas = copy_metadata("flatten-dict")
diff --git a/dvc/__pyinstaller/hook-dvc_task.py b/dvc/__pyinstaller/hook-dvc_task.py
@@ -1,3 +1,4 @@
+# ruff: disable=N999
 # pylint: disable=import-error
 from PyInstaller.utils.hooks import collect_submodules
 
diff --git a/dvc/__pyinstaller/hook-fsspec.py b/dvc/__pyinstaller/hook-fsspec.py
@@ -1 +1,2 @@
+# ruff: disable=N999
 hiddenimports = ["fsspec.implementations.memory"]
diff --git a/dvc/__pyinstaller/hook-google_compute_engine.logger.py b/dvc/__pyinstaller/hook-google_compute_engine.logger.py
@@ -1,3 +1,4 @@
+# ruff: disable=N999
 from PyInstaller.utils.hooks import copy_metadata  # pylint:disable=import-error
 
 datas = copy_metadata("google-compute-engine")
diff --git a/dvc/__pyinstaller/hook-pydrive2.py b/dvc/__pyinstaller/hook-pydrive2.py
@@ -1,3 +1,4 @@
+# ruff: disable=N999
 from PyInstaller.utils.hooks import copy_metadata  # pylint:disable=import-error
 
 datas = copy_metadata("pydrive2")
diff --git a/pyproject.toml b/pyproject.toml
@@ -128,6 +128,10 @@ dvc = "dvc.api:DVCFileSystem"
 [project.entry-points."pytest11"]
 dvc-testing = "dvc.testing.plugin"
 
+[project.entry-points."pyinstaller40"]
+hook-dirs = "dvc.__pyinstaller:get_hook_dirs"
+tests = "dvc.__pyinstaller:get_PyInstaller_tests"
+
 [tool.setuptools]
 license-files = ["LICENSE"]
 
diff --git a/scripts/build-requirements.txt b/scripts/build-requirements.txt
diff --git a/scripts/pyinstaller/.gitignore b/scripts/pyinstaller/.gitignore
diff --git a/scripts/pyinstaller/build.py b/scripts/pyinstaller/build.py

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
	`1`	`+# ruff: disable=N999`
`1`	`2`	`hiddenimports = ["win32timezone"]`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+# ruff: disable=N999`
`1`	`2`	`# pylint: disable=import-error`
`2`	`3`	`from PyInstaller.utils.hooks import collect_submodules, is_module_or_submodule`
`3`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+# ruff: disable=N999`
`1`	`2`	`from PyInstaller.utils.hooks import copy_metadata # pylint:disable=import-error`
`2`	`3`
`3`	`4`	# needed for `dvc doctor` to show dep versions
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+# ruff: disable=N999`
`1`	`2`	`import os`
`2`	`3`
`3`	`4`	`if os.name == "nt":`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
	`1`	`+# ruff: disable=N999`
`1`	`2`	`hiddenimports = ["fsspec.implementations.memory"]`