Skip to content

Feature/fix installation2 #180

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

Merged
ddelpiano merged 3 commits into from
Jan 28, 2025
Merged

Feature/fix installation2 #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b80151c
pushing to remote
ddelpiano Jan 27, 2025
1e2ce43
Install psyneulink as part of the mac_installer and linux_installer
jrmartin Jan 27, 2025
550b92b
polishing the installation and publishing the latest
ddelpiano Jan 28, 2025
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: 6 additions & 2 deletions package/psyneulinkviewer/start.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,11 @@ def continue_on_conda():
check_rosetta_installation()
check_node_installation()
check_graphviz()
check_psyneulink()
# Note, the psyneulink installation is executed outside this script, in the bash script
# due to the --no-build-isolation flag that is required to grab the conda local installation
# if you want to install it here, uncomment the line below but also find a different approach
# to retrieve the conda version in the conda.py module.
# check_psyneulink()
get_latest_release(os.path.dirname(os.path.realpath(__file__)))

def update_env_variable(var_name, var_value):
Expand Down Expand Up @@ -206,4 +210,4 @@ def main():
prerequisites()

if __name__ == "__main__":
main()
main()
4 changes: 3 additions & 1 deletion package/scripts/linux_installer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ rm -rf "/usr/local/bin/psyneulinkviewer"
ps aux | grep rpc_server | grep -v grep | awk '{print $2}' | xargs kill -9

pip uninstall psyneulinkviewer && pip cache purge
pip install -vv psyneulinkviewer --break-system-packages --use-pep517 && . ~/.profile && sudo chown root:root /usr/local/bin/psyneulinkviewer-linux-x64/chrome-sandbox && sudo chmod 4755 /usr/local/bin/psyneulinkviewer-linux-x64/chrome-sandbox

pip install psyneulink
pip install -vv psyneulinkviewer --break-system-packages --use-pep517 --no-build-isolation && . ~/.profile && sudo chown root:root /usr/local/bin/psyneulinkviewer-linux-x64/chrome-sandbox && sudo chmod 4755 /usr/local/bin/psyneulinkviewer-linux-x64/chrome-sandbox

# Creating the .desktop file for the application
echo "[Desktop Entry]" > "$DESKTOP_FILE"
Expand Down
4 changes: 3 additions & 1 deletion package/scripts/mac_installer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ rm -rf "$DESKTOP_PATH/$SHORTCUT_NAME.app"
ps aux | grep rpc_server | grep -v grep | awk '{print $2}' | xargs kill -9

pip uninstall psyneulinkviewer --break-system-packages && pip cache purge
pip install -vv psyneulinkviewer --break-system-packages --use-pep517 && source ~/.bashrc_profile

pip install psyneulink
pip install -vv psyneulinkviewer --break-system-packages --use-pep517 --no-build-isolation && source ~/.bashrc_profile
check_last_command

# Create .app structure
Expand Down
2 changes: 1 addition & 1 deletion package/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def run(self):

setup(
name="psyneulinkviewer",
version="0.5",
version="0.6.0",
url='https://github.com/metacell/psyneulinkviewer',
author='metacell',
author_email='dev@metacell.us',
Expand Down