remove pkg_resources #1148 (#1155)

AndreyNikiforov · web-flow · commit 033beb2a8ff4 · 2025-06-07T16:55:40.000-07:00
* remove pkg_resources

* bump pyinstaller &amp; setuptools

* remove pkg_resources refs

* normalize spaces in version

* remove --collect-all tzdata
diff --git a/Dockerfile.build b/Dockerfile.build
@@ -1,7 +1,7 @@
 # Multi-arch build (local):
 #     docker buildx create --use --driver=docker-container --name container --bootstrap
-#     docker buildx build . --cache-to type=local,dest=.cache,mode=max --cache-from type=local,src=.cache --platform=linux/amd64 --builder=container --progress plain -o dist -f Dockerfile.build
-# ,linux/arm64,linux/arm/v7
+#     docker buildx build . --cache-to type=local,dest=.cache,mode=max --cache-from type=local,src=.cache --platform=linux/arm64 --builder=container --progress plain -o dist -f Dockerfile.build
+# ,linux/amd64,linux/arm/v7
 # rust links from https://forge.rust-lang.org/infra/other-installation-methods.html#standalone-installers
 # arm7l instead of v6 issue: https://stackoverflow.com/questions/78535054/how-do-you-docker-buildx-build-for-arm-v6-on-qemu-emulated-platforms-that-pres
 
diff --git a/Dockerfile.build-musl b/Dockerfile.build-musl
@@ -1,7 +1,7 @@
 # Multi-arch build (local):
 #     docker buildx create --use --driver=docker-container --name container --bootstrap
-#     docker buildx build . --cache-to type=local,dest=.cache,mode=max --cache-from type=local,src=.cache --platform=linux/amd64 --builder=container --progress plain -o dist -f Dockerfile.build-musl
-# ,linux/arm64,linux/arm/v7
+#     docker buildx build . --cache-to type=local,dest=.cache,mode=max --cache-from type=local,src=.cache --platform=linux/arm64 --builder=container --progress plain -o dist -f Dockerfile.build-musl
+# ,linux/amd64,linux/arm/v7
 # rust links from https://forge.rust-lang.org/infra/other-installation-methods.html#standalone-installers
 
 # map source image to base
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [build-system]
 requires = [
-    "setuptools==75.6.0",
+    "setuptools==80.9.0",
     "wheel==0.45.1",
 ]
 build-backend = "setuptools.build_meta"
@@ -46,7 +46,7 @@ dependencies = [
 [project.optional-dependencies]
 dev = [
     "twine==6.0.1",
-    "pyinstaller==6.11.1",
+    "pyinstaller==6.14.0",
     "wheel==0.45.1",
     "furo==2024.8.6",
     "Sphinx==7.4.7",
diff --git a/scripts/build_bin1 b/scripts/build_bin1
@@ -6,4 +6,4 @@ set -euo pipefail
 # required params: <starter name1>
 # output: <starter name1>
 
-PYTHONHASHSEED=42 pyinstaller --collect-all keyrings.alt --copy-metadata keyrings.alt --hidden-import pkg_resources.extern --exclude-module pkg_resources --hidden-import pkgutil --collect-all tzdata --add-data "src/icloudpd/server/static:static" --add-data "src/icloudpd/server/templates:templates" --onefile src/starters/$1.py --name $1
+PYTHONHASHSEED=42 pyinstaller --collect-all keyrings.alt --copy-metadata keyrings.alt --hidden-import pkgutil --add-data "src/icloudpd/server/static:static" --add-data "src/icloudpd/server/templates:templates" --onefile src/starters/$1.py --name $1
diff --git a/scripts/build_bin2 b/scripts/build_bin2
@@ -6,4 +6,4 @@ set -euo pipefail
 # required params: <starter name1> <starter name2>
 # output: <starter name1>
 
-PYTHONHASHSEED=42 pyinstaller --collect-all keyrings.alt --copy-metadata keyrings.alt --hidden-import pkg_resources.extern --exclude-module pkg_resources --hidden-import pkgutil --collect-all tzdata --add-data "src/icloudpd/server/static:static" --add-data "src/icloudpd/server/templates:templates" --onefile src/starters/$1.py src/starters/$2.py --name $1
+PYTHONHASHSEED=42 pyinstaller --collect-all keyrings.alt --copy-metadata keyrings.alt --hidden-import pkgutil --add-data "src/icloudpd/server/static:static" --add-data "src/icloudpd/server/templates:templates" --onefile src/starters/$1.py src/starters/$2.py --name $1
diff --git a/scripts/build_bin_linux b/scripts/build_bin_linux
diff --git a/scripts/build_bin_linux_static b/scripts/build_bin_linux_static
diff --git a/scripts/build_bin_macos b/scripts/build_bin_macos
@@ -5,6 +5,6 @@ set -euo pipefail
 # expects python with installed dependencies
 # required params: version arch
 
-PYTHONHASHSEED=42 pyinstaller --collect-all keyrings.alt --copy-metadata keyrings.alt --hidden-import pkg_resources.extern --exclude-module pkg_resources --hidden-import pkgutil --collect-all tzdata --add-data "src/icloudpd/server/static:static" --add-data "src/icloudpd/server/templates:templates" --onefile src/starters/icloudpd.py src/starters/icloud.py --name icloudpd-$1-macos-$2
-PYTHONHASHSEED=42 pyinstaller --collect-all keyrings.alt --copy-metadata keyrings.alt --hidden-import pkg_resources.extern --exclude-module pkg_resources --hidden-import pkgutil --collect-all tzdata --add-data "src/icloudpd/server/static:static" --add-data "src/icloudpd/server/templates:templates" --onefile src/starters/icloud.py --name icloud-$1-macos-$2
-PYTHONHASHSEED=42 pyinstaller --collect-all keyrings.alt --copy-metadata keyrings.alt --hidden-import pkg_resources.extern --exclude-module pkg_resources --hidden-import pkgutil --collect-all tzdata --add-data "src/icloudpd/server/static:static" --add-data "src/icloudpd/server/templates:templates" --onefile src/starters/icloudpd_ex.py --name icloudpd-ex-$1-macos-$2
+PYTHONHASHSEED=42 pyinstaller --collect-all keyrings.alt --copy-metadata keyrings.alt --hidden-import pkgutil --add-data "src/icloudpd/server/static:static" --add-data "src/icloudpd/server/templates:templates" --onefile src/starters/icloudpd.py src/starters/icloud.py --name icloudpd-$1-macos-$2
+PYTHONHASHSEED=42 pyinstaller --collect-all keyrings.alt --copy-metadata keyrings.alt --hidden-import pkgutil --add-data "src/icloudpd/server/static:static" --add-data "src/icloudpd/server/templates:templates" --onefile src/starters/icloud.py --name icloud-$1-macos-$2
+PYTHONHASHSEED=42 pyinstaller --collect-all keyrings.alt --copy-metadata keyrings.alt --hidden-import pkgutil --add-data "src/icloudpd/server/static:static" --add-data "src/icloudpd/server/templates:templates" --onefile src/starters/icloudpd_ex.py --name icloudpd-ex-$1-macos-$2
diff --git a/scripts/build_bin_windows b/scripts/build_bin_windows
@@ -5,6 +5,6 @@ set -euo pipefail
 # expects python with installed dependencies
 # required param: version arch
 
-PYTHONHASHSEED=42 pyinstaller --collect-all keyrings.alt --copy-metadata keyrings.alt --hidden-import pkg_resources.extern --exclude-module pkg_resources --hidden-import pkgutil --collect-all tzdata --add-data "src/icloudpd/server/static;static" --add-data "src/icloudpd/server/templates;templates" --onefile src/starters/icloudpd.py src/starters/icloud.py --name icloudpd-$1-windows-$2
-PYTHONHASHSEED=42 pyinstaller --collect-all keyrings.alt --copy-metadata keyrings.alt --hidden-import pkg_resources.extern --exclude-module pkg_resources --hidden-import pkgutil --collect-all tzdata --add-data "src/icloudpd/server/static;static" --add-data "src/icloudpd/server/templates;templates" --onefile src/starters/icloud.py --name icloud-$1-windows-$2
-PYTHONHASHSEED=42 pyinstaller --collect-all keyrings.alt --copy-metadata keyrings.alt --hidden-import pkg_resources.extern --exclude-module pkg_resources --hidden-import pkgutil --collect-all tzdata --add-data "src/icloudpd/server/static;static" --add-data "src/icloudpd/server/templates;templates" --onefile src/starters/icloudpd_ex.py --name icloudpd-ex-$1-windows-$2
+PYTHONHASHSEED=42 pyinstaller --collect-all keyrings.alt --copy-metadata keyrings.alt --hidden-import pkgutil --add-data "src/icloudpd/server/static;static" --add-data "src/icloudpd/server/templates;templates" --onefile src/starters/icloudpd.py src/starters/icloud.py --name icloudpd-$1-windows-$2
+PYTHONHASHSEED=42 pyinstaller --collect-all keyrings.alt --copy-metadata keyrings.alt --hidden-import pkgutil --add-data "src/icloudpd/server/static;static" --add-data "src/icloudpd/server/templates;templates" --onefile src/starters/icloud.py --name icloud-$1-windows-$2
+PYTHONHASHSEED=42 pyinstaller --collect-all keyrings.alt --copy-metadata keyrings.alt --hidden-import pkgutil --add-data "src/icloudpd/server/static;static" --add-data "src/icloudpd/server/templates;templates" --onefile src/starters/icloudpd_ex.py --name icloudpd-ex-$1-windows-$2
diff --git a/src/foundation/__init__.py b/src/foundation/__init__.py
@@ -24,7 +24,7 @@ def version_info_formatted() -> str:
     ts = datetime.datetime.fromtimestamp(vi.commit_timestamp, tz=pytz.utc).astimezone(
         get_localzone()
     )
-    return f"version:{vi.version}, commit sha:{vi.commit_sha}, commit timestamp:{ts:%c %Z}"
+    return f"version:{vi.version}, commit sha:{vi.commit_sha}, commit timestamp:{ts:%c %Z}".replace("  ", " ")
 
 
 def bytes_decode(encoding: str) -> Callable[[bytes], str]:

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ def version_info_formatted() -> str:`
`24`	`24`	`ts = datetime.datetime.fromtimestamp(vi.commit_timestamp, tz=pytz.utc).astimezone(`
`25`	`25`	`get_localzone()`
`26`	`26`	`)`
`27`		`- return f"version:{vi.version}, commit sha:{vi.commit_sha}, commit timestamp:{ts:%c %Z}"`
	`27`	`+ return f"version:{vi.version}, commit sha:{vi.commit_sha}, commit timestamp:{ts:%c %Z}".replace(" ", " ")`
`28`	`28`
`29`	`29`
`30`	`30`	`def bytes_decode(encoding: str) -> Callable[[bytes], str]:`