From e175149db954d5698c9fbaeaeca0dd1d6ed0e44b Mon Sep 17 00:00:00 2001 From: Alexandre D'Astous Date: Wed, 17 Jan 2024 17:25:03 -0500 Subject: [PATCH] Upgrade to python 3.10 --- installer/install_plugin.sh | 2 +- installer/install_shimming_toolbox.sh | 2 +- setup.py | 12 ------------ 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/installer/install_plugin.sh b/installer/install_plugin.sh index 36a83d6..125e6d7 100644 --- a/installer/install_plugin.sh +++ b/installer/install_plugin.sh @@ -35,7 +35,7 @@ source "${ST_DIR}/${PYTHON_DIR}/bin/activate" # Install fsleyes print info "Installing fsleyes" -"${ST_DIR}"/"${PYTHON_DIR}"/bin/mamba install -y -c conda-forge fsleyes=1.9.0 python=3.9 +"${ST_DIR}"/"${PYTHON_DIR}"/bin/mamba install -y -c conda-forge fsleyes=1.9.0 python=3.10 # Install fsleyes-plugin-shimming-toolbox print info "Installing fsleyes-plugin-shimming-toolbox" diff --git a/installer/install_shimming_toolbox.sh b/installer/install_shimming_toolbox.sh index c7e7684..f09553f 100644 --- a/installer/install_shimming_toolbox.sh +++ b/installer/install_shimming_toolbox.sh @@ -14,7 +14,7 @@ rm -rf "${ST_DIR}/shimming-toolbox" print info "Downloading Shimming-Toolbox" -ST_VERSION="072aaa8b47ab7ded0e7a2f5256ea37af0f038c9f" +ST_VERSION="857908fc08ad24845b219e872893487be065a4ee" curl -L "https://github.com/shimming-toolbox/shimming-toolbox/archive/${ST_VERSION}.zip" > "shimming-toolbox-${ST_VERSION}.zip" diff --git a/setup.py b/setup.py index 0a6641e..844df0d 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,6 @@ from setuptools import setup, find_packages setup( - # the name must begin with "fsleyes-plugin-" name='fsleyes-plugin-shimming-toolbox', install_requires=[ "imageio", @@ -9,23 +8,12 @@ ], packages=find_packages(exclude=['.git']), include_package_data=True, - - # Views, controls, and tools must be exposed - # as entry points within groups called - # "fsleyes_views", "fsleyes_controls" and - # "fsleyes_tools" respectively. entry_points={ - # 'fsleyes_views': [ - # 'My cool view = myplugin:MyView' - # ], 'fsleyes_controls': [ 'Shimming Toolbox = fsleyes_plugin_shimming_toolbox.st_plugin:STControlPanel' ], 'fsleyes_layouts': [ 'Shimming Toolbox = fsleyes_plugin_shimming_toolbox.st_plugin:STLayout' ], - # 'fsleyes_tools': [ - # 'My cool tool = myplugin:MyTool' - # ] } )