Merge pull request projectmesa#863 from projectmesa/Corvince-fix-issu…

…e-855 remove relative imports -- fix projectmesa#855
gultas · Oct 3, 2020 · 2e66e9f · 2e66e9f
2 parents f15b272 + 0f1bcdc
commit 2e66e9f
Show file tree

Hide file tree

Showing 18 changed files with 9 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -78,3 +78,6 @@ target/
 .mypy_cache/
 .dmypy.json
 dmypy.json
+
+# pythonenv
+pythonenv*/
diff --git a/mesa/__init__.py b/mesa/__init__.py
@@ -7,8 +7,8 @@
 """
 import datetime
 
-from .model import Model
-from .agent import Agent
+from mesa.model import Model
+from mesa.agent import Agent
 
 
 __all__ = ["Model", "Agent"]

diff --git a/mesa/agent.py b/mesa/agent.py
@@ -1,12 +1,11 @@
-# -*- coding: utf-8 -*-
 """
 The agent class for Mesa framework.
 
 Core Objects: Agent
 
 """
 # mypy
-from .model import Model
+from mesa.model import Model
 from random import Random
 
 

diff --git a/mesa/batchrunner.py b/mesa/batchrunner.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Batchrunner
 ===========

diff --git a/mesa/datacollection.py b/mesa/datacollection.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Mesa Data Collection Module
 ===========================

diff --git a/mesa/model.py b/mesa/model.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 The model class for Mesa framework.
 

diff --git a/mesa/space.py b/mesa/space.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Mesa Space Module
 =================
@@ -19,7 +18,7 @@
 import numpy as np
 
 from typing import Any, Dict, Iterable, Iterator, List, Optional, Set, Tuple, Union
-from .agent import Agent
+from mesa.agent import Agent
 
 Coordinate = Tuple[int, int]
 GridContent = Union[Optional[Agent], Set[Agent]]

diff --git a/mesa/time.py b/mesa/time.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Mesa Time Module
 ================
@@ -26,8 +25,8 @@
 
 # mypy
 from typing import Dict, Iterator, List, Optional, Union
-from .agent import Agent
-from .model import Model
+from mesa.agent import Agent
+from mesa.model import Model
 
 
 # BaseScheduler has a self.time of int, while

diff --git a/mesa/visualization/ModularVisualization.py b/mesa/visualization/ModularVisualization.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 ModularServer
 =============

diff --git a/mesa/visualization/TextVisualization.py b/mesa/visualization/TextVisualization.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Text Visualization
 ==================

diff --git a/mesa/visualization/__init__.py b/mesa/visualization/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Mesa Visualization Module
 -------------------------

diff --git a/mesa/visualization/modules/BarChartVisualization.py b/mesa/visualization/modules/BarChartVisualization.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Pie Chart Module
 ============

diff --git a/mesa/visualization/modules/CanvasGridVisualization.py b/mesa/visualization/modules/CanvasGridVisualization.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Modular Canvas Rendering
 ========================

diff --git a/mesa/visualization/modules/ChartVisualization.py b/mesa/visualization/modules/ChartVisualization.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Chart Module
 ============

diff --git a/mesa/visualization/modules/HexGridVisualization.py b/mesa/visualization/modules/HexGridVisualization.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Modular Canvas Rendering
 ========================

diff --git a/mesa/visualization/modules/NetworkVisualization.py b/mesa/visualization/modules/NetworkVisualization.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Network Visualization Module
 ============

diff --git a/mesa/visualization/modules/PieChartVisualization.py b/mesa/visualization/modules/PieChartVisualization.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Pie Chart Module
 ============

diff --git a/mesa/visualization/modules/TextVisualization.py b/mesa/visualization/modules/TextVisualization.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Text Module
 ============