guilhem_lavaux/cosmotool
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update version

Browse Source
This commit is contained in:
Guilhem Lavaux 2023-04-23 12:44:12 +02:00
parent 05ac03fb7a
commit d8b58bd8f1
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
setup.py
View File

@ -76,9 +76,9 @@ class InstallCMakeLibs(install_lib):
# # your files are moved to the appropriate location when the installation # # your files are moved to the appropriate location when the installation
# # is run # # is run
# #
# libs = [os.path.join(bin_dir, _lib) for _lib in # libs = [os.path.join(bin_dir, _lib) for _lib in
# os.listdir(bin_dir) if # os.listdir(bin_dir) if
# os.path.isfile(os.path.join(bin_dir, _lib)) and # os.path.isfile(os.path.join(bin_dir, _lib)) and
# os.path.splitext(_lib)[1] in [".dll", ".so"] # os.path.splitext(_lib)[1] in [".dll", ".so"]
# and not (_lib.startswith("python") or _lib.startswith(PACKAGE_NAME))] # and not (_lib.startswith("python") or _lib.startswith(PACKAGE_NAME))]
# #
@ -87,16 +87,16 @@ class InstallCMakeLibs(install_lib):
# shutil.move(lib, os.path.join(self.build_dir, # shutil.move(lib, os.path.join(self.build_dir,
# os.path.basename(lib))) # os.path.basename(lib)))
# #
# # Mark the libs for installation, adding them to # # Mark the libs for installation, adding them to
# # distribution.data_files seems to ensure that setuptools' record # # distribution.data_files seems to ensure that setuptools' record
# # writer appends them to installed-files.txt in the package's egg-info # # writer appends them to installed-files.txt in the package's egg-info
# # # #
# # Also tried adding the libraries to the distribution.libraries list, # # Also tried adding the libraries to the distribution.libraries list,
# # but that never seemed to add them to the installed-files.txt in the # # but that never seemed to add them to the installed-files.txt in the
# # egg-info, and the online recommendation seems to be adding libraries # # egg-info, and the online recommendation seems to be adding libraries
# # into eager_resources in the call to setup(), which I think puts them # # into eager_resources in the call to setup(), which I think puts them
# # in data_files anyways. # # in data_files anyways.
# # # #
# # What is the best way? # # What is the best way?
# #
# # These are the additional installation files that should be # # These are the additional installation files that should be
@ -104,7 +104,7 @@ class InstallCMakeLibs(install_lib):
# # step; depending on the files that are generated from your cmake # # step; depending on the files that are generated from your cmake
# # build chain, you may need to modify the below code # # build chain, you may need to modify the below code
# #
# self.distribution.data_files = [os.path.join(self.install_dir, # self.distribution.data_files = [os.path.join(self.install_dir,
# os.path.basename(lib)) # os.path.basename(lib))
# for lib in libs] # for lib in libs]
# print(self.distribution.data_files) # print(self.distribution.data_files)
@ -213,7 +213,7 @@ class BuildCMakeExt(build_ext):
if _pyd_top[0].startswith(PACKAGE_NAME): if _pyd_top[0].startswith(PACKAGE_NAME):
if os.path.splitext(_pyd)[1] in [".pyd", ".so"] or _pyd_top[-1] == 'config.py': if os.path.splitext(_pyd)[1] in [".pyd", ".so"] or _pyd_top[-1] == 'config.py':
pyd_path.append((_pyd_top,_pyd)) pyd_path.append((_pyd_top,_pyd))
for top,p in pyd_path: for top,p in pyd_path:
_,n = os.path.split(p) _,n = os.path.split(p)
@ -229,7 +229,7 @@ class BuildCMakeExt(build_ext):
CosmoTool_extension = CMakeExtension(name="cosmotool") CosmoTool_extension = CMakeExtension(name="cosmotool")
setup(name='cosmotool', setup(name='cosmotool',
version='1.3.2', version='1.3.3',
packages=["cosmotool"], packages=["cosmotool"],
package_dir={'cosmotool': 'python/cosmotool'}, package_dir={'cosmotool': 'python/cosmotool'},
install_requires=['numpy','cffi','numexpr','pyfftw','h5py'], install_requires=['numpy','cffi','numexpr','pyfftw','h5py'],