diff --git a/plugins.txt b/plugins.txt deleted file mode 100644 index 0484ff09..00000000 --- a/plugins.txt +++ /dev/null @@ -1,3 +0,0 @@ -pysap-astro==v0.0.2 -pysap-mri==v0.5.0 -pysap-etomo==v0.0.2 diff --git a/pysap/info.py b/pysap/info.py index 216aab66..e0e5e429 100644 --- a/pysap/info.py +++ b/pysap/info.py @@ -10,7 +10,7 @@ # Module current version version_major = 0 version_minor = 2 -version_micro = 0 +version_micro = 1 # Expected by setup.py: string of form "X.Y.Z" __version__ = '{0}.{1}.{2}'.format(version_major, version_minor, version_micro) diff --git a/setup.py b/setup.py index 9266321d..eebe405d 100644 --- a/setup.py +++ b/setup.py @@ -40,10 +40,6 @@ os.path.join('pysap', 'apps', 'pysapview3') ] -# Source PySAP plug-ins -this_directory = os.path.abspath(os.path.dirname(__file__)) -with open(os.path.join(this_directory, 'plugins.txt')) as f: - pysap_plugins = f.read().splitlines() # Workaround rm_args = [] @@ -77,66 +73,6 @@ sys.argv.remove(arg) -def check_plugins(plugin_list): - """Check if requested plug-ins exist.""" - - if not isinstance(plugin_list, list): - raise TypeError('Plug-in list must be of type list.') - - plugins_dict = dict([ - _plugin.split('==') for _plugin in pysap_plugins - ]) - allowed_plugins = plugins_dict.keys() - - only_pinned = [] - for plugin in plugin_list: - if plugin not in allowed_plugins: - raise ValueError( - '"{0}" is not currently a valid PySAP plug-in'.format(plugin) - + '\nAvailable PySAP plug-ins are: ' - + '{0}\n'.format(list(allowed_plugins)) - ) - only_pinned.append( - '{0}=={1}'.format(plugin, plugins_dict[plugin]) - ) - - return only_pinned - - -def pipinstall(package_list): - """Pip install PyPi packages.""" - - if not isinstance(package_list, list): - raise TypeError('Pre-install inputs must be of type list.') - - for package in package_list: - subprocess.check_call( - [sys.executable, '-m', 'pip', 'install', package] - ) - - -def install_plugins(): - """Install Plug-Ins.""" - - plugin_list = pysap_plugins - if only_plugins: - plugin_list = check_plugins(only_plugins) - elif no_plugins: - plugin_list = [] - - pipinstall(plugin_list) - - print('\nPySAP plug-ins installed: {0}\n'.format(plugin_list)) - - -class CustomInstall(install): - """Custom Install Class.""" - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - atexit.register(install_plugins) - - class CMakeExtension(Extension): """Use absolute path in setuptools extension.""" def __init__(self, name, sourcedir=''): @@ -254,7 +190,7 @@ def run(self): # Set default values for ext_modules and cmdclass ext_modules = None -cmdclass = {'install': CustomInstall} +cmdclass = {'install': install} # Add Sparse2D build commands if build_sparse2d: