Commit a24e8622 authored by Theo Steininger's avatar Theo Steininger

Merge branch 'relative_imports' into 'master'

switch all local imports to relative, to avoid silent mistakes

See merge request !2
parents c18aea41 90a8d4a0
Pipeline #17225 passed with stage
in 5 minutes and 18 seconds
...@@ -29,4 +29,4 @@ from .strategies import STRATEGIES ...@@ -29,4 +29,4 @@ from .strategies import STRATEGIES
from .factory_methods import * from .factory_methods import *
import random from . import random
from __future__ import division
from __future__ import absolute_import
# D2O # D2O
# Copyright (C) 2016 Theo Steininger # Copyright (C) 2016 Theo Steininger
# #
...@@ -18,11 +16,13 @@ from __future__ import absolute_import ...@@ -18,11 +16,13 @@ from __future__ import absolute_import
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
from __future__ import division
import numpy as np import numpy as np
from keepers import Versionable,\ from keepers import Versionable,\
Loggable Loggable
from d2o.config import configuration as gc,\ from .config import configuration as gc,\
dependency_injector as gdi dependency_injector as gdi
from .d2o_librarian import d2o_librarian from .d2o_librarian import d2o_librarian
......
from __future__ import absolute_import
# D2O # D2O
# Copyright (C) 2016 Theo Steininger # Copyright (C) 2016 Theo Steininger
# #
...@@ -27,7 +26,7 @@ import numpy as np ...@@ -27,7 +26,7 @@ import numpy as np
from keepers import Loggable from keepers import Loggable
from d2o.config import configuration as gc,\ from .config import configuration as gc,\
dependency_injector as gdi dependency_injector as gdi
from .distributed_data_object import distributed_data_object from .distributed_data_object import distributed_data_object
......
...@@ -20,7 +20,7 @@ from builtins import map ...@@ -20,7 +20,7 @@ from builtins import map
from builtins import object from builtins import object
import numpy as np import numpy as np
from d2o.config import configuration as gc,\ from .config import configuration as gc,\
dependency_injector as gdi dependency_injector as gdi
MPI = gdi[gc['mpi_module']] MPI = gdi[gc['mpi_module']]
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import absolute_import
import numpy as np import numpy as np
from d2o.config import configuration as gc from .config import configuration as gc
from .distributed_data_object import distributed_data_object from .distributed_data_object import distributed_data_object
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
import numpy as np import numpy as np
from d2o.config import configuration as gc,\ from .config import configuration as gc,\
dependency_injector as gdi dependency_injector as gdi
MPI = gdi[gc['mpi_module']] MPI = gdi[gc['mpi_module']]
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
from d2o.config import dependency_injector as gdi from .config import dependency_injector as gdi
pyfftw = gdi.get('pyfftw') pyfftw = gdi.get('pyfftw')
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
import numpy as np import numpy as np
from d2o.config import configuration as gc,\ from .config import configuration as gc,\
dependency_injector as gdi dependency_injector as gdi
MPI = gdi[gc['mpi_module']] MPI = gdi[gc['mpi_module']]
......
from __future__ import division
from __future__ import print_function
# D2O # D2O
# Copyright (C) 2016 Theo Steininger # Copyright (C) 2016 Theo Steininger
# #
...@@ -18,6 +16,9 @@ from __future__ import print_function ...@@ -18,6 +16,9 @@ from __future__ import print_function
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
from __future__ import division
from __future__ import print_function
from builtins import str from builtins import str
from builtins import range from builtins import range
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment