From d4e166cb6dc60fc183185da2eb29bcbf96706d61 Mon Sep 17 00:00:00 2001 From: Sylvain Tricot Date: Tue, 26 May 2020 13:50:23 +0200 Subject: [PATCH 1/2] Remove variant_dir in SConstruct. The f2py *.so suffix is not consistent with python virtualenv version. By using the source dir it is easier to fix manually since the *.so are not installed --- src/SConstruct | 6 ++++-- src/msspec/phagen/fortran/SConstruct | 2 +- src/msspec/spec/fortran/SConstruct | 8 ++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/SConstruct b/src/SConstruct index a95c803..e2273db 100644 --- a/src/SConstruct +++ b/src/SConstruct @@ -87,5 +87,7 @@ if GetOption('verbose'): Export('env') -SConscript('msspec/spec/fortran/SConstruct', variant_dir='build/build_spec') -SConscript('msspec/phagen/fortran/SConstruct', variant_dir='build/build_phagen') +SConscript('msspec/spec/fortran/SConstruct') +SConscript('msspec/phagen/fortran/SConstruct') +#SConscript('msspec/spec/fortran/SConstruct', variant_dir='build/build_spec') +#SConscript('msspec/phagen/fortran/SConstruct', variant_dir='build/build_phagen') diff --git a/src/msspec/phagen/fortran/SConstruct b/src/msspec/phagen/fortran/SConstruct index c83bfdd..d1bde7e 100644 --- a/src/msspec/phagen/fortran/SConstruct +++ b/src/msspec/phagen/fortran/SConstruct @@ -5,6 +5,6 @@ objects_src= ['phagen_scf_2.1_dp.f'] objects = env.Object(objects_src) module = env.F2py('libphagen', ['main.f'] + objects, F2PYCOMSTR=">>") -env.InstallModule(module) +#env.InstallModule(module) env.Alias('phagen', module) diff --git a/src/msspec/spec/fortran/SConstruct b/src/msspec/spec/fortran/SConstruct index 3fd43b2..8b33576 100644 --- a/src/msspec/spec/fortran/SConstruct +++ b/src/msspec/spec/fortran/SConstruct @@ -46,19 +46,19 @@ common_deps = dim_mod_obj + memalloc_obj + cluster_gen_obj + common_sub_obj deps = common_deps + renormalization_obj + phd_se_noso_nosp_nosym_obj phd_se_mod = env_spec.F2py('_phd_se_noso_nosp_nosym', ['phd_se_noso_nosp_nosym/main.f'] + deps) -env_spec.InstallModule(phd_se_mod) +#env_spec.InstallModule(phd_se_mod) deps = common_deps + renormalization_obj + phd_mi_noso_nosp_nosym_obj phd_mi_mod = env_spec.F2py('_phd_mi_noso_nosp_nosym', ['phd_mi_noso_nosp_nosym/main.f'] + deps) -env_spec.InstallModule(phd_mi_mod) +#env_spec.InstallModule(phd_mi_mod) deps = common_deps + renormalization_obj + eig_common_obj + eig_mi_obj eig_mi_mod = env_spec.F2py('_eig_mi', ['eig/mi/main.f'] + deps) -env_spec.InstallModule(eig_mi_mod) +#env_spec.InstallModule(eig_mi_mod) deps = common_deps + renormalization_obj + eig_common_obj + eig_pw_obj eig_pw_mod = env_spec.F2py('_eig_pw', ['eig/pw/main.f'] + deps) -env_spec.InstallModule(eig_pw_mod) +#env_spec.InstallModule(eig_pw_mod) # Alias env_spec.Alias('spec', [phd_se_mod, phd_mi_mod, eig_pw_mod, eig_mi_mod]) From 0cc4419f9bcd199d55e330b361cc30ed2f8363a7 Mon Sep 17 00:00:00 2001 From: Sylvain Tricot Date: Tue, 26 May 2020 13:52:15 +0200 Subject: [PATCH 2/2] Remove WxPython from the list since the latest version is no more compatible with msspec :-( We need to install it manually using the wheel of their website for the moment --- src/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/requirements.txt b/src/requirements.txt index 0cccd8d..78c75f9 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -7,4 +7,4 @@ pint terminaltables pycairo setuptools_scm -wxPython +#wxPython