change python build directory

so that we can use the real include in the tests

CMakeLists.txt

@@ -45,7 +45,7 @@ add_subdirectory(fortran/dmftproj)
 message(STATUS "TRIQS : Adding compilation flags detected by the library (C++11/14, libc++, etc...) ")
 
 add_subdirectory(c++)
-add_subdirectory(python)
+add_subdirectory(python python/triqs_dft_tools)
 add_subdirectory(shells)
 
 #------------------------

test/analyse_block_structure_from_gf.py

@@ -1,5 +1,5 @@
 from pytriqs.gf import *
-from sumk_dft import SumkDFT
+from triqs_dft_tools.sumk_dft import SumkDFT
 from scipy.linalg import expm
 import numpy as np
 from pytriqs.utility.comparison_tests import assert_gfs_are_close, assert_arrays_are_close, assert_block_gfs_are_close

test/analyse_block_structure_from_gf2.py

@@ -1,5 +1,5 @@
 from pytriqs.gf import *
-from sumk_dft import SumkDFT
+from triqs_dft_tools.sumk_dft import SumkDFT
 import numpy as np
 from pytriqs.utility.comparison_tests import assert_block_gfs_are_close
 

test/blockstructure.py

@@ -1,8 +1,8 @@
-from sumk_dft import *
+from triqs_dft_tools.sumk_dft import *
 from pytriqs.utility.h5diff import h5diff
 from pytriqs.gf import *
 from pytriqs.utility.comparison_tests import assert_block_gfs_are_close
-from block_structure import BlockStructure
+from triqs_dft_tools.block_structure import BlockStructure
 
 SK = SumkDFT('blockstructure.in.h5',use_dft_blocks=True)
 

test/hk_convert.py

@@ -25,7 +25,7 @@ from pytriqs.archive import *
 from pytriqs.utility.h5diff import h5diff
 import pytriqs.utility.mpi as mpi
 
-from converters import *
+from triqs_dft_tools.converters import *
 
 Converter = HkConverter(filename='hk_convert_hamiltonian.hk',hdf_filename='hk_convert.out.h5')
 

test/plovasp/atm/test_atm.py

@@ -2,7 +2,7 @@
 import os
 
 import numpy as np
-from converters.plovasp.atm import dos_tetra_weights_3d
+from triqs_dft_tools.converters.plovasp.atm import dos_tetra_weights_3d
 import mytest
 
 ################################################################################

test/plovasp/inpconf/test_general.py

@@ -7,7 +7,7 @@ _rpath = os.path.dirname(rpath.__file__) + '/'
 
 import arraytest
 import numpy as np
-from converters.plovasp.inpconf import ConfigParameters
+from triqs_dft_tools.converters.plovasp.inpconf import ConfigParameters
 
 ################################################################################
 #

test/plovasp/inpconf/test_groups.py

@@ -7,7 +7,7 @@ _rpath = os.path.dirname(rpath.__file__) + '/'
 
 import arraytest
 import numpy as np
-from converters.plovasp.inpconf import ConfigParameters
+from triqs_dft_tools.converters.plovasp.inpconf import ConfigParameters
 
 ################################################################################
 #

test/plovasp/inpconf/test_input.py

@@ -7,7 +7,7 @@ _rpath = os.path.dirname(rpath.__file__) + '/'
 
 import arraytest
 import numpy as np
-from converters.plovasp.inpconf import ConfigParameters
+from triqs_dft_tools.converters.plovasp.inpconf import ConfigParameters
 
 ################################################################################
 #

test/plovasp/inpconf/test_parameter_set.py

@@ -7,7 +7,7 @@ _rpath = os.path.dirname(rpath.__file__) + '/'
 
 import arraytest
 import numpy as np
-from converters.plovasp.inpconf import ConfigParameters
+from triqs_dft_tools.converters.plovasp.inpconf import ConfigParameters
 
 ################################################################################
 #

test/plovasp/inpconf/test_shells.py

@@ -7,7 +7,7 @@ _rpath = os.path.dirname(rpath.__file__) + '/'
 
 import arraytest
 import numpy as np
-from converters.plovasp.inpconf import ConfigParameters
+from triqs_dft_tools.converters.plovasp.inpconf import ConfigParameters
 
 ################################################################################
 #

test/plovasp/inpconf/test_special_parsers.py

@@ -7,7 +7,7 @@ _rpath = os.path.dirname(rpath.__file__) + '/'
 
 import arraytest
 import numpy as np
-from converters.plovasp.inpconf import ConfigParameters
+from triqs_dft_tools.converters.plovasp.inpconf import ConfigParameters
 
 ################################################################################
 #

test/plovasp/plocar_io/test_fileio.py

@@ -3,7 +3,7 @@ Tests of 'read_plocar()' from module 'plocar_io.c_plocar_io'
 """
 import mytest
 import numpy as np
-from plocar_io.c_plocar_io import read_plocar
+from triqs_dft_tools.plocar_io.c_plocar_io import read_plocar
 
 ################################################################################
 #

test/plovasp/plotools/test_consistency.py

@@ -1,8 +1,8 @@
 
-import converters.plovasp.vaspio
+import triqs_dft_tools.converters.plovasp.vaspio
-from converters.plovasp.inpconf import ConfigParameters
+from triqs_dft_tools.converters.plovasp.inpconf import ConfigParameters
-from converters.plovasp.plotools import check_data_consistency
+from triqs_dft_tools.converters.plovasp.plotools import check_data_consistency
-from converters.plovasp.elstruct import ElectronicStructure
+from triqs_dft_tools.converters.plovasp.elstruct import ElectronicStructure
 import mytest
 
 ################################################################################

test/plovasp/proj_group/test_block_map.py

@@ -4,9 +4,9 @@ import rpath
 _rpath = os.path.dirname(rpath.__file__) + '/'
 
 import numpy as np
-from converters.plovasp.inpconf import ConfigParameters
+from triqs_dft_tools.converters.plovasp.inpconf import ConfigParameters
-from converters.plovasp.proj_shell import ProjectorShell
+from triqs_dft_tools.converters.plovasp.proj_shell import ProjectorShell
-from converters.plovasp.proj_group import ProjectorGroup
+from triqs_dft_tools.converters.plovasp.proj_group import ProjectorGroup
 import mytest
 
 ################################################################################

test/plovasp/proj_group/test_one_site.py

@@ -4,11 +4,11 @@ import rpath
 _rpath = os.path.dirname(rpath.__file__) + '/'
 
 import numpy as np
-from converters.plovasp.vaspio import VaspData
+from triqs_dft_tools.converters.plovasp.vaspio import VaspData
-from converters.plovasp.elstruct import ElectronicStructure
+from triqs_dft_tools.converters.plovasp.elstruct import ElectronicStructure
-from converters.plovasp.inpconf import ConfigParameters
+from triqs_dft_tools.converters.plovasp.inpconf import ConfigParameters
-from converters.plovasp.proj_shell import ProjectorShell
+from triqs_dft_tools.converters.plovasp.proj_shell import ProjectorShell
-from converters.plovasp.proj_group import ProjectorGroup
+from triqs_dft_tools.converters.plovasp.proj_group import ProjectorGroup
 from pytriqs.archive import HDFArchive
 import mytest
 

test/plovasp/proj_group/test_select_bands.py

@@ -4,11 +4,11 @@ import rpath
 _rpath = os.path.dirname(rpath.__file__) + '/'
 
 import numpy as np
-from converters.plovasp.vaspio import VaspData
+from triqs_dft_tools.converters.plovasp.vaspio import VaspData
-from converters.plovasp.elstruct import ElectronicStructure
+from triqs_dft_tools.converters.plovasp.elstruct import ElectronicStructure
-from converters.plovasp.inpconf import ConfigParameters
+from triqs_dft_tools.converters.plovasp.inpconf import ConfigParameters
-from converters.plovasp.proj_shell import ProjectorShell
+from triqs_dft_tools.converters.plovasp.proj_shell import ProjectorShell
-from converters.plovasp.proj_group import ProjectorGroup
+from triqs_dft_tools.converters.plovasp.proj_group import ProjectorGroup
 import mytest
 
 ################################################################################

test/plovasp/proj_group/test_two_site.py

@@ -4,11 +4,11 @@ import rpath
 _rpath = os.path.dirname(rpath.__file__) + '/'
 
 import numpy as np
-from converters.plovasp.vaspio import VaspData
+from triqs_dft_tools.converters.plovasp.vaspio import VaspData
-from converters.plovasp.elstruct import ElectronicStructure
+from triqs_dft_tools.converters.plovasp.elstruct import ElectronicStructure
-from converters.plovasp.inpconf import ConfigParameters
+from triqs_dft_tools.converters.plovasp.inpconf import ConfigParameters
-from converters.plovasp.proj_shell import ProjectorShell
+from triqs_dft_tools.converters.plovasp.proj_shell import ProjectorShell
-from converters.plovasp.proj_group import ProjectorGroup
+from triqs_dft_tools.converters.plovasp.proj_group import ProjectorGroup
 from pytriqs.archive import HDFArchive
 import mytest
 

test/plovasp/proj_shell/test_projshells.py

@@ -4,11 +4,11 @@ import rpath
 _rpath = os.path.dirname(rpath.__file__) + '/'
 
 import numpy as np
-from converters.plovasp.vaspio import VaspData
+from triqs_dft_tools.converters.plovasp.vaspio import VaspData
-from converters.plovasp.elstruct import ElectronicStructure
+from triqs_dft_tools.converters.plovasp.elstruct import ElectronicStructure
-from converters.plovasp.inpconf import ConfigParameters
+from triqs_dft_tools.converters.plovasp.inpconf import ConfigParameters
-from converters.plovasp.proj_shell import ProjectorShell
+from triqs_dft_tools.converters.plovasp.proj_shell import ProjectorShell
-from converters.plovasp.proj_group import ProjectorGroup
+from triqs_dft_tools.converters.plovasp.proj_group import ProjectorGroup
 import mytest
 
 ################################################################################

test/plovasp/vaspio/test_doscar.py

@@ -7,7 +7,7 @@ _rpath = os.path.dirname(rpath.__file__) + '/'
 
 import mytest
 import numpy as np
-from converters.plovasp.vaspio import Doscar
+from triqs_dft_tools.converters.plovasp.vaspio import Doscar
 
 ################################################################################
 #

test/plovasp/vaspio/test_eigenval.py

@@ -7,7 +7,7 @@ _rpath = os.path.dirname(rpath.__file__) + '/'
 
 import mytest
 import numpy as np
-from converters.plovasp.vaspio import Eigenval
+from triqs_dft_tools.converters.plovasp.vaspio import Eigenval
 
 ################################################################################
 #

test/plovasp/vaspio/test_kpoints.py

@@ -7,7 +7,7 @@ _rpath = os.path.dirname(rpath.__file__) + '/'
 
 import mytest
 import numpy as np
-from converters.plovasp.vaspio import Kpoints
+from triqs_dft_tools.converters.plovasp.vaspio import Kpoints
 
 ################################################################################
 #

test/plovasp/vaspio/test_poscar.py

@@ -7,7 +7,7 @@ _rpath = os.path.dirname(rpath.__file__) + '/'
 
 import mytest
 import numpy as np
-from converters.plovasp.vaspio import Poscar
+from triqs_dft_tools.converters.plovasp.vaspio import Poscar
 
 ################################################################################
 #

test/sigma_from_file.py

@@ -22,7 +22,7 @@
 from pytriqs.archive import *
 from pytriqs.gf import *
 from pytriqs.gf.tools import *
-from sumk_dft_tools import *
+from triqs_dft_tools.sumk_dft_tools import *
 from pytriqs.utility.comparison_tests import *
 import numpy as np
 

test/srvo3_Gloc.py

@@ -21,8 +21,8 @@
 
 from pytriqs.archive import *
 from pytriqs.gf import *
-from sumk_dft import *
+from triqs_dft_tools.sumk_dft import *
-from converters.wien2k_converter import *
+from triqs_dft_tools.converters.wien2k_converter import *
 from pytriqs.operators.util import set_operator_structure
 from pytriqs.utility.comparison_tests import *
 from pytriqs.utility.h5diff import h5diff

test/srvo3_transp.py

@@ -20,9 +20,9 @@
 ################################################################################
 
 from numpy import *
-from converters.wien2k_converter import *
+from triqs_dft_tools.converters.wien2k_converter import *
-from sumk_dft import *
+from triqs_dft_tools.sumk_dft import *
-from sumk_dft_tools import *
+from triqs_dft_tools.sumk_dft_tools import *
 from pytriqs.utility.comparison_tests import *
 from pytriqs.utility.h5diff import h5diff 
 

test/sumkdft_basic.py

@@ -21,7 +21,7 @@
 ################################################################################
 
 from pytriqs.archive import *
-from sumk_dft_tools import SumkDFTTools
+from triqs_dft_tools.sumk_dft_tools import SumkDFTTools
 import pytriqs.utility.mpi as mpi
 from pytriqs.utility.comparison_tests import *
 from pytriqs.utility.h5diff import h5diff 

test/w90_convert.py

@@ -21,7 +21,7 @@
 ################################################################################
 
 
-from converters import *
+from triqs_dft_tools.converters import *
 from pytriqs.archive import *
 from pytriqs.utility.h5diff import h5diff
 import pytriqs.utility.mpi as mpi

test/wien2k_convert.py

@@ -25,7 +25,7 @@ from pytriqs.utility.comparison_tests import *
 from pytriqs.utility.h5diff import h5diff 
 import pytriqs.utility.mpi as mpi
 
-from converters import Wien2kConverter
+from triqs_dft_tools.converters import Wien2kConverter
 
 Converter = Wien2kConverter(filename='SrVO3')
 Converter.hdf_file = 'wien2k_convert.out.h5'