diff options
| author | Willem Jan Palenstijn <wjp@usecode.org> | 2016-11-24 01:32:59 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-24 01:32:59 -0800 |
| commit | fc43ab40e6aaed28ecbeb904b3ec5d67f2ded77c (patch) | |
| tree | da2952ec9b32b3665fd3f3c4ed5a730b4a703c21 /python | |
| parent | 45415c92329fa3ae24f979a40081a91d0a167cd9 (diff) | |
| parent | 0a676373d38d1c5304577372666a94dc1af38081 (diff) | |
| download | astra-fc43ab40e6aaed28ecbeb904b3ec5d67f2ded77c.tar.gz astra-fc43ab40e6aaed28ecbeb904b3ec5d67f2ded77c.tar.bz2 astra-fc43ab40e6aaed28ecbeb904b3ec5d67f2ded77c.tar.xz astra-fc43ab40e6aaed28ecbeb904b3ec5d67f2ded77c.zip | |
Merge pull request #75 from wjp/install
Overhaul package installation
Diffstat (limited to 'python')
| -rw-r--r-- | python/builder.py | 11 | ||||
| -rw-r--r-- | python/conda/build.sh | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/python/builder.py b/python/builder.py index 243888b..1105169 100644 --- a/python/builder.py +++ b/python/builder.py @@ -64,6 +64,14 @@ if cfgHasToBeUpdated: cfg.write(cfgToWrite) cfg.close() + +pkgdata = { } +try: + if os.environ['ASTRA_INSTALL_LIBRARY_AS_DATA']: + pkgdata['astra'] = [os.environ['ASTRA_INSTALL_LIBRARY_AS_DATA']] +except KeyError: + pass + cmdclass = { } ext_modules = [ ] @@ -74,7 +82,7 @@ for m in ext_modules: if m.name == 'astra.plugin_c': m.sources.append('astra/src/PythonPluginAlgorithm.cpp') -setup (name = 'PyASTRAToolbox', +setup (name = 'astra-toolbox', version = '1.7.1', description = 'Python interface to the ASTRA-Toolbox', author='D.M. Pelt', @@ -88,5 +96,6 @@ setup (name = 'PyASTRAToolbox', cmdclass = cmdclass, #ext_modules = [Extension("astra","astra/astra.pyx")], packages=['astra', 'astra.plugins'], + package_data=pkgdata, requires=["numpy"], ) diff --git a/python/conda/build.sh b/python/conda/build.sh index 13ae3f8..fb3760c 100644 --- a/python/conda/build.sh +++ b/python/conda/build.sh @@ -5,4 +5,4 @@ if [ $MAKEOPTS == '<UNDEFINED>' ] then MAKEOPTS="" fi -make $MAKEOPTS python-root-install
\ No newline at end of file +make $MAKEOPTS install |