Reverted httpx to version 0.24.1 to address the ‘socket_options’ issue.
parent
209eaea5ed
commit
4d8ccde513
57
install.py
57
install.py
|
|
@ -19,18 +19,27 @@ if auto_update:
|
||||||
print("[Auto-Photoshop-SD] Attempting auto-update...")
|
print("[Auto-Photoshop-SD] Attempting auto-update...")
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
checkout_result = run(
|
||||||
|
f'"{git}" -C "{REPO_LOCATION}" checkout {extension_branch}',
|
||||||
|
"[Auto-Photoshop-SD] switch branch to extension branch.",
|
||||||
|
)
|
||||||
|
print("checkout_result:", checkout_result)
|
||||||
|
|
||||||
checkout_result = run(f'"{git}" -C "{REPO_LOCATION}" checkout {extension_branch}', "[Auto-Photoshop-SD] switch branch to extension branch.")
|
branch_result = run(
|
||||||
print("checkout_result:",checkout_result)
|
f'"{git}" -C "{REPO_LOCATION}" branch',
|
||||||
|
"[Auto-Photoshop-SD] Current Branch.",
|
||||||
|
)
|
||||||
|
print("branch_result:", branch_result)
|
||||||
|
|
||||||
branch_result = run(f'"{git}" -C "{REPO_LOCATION}" branch', "[Auto-Photoshop-SD] Current Branch.")
|
fetch_result = run(
|
||||||
print("branch_result:",branch_result)
|
f'"{git}" -C "{REPO_LOCATION}" fetch', "[Auto-Photoshop-SD] Fetch upstream."
|
||||||
|
)
|
||||||
|
print("fetch_result:", fetch_result)
|
||||||
|
|
||||||
fetch_result = run(f'"{git}" -C "{REPO_LOCATION}" fetch', "[Auto-Photoshop-SD] Fetch upstream.")
|
pull_result = run(
|
||||||
print("fetch_result:",fetch_result)
|
f'"{git}" -C "{REPO_LOCATION}" pull', "[Auto-Photoshop-SD] Pull upstream."
|
||||||
|
)
|
||||||
pull_result = run(f'"{git}" -C "{REPO_LOCATION}" pull', "[Auto-Photoshop-SD] Pull upstream.")
|
print("pull_result:", pull_result)
|
||||||
print("pull_result:",pull_result)
|
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print("[Auto-Photoshop-SD] Auto-update failed:")
|
print("[Auto-Photoshop-SD] Auto-update failed:")
|
||||||
|
|
@ -39,15 +48,27 @@ if auto_update:
|
||||||
|
|
||||||
|
|
||||||
# print("Auto-Photoshop-SD plugin is installing")
|
# print("Auto-Photoshop-SD plugin is installing")
|
||||||
|
import pkg_resources
|
||||||
|
|
||||||
package_name = 'duckduckgo_search'
|
|
||||||
package_version= '3.9.9'
|
|
||||||
if not launch.is_installed(package_name):
|
|
||||||
launch.run_pip(f"install {package_name}=={package_version}", "requirements for Auto-Photoshop Image Search")
|
|
||||||
else:# it's installed but we need to check for update
|
|
||||||
import pkg_resources
|
|
||||||
|
|
||||||
|
def install_or_update_package(package_name, package_version):
|
||||||
|
if not launch.is_installed(package_name):
|
||||||
|
launch.run_pip(
|
||||||
|
f"install {package_name}=={package_version}",
|
||||||
|
"requirements for Auto-Photoshop Image Search",
|
||||||
|
)
|
||||||
|
else: # it's installed but we need to check for update
|
||||||
version = pkg_resources.get_distribution(package_name).version
|
version = pkg_resources.get_distribution(package_name).version
|
||||||
if(version != package_version):
|
if version != package_version:
|
||||||
print(f'{package_name} version: {version} will update to version: {package_version}')
|
print(
|
||||||
launch.run_pip(f"install {package_name}=={package_version}", "update requirements for Auto-Photoshop Image Search")
|
f"{package_name} version: {version} will update to version: {package_version}"
|
||||||
|
)
|
||||||
|
launch.run_pip(
|
||||||
|
f"install {package_name}=={package_version}",
|
||||||
|
"update requirements for Auto-Photoshop Image Search",
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
# Now we can use this function to install or update the packages
|
||||||
|
install_or_update_package("duckduckgo_search", "3.9.9")
|
||||||
|
install_or_update_package("httpx", "0.24.1")
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue