Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

compas_rhino.uninstall updated for ipy rhino8 #1383

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

compas_rhino.uninstall updated for ipy rhino8 #1383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/compas_rhino/install.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,12 @@ def install(version=None, packages=None, clean=False):
"""
version = compas_rhino._check_rhino_version(version)

# We install COMPAS packages in the scripts folder
# instead of directly as IPy module.
# scripts_path = compas_rhino._get_rhino_scripts_path(version)

# In Rhino 8 there is no scripts folder
if version == "8.0":
# In Rhino 8 there is no scripts folder
installation_path = compas_rhino._get_default_rhino_ironpython_sitepackages_path(version)
else:
# We install COMPAS packages in the scripts folder
# instead of directly as IPy module.
installation_path = compas_rhino._get_rhino_scripts_path(version)

# This is for old installs
Expand Down
22 changes: 13 additions & 9 deletions src/compas_rhino/uninstall.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,13 @@ def uninstall(version=None, packages=None):
"""
version = compas_rhino._check_rhino_version(version)

# We install COMPAS packages in the scripts folder
# instead of directly as IPy module.
scripts_path = compas_rhino._get_rhino_scripts_path(version)
if version == "8.0":
# In Rhino 8 there is no scripts folder
installation_path = compas_rhino._get_default_rhino_ironpython_sitepackages_path(version)
else:
# We install COMPAS packages in the scripts folder
# instead of directly as IPy module.
installation_path = compas_rhino._get_rhino_scripts_path(version)
Comment on lines +43 to +49
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we perhaps do both?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the goal of uninstalling is to remove all traces of packages, so perhaps we should try removing them from all possible locations...


# This is for old installs
ipylib_path = compas_rhino._get_rhino_ironpython_lib_path(version)
Expand All @@ -54,8 +58,8 @@ def uninstall(version=None, packages=None):

# Also remove all broken symlinks
# because ... they're broken!
for name in os.listdir(scripts_path):
path = os.path.join(scripts_path, name)
for name in os.listdir(installation_path):
path = os.path.join(installation_path, name)
if os.path.islink(path):
if not os.path.exists(path):
if name not in packages:
Expand All @@ -65,7 +69,7 @@ def uninstall(version=None, packages=None):
symlinks_to_uninstall = []

for package in packages:
symlink_path = os.path.join(scripts_path, package)
symlink_path = os.path.join(installation_path, package)
symlinks_to_uninstall.append(dict(name=package, link=symlink_path))

# Handle legacy install location
Expand All @@ -78,7 +82,7 @@ def uninstall(version=None, packages=None):

# There is nothing to uninstall
if not symlinks_to_uninstall:
print("\nNo packages to uninstall from Rhino {0} scripts folder: \n{1}.".format(version, scripts_path))
print("\nNo packages to uninstall from Rhino {0} scripts folder: \n{1}.".format(version, installation_path))
return

# -------------------------
Expand Down Expand Up @@ -113,7 +117,7 @@ def uninstall(version=None, packages=None):
)

else:
if compas_rhino._try_remove_bootstrapper(scripts_path):
if compas_rhino._try_remove_bootstrapper(installation_path):
results.append(("compas_bootstrapper", "OK"))
else:
results.append(
Expand All @@ -138,7 +142,7 @@ def uninstall(version=None, packages=None):
# Output results
# -------------------------

print("Uninstalling COMPAS packages from Rhino {0} scripts folder: \n{1}".format(version, scripts_path))
print("Uninstalling COMPAS packages from Rhino {0} scripts folder: \n{1}".format(version, installation_path))
print("\nThe following packages have been detected and will be uninstalled:\n")

for package, status in results:
Expand Down
Loading