diff --git a/package/psyneulinkviewer/start.py b/package/psyneulinkviewer/start.py index 99903420..5444429c 100644 --- a/package/psyneulinkviewer/start.py +++ b/package/psyneulinkviewer/start.py @@ -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): @@ -206,4 +210,4 @@ def main(): prerequisites() if __name__ == "__main__": - main() \ No newline at end of file + main() diff --git a/package/scripts/linux_installer.sh b/package/scripts/linux_installer.sh index ad8624a8..9a0f9ece 100755 --- a/package/scripts/linux_installer.sh +++ b/package/scripts/linux_installer.sh @@ -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" diff --git a/package/scripts/mac_installer.sh b/package/scripts/mac_installer.sh index b9c55297..66b92690 100755 --- a/package/scripts/mac_installer.sh +++ b/package/scripts/mac_installer.sh @@ -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 diff --git a/package/setup.py b/package/setup.py index 6f617fd7..edf0a0f8 100644 --- a/package/setup.py +++ b/package/setup.py @@ -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',