From fd793cfb400510c21de758451b36073c304e3180 Mon Sep 17 00:00:00 2001 From: "Oleg E. Peil" Date: Thu, 10 Mar 2016 16:52:37 +0100 Subject: [PATCH] Fixed import of `vaspio` and `elstruct` in tests --- test/plovasp/proj_group/test_block_map.py | 4 ++-- test/plovasp/proj_group/test_one_site.py | 4 ++-- test/plovasp/proj_group/test_select_bands.py | 4 ++-- test/plovasp/proj_group/test_two_site.py | 4 ++-- test/plovasp/proj_shell/test_projshells.py | 4 ++-- test/plovasp/vaspio/test_doscar.py | 2 +- test/plovasp/vaspio/test_eigenval.py | 2 +- test/plovasp/vaspio/test_kpoints.py | 2 +- test/plovasp/vaspio/test_poscar.py | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/test/plovasp/proj_group/test_block_map.py b/test/plovasp/proj_group/test_block_map.py index fa3eac93..24df5606 100644 --- a/test/plovasp/proj_group/test_block_map.py +++ b/test/plovasp/proj_group/test_block_map.py @@ -4,8 +4,8 @@ import rpath _rpath = os.path.dirname(rpath.__file__) + '/' import numpy as np -import applications.dft.converters.plovasp.vaspio -import applications.dft.converters.plovasp.elstruct +import applications.dft.converters.plovasp.vaspio as vaspio +import applications.dft.converters.plovasp.elstruct as elstruct from applications.dft.converters.plovasp.inpconf import ConfigParameters from applications.dft.converters.plovasp.proj_shell import ProjectorShell from applications.dft.converters.plovasp.proj_group import ProjectorGroup diff --git a/test/plovasp/proj_group/test_one_site.py b/test/plovasp/proj_group/test_one_site.py index 939a9b5d..a88ad076 100644 --- a/test/plovasp/proj_group/test_one_site.py +++ b/test/plovasp/proj_group/test_one_site.py @@ -4,8 +4,8 @@ import rpath _rpath = os.path.dirname(rpath.__file__) + '/' import numpy as np -import applications.dft.converters.plovasp.vaspio -import applications.dft.converters.plovasp.elstruct +import applications.dft.converters.plovasp.vaspio as vaspio +import applications.dft.converters.plovasp.elstruct as elstruct from applications.dft.converters.plovasp.inpconf import ConfigParameters from applications.dft.converters.plovasp.proj_shell import ProjectorShell from applications.dft.converters.plovasp.proj_group import ProjectorGroup diff --git a/test/plovasp/proj_group/test_select_bands.py b/test/plovasp/proj_group/test_select_bands.py index fd41a6e0..0a90ef71 100644 --- a/test/plovasp/proj_group/test_select_bands.py +++ b/test/plovasp/proj_group/test_select_bands.py @@ -4,8 +4,8 @@ import rpath _rpath = os.path.dirname(rpath.__file__) + '/' import numpy as np -import applications.dft.converters.plovasp.vaspio -import applications.dft.converters.plovasp.elstruct +import applications.dft.converters.plovasp.vaspio as vaspio +import applications.dft.converters.plovasp.elstruct as elstruct from applications.dft.converters.plovasp.inpconf import ConfigParameters from applications.dft.converters.plovasp.proj_shell import ProjectorShell from applications.dft.converters.plovasp.proj_group import ProjectorGroup diff --git a/test/plovasp/proj_group/test_two_site.py b/test/plovasp/proj_group/test_two_site.py index bd83d55a..ed27e3ce 100644 --- a/test/plovasp/proj_group/test_two_site.py +++ b/test/plovasp/proj_group/test_two_site.py @@ -4,8 +4,8 @@ import rpath _rpath = os.path.dirname(rpath.__file__) + '/' import numpy as np -import applications.dft.converters.plovasp.vaspio -import applications.dft.converters.plovasp.elstruct +import applications.dft.converters.plovasp.vaspio as vaspio +import applications.dft.converters.plovasp.elstruct as elstruct from applications.dft.converters.plovasp.inpconf import ConfigParameters from applications.dft.converters.plovasp.proj_shell import ProjectorShell from applications.dft.converters.plovasp.proj_group import ProjectorGroup diff --git a/test/plovasp/proj_shell/test_projshells.py b/test/plovasp/proj_shell/test_projshells.py index 75e68759..bcdd7c7e 100644 --- a/test/plovasp/proj_shell/test_projshells.py +++ b/test/plovasp/proj_shell/test_projshells.py @@ -4,8 +4,8 @@ import rpath _rpath = os.path.dirname(rpath.__file__) + '/' import numpy as np -import applications.dft.converters.plovasp.vaspio -import applications.dft.converters.plovasp.elstruct +import applications.dft.converters.plovasp.vaspio as vaspio +import applications.dft.converters.plovasp.elstruct as elstruct from applications.dft.converters.plovasp.inpconf import ConfigParameters from applications.dft.converters.plovasp.proj_shell import ProjectorShell from applications.dft.converters.plovasp.proj_group import ProjectorGroup diff --git a/test/plovasp/vaspio/test_doscar.py b/test/plovasp/vaspio/test_doscar.py index b4ee9d66..005ad7f3 100644 --- a/test/plovasp/vaspio/test_doscar.py +++ b/test/plovasp/vaspio/test_doscar.py @@ -7,7 +7,7 @@ _rpath = os.path.dirname(rpath.__file__) + '/' import mytest import numpy as np -from vaspio import Doscar +from applications.dft.converters.plovasp.vaspio import Doscar ################################################################################ # diff --git a/test/plovasp/vaspio/test_eigenval.py b/test/plovasp/vaspio/test_eigenval.py index d94047a2..270ddf15 100644 --- a/test/plovasp/vaspio/test_eigenval.py +++ b/test/plovasp/vaspio/test_eigenval.py @@ -7,7 +7,7 @@ _rpath = os.path.dirname(rpath.__file__) + '/' import mytest import numpy as np -from vaspio import Eigenval +from applications.dft.converters.plovasp.vaspio import Eigenval ################################################################################ # diff --git a/test/plovasp/vaspio/test_kpoints.py b/test/plovasp/vaspio/test_kpoints.py index e31e69b9..81e6b31c 100644 --- a/test/plovasp/vaspio/test_kpoints.py +++ b/test/plovasp/vaspio/test_kpoints.py @@ -7,7 +7,7 @@ _rpath = os.path.dirname(rpath.__file__) + '/' import mytest import numpy as np -from vaspio import Kpoints +from applications.dft.converters.plovasp.vaspio import Kpoints ################################################################################ # diff --git a/test/plovasp/vaspio/test_poscar.py b/test/plovasp/vaspio/test_poscar.py index 9e9ad7f9..67fbad3f 100644 --- a/test/plovasp/vaspio/test_poscar.py +++ b/test/plovasp/vaspio/test_poscar.py @@ -7,7 +7,7 @@ _rpath = os.path.dirname(rpath.__file__) + '/' import mytest import numpy as np -from vaspio import Poscar +from applications.dft.converters.plovasp.vaspio import Poscar ################################################################################ #