From b80151ce9301d0de7339133d8bf0d744a829ab29 Mon Sep 17 00:00:00 2001 From: ddelpiano Date: Mon, 27 Jan 2025 22:53:11 +0100 Subject: [PATCH 1/3] pushing to remote --- package/psyneulinkviewer/start.py | 4 ++-- package/setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/psyneulinkviewer/start.py b/package/psyneulinkviewer/start.py index 99903420..8f03ac8f 100644 --- a/package/psyneulinkviewer/start.py +++ b/package/psyneulinkviewer/start.py @@ -144,7 +144,7 @@ def continue_on_conda(): check_rosetta_installation() check_node_installation() check_graphviz() - check_psyneulink() + # check_psyneulink() get_latest_release(os.path.dirname(os.path.realpath(__file__))) def update_env_variable(var_name, var_value): @@ -206,4 +206,4 @@ def main(): prerequisites() if __name__ == "__main__": - main() \ No newline at end of file + main() diff --git a/package/setup.py b/package/setup.py index 6f617fd7..53adaebc 100644 --- a/package/setup.py +++ b/package/setup.py @@ -76,7 +76,7 @@ def run(self): setup( name="psyneulinkviewer", - version="0.5", + version="0.5.3", url='https://github.com/metacell/psyneulinkviewer', author='metacell', author_email='dev@metacell.us', From 1e2ce4390c7041c1d220136c338ccec6013547df Mon Sep 17 00:00:00 2001 From: jrmartin Date: Mon, 27 Jan 2025 14:18:43 -0800 Subject: [PATCH 2/3] Install psyneulink as part of the mac_installer and linux_installer --- package/scripts/linux_installer.sh | 1 + package/scripts/mac_installer.sh | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/scripts/linux_installer.sh b/package/scripts/linux_installer.sh index ad8624a8..d3821c3b 100755 --- a/package/scripts/linux_installer.sh +++ b/package/scripts/linux_installer.sh @@ -30,6 +30,7 @@ rm -rf "/usr/local/bin/psyneulinkviewer" # Kill any existing rpc_server instances ps aux | grep rpc_server | grep -v grep | awk '{print $2}' | xargs kill -9 +pip install psyneulink 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 diff --git a/package/scripts/mac_installer.sh b/package/scripts/mac_installer.sh index b9c55297..647c1b74 100755 --- a/package/scripts/mac_installer.sh +++ b/package/scripts/mac_installer.sh @@ -30,8 +30,9 @@ rm -rf "$DESKTOP_PATH/$SHORTCUT_NAME.app" ps aux | grep rpc_server | grep -v grep | awk '{print $2}' | xargs kill -9 +pip install psyneulink pip uninstall psyneulinkviewer --break-system-packages && pip cache purge -pip install -vv psyneulinkviewer --break-system-packages --use-pep517 && source ~/.bashrc_profile +pip install -vv psyneulinkviewer --break-system-packages --use-pep517 --no-build-isolation && source ~/.bashrc_profile check_last_command # Create .app structure From 550b92b390147d191510ae91d640b45394558785 Mon Sep 17 00:00:00 2001 From: ddelpiano Date: Tue, 28 Jan 2025 12:52:13 +0100 Subject: [PATCH 3/3] polishing the installation and publishing the latest --- package/psyneulinkviewer/start.py | 4 ++++ package/scripts/linux_installer.sh | 5 +++-- package/scripts/mac_installer.sh | 3 ++- package/setup.py | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/package/psyneulinkviewer/start.py b/package/psyneulinkviewer/start.py index 8f03ac8f..5444429c 100644 --- a/package/psyneulinkviewer/start.py +++ b/package/psyneulinkviewer/start.py @@ -144,6 +144,10 @@ def continue_on_conda(): check_rosetta_installation() check_node_installation() check_graphviz() + # 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__))) diff --git a/package/scripts/linux_installer.sh b/package/scripts/linux_installer.sh index d3821c3b..9a0f9ece 100755 --- a/package/scripts/linux_installer.sh +++ b/package/scripts/linux_installer.sh @@ -30,9 +30,10 @@ rm -rf "/usr/local/bin/psyneulinkviewer" # Kill any existing rpc_server instances ps aux | grep rpc_server | grep -v grep | awk '{print $2}' | xargs kill -9 -pip install psyneulink 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" diff --git a/package/scripts/mac_installer.sh b/package/scripts/mac_installer.sh index 647c1b74..66b92690 100755 --- a/package/scripts/mac_installer.sh +++ b/package/scripts/mac_installer.sh @@ -30,8 +30,9 @@ rm -rf "$DESKTOP_PATH/$SHORTCUT_NAME.app" ps aux | grep rpc_server | grep -v grep | awk '{print $2}' | xargs kill -9 -pip install psyneulink pip uninstall psyneulinkviewer --break-system-packages && pip cache purge + +pip install psyneulink pip install -vv psyneulinkviewer --break-system-packages --use-pep517 --no-build-isolation && source ~/.bashrc_profile check_last_command diff --git a/package/setup.py b/package/setup.py index 53adaebc..edf0a0f8 100644 --- a/package/setup.py +++ b/package/setup.py @@ -76,7 +76,7 @@ def run(self): setup( name="psyneulinkviewer", - version="0.5.3", + version="0.6.0", url='https://github.com/metacell/psyneulinkviewer', author='metacell', author_email='dev@metacell.us',