upgrade

intelligine/core/Context.py

-from xyzworld.Context import Context as XyzContext
+from synergine_xyz.Context import Context as XyzContext
 from intelligine.cst import IMPENETRABLE
-from xyzworld.cst import POSITIONS
+from synergine_xyz.cst import POSITIONS
 from intelligine.synergy.stigmergy.PheromonesManager import PheromonesManager
 
 

intelligine/display/Pygame.py

 from intelligine.core.exceptions import NoPheromone
-from xyzworld.display.Pygame import Pygame as XyzPygame
+from synergine_xyz.display.Pygame import Pygame as XyzPygame
 import pygame
 from intelligine.cst import PHEROMON_DIRECTION, PHEROMON_DIR_HOME, PHEROMON_DIR_EXPLO, PHEROMON_POSITIONS
 from intelligine.display.pygame.visualisation import SURFACE_PHEROMONE_EXPLORATION, SURFACE_PHEROMONE_HOME

intelligine/display/pygame/visualisation.py

-from xyworld.display.object.pygame.PygameImage import PygameImage
-from xyworld.display.object.pygame.DirectionnedImage import DirectionnedImage
+from synergine_xyz.display.object.pygame.PygameImage import PygameImage
+from synergine_xyz.display.object.pygame.DirectionnedImage import DirectionnedImage
 from intelligine.synergy.object.Bug import Bug
 from intelligine.synergy.object.Food import Food
 from intelligine.synergy.object.Hole import Hole
 from intelligine.synergy.object.Rock import Rock
 from intelligine.synergy.object.ant.Egg import Egg
 from os import getcwd
-from xyzworld.cst import PREVIOUS_DIRECTION
+from synergine_xyz.cst import PREVIOUS_DIRECTION
 
 SURFACE_PHEROMONE_HOME = 'pheromone_home'
 SURFACE_PHEROMONE_EXPLORATION = 'pheromone_exploration'

intelligine/simulation/object/brain/part/move/AntMoveBrainPart.py

 from intelligine.simulation.object.brain.part.move.MoveBrainPart import MoveBrainPart
-from xyzworld.cst import POSITION
+from synergine_xyz.cst import POSITION
 from intelligine.core.exceptions import NoPheromone
 from intelligine.cst import PHEROMONE_SEARCHING, MOVE_MODE_EXPLO, COL_TRANSPORTER_NOT_CARRYING, COL_TRANSPORTER_CARRYING
 from intelligine.simulation.pheromone.DirectionPheromone import DirectionPheromone

intelligine/simulation/object/brain/part/move/MoveBrainPart.py

 from intelligine.simulation.object.brain.part.BrainPart import BrainPart
 from intelligine.synergy.event.move.direction import directions_same_level, directions_slighty
 from random import randint, choice, randrange
-from xyzworld.cst import BLOCKED_SINCE, PREVIOUS_DIRECTION
+from synergine_xyz.cst import BLOCKED_SINCE, PREVIOUS_DIRECTION
 
 
 class MoveBrainPart(BrainPart):

intelligine/simulation/object/brain/part/transport/AntPutBrainPart.py

 from intelligine.cst import MOVE_MODE_EXPLO, TYPE_RESOURCE_TRANSFORMABLE, CARRIED
 from intelligine.simulation.object.brain.part.transport.TransportBrainPart import TransportBrainPart
 from intelligine.synergy.object.Food import Food
-from xyzworld.cst import POSITION, POSITIONS
+from synergine_xyz.cst import POSITION, POSITIONS
 
 
 class AntPutBrainPart(TransportBrainPart):

intelligine/simulation/pheromone/DirectionPheromone.py

 from intelligine.cst import PHEROMON_DIRECTION, PHEROMON_POSITIONS
 from intelligine.core.exceptions import NoPheromone
 from random import shuffle
-from xyzworld.geometry import get_degree_from_north
+from synergine_xyz.geometry import get_degree_from_north
 from intelligine.synergy.event.move.direction import get_direction_for_degrees
 
 

intelligine/synergy/ColonyConfiguration.py

 from synergine.synergy.collection.Configuration import Configuration
 from intelligine.synergy.object.ant.Ant import Ant
 from intelligine.cst import ALIVE, COLONY
-from xyzworld.cst import POSITION
+from synergine_xyz.cst import POSITION
 
 
 class ColonyConfiguration(Configuration):

intelligine/synergy/Simulation.py

 from synergine.synergy.Simulation import Simulation as BaseSimulation
-from xyzworld.cst import POSITION, POSITIONS
+from synergine_xyz.cst import POSITION, POSITIONS
 #from intelligine.synergy.event.attack.NearAttackableAction import NearAttackableAction
 from intelligine.synergy.event.transport.PutableAction import PutableAction
 from intelligine.synergy.event.transport.TakeableAction import TakeableAction

intelligine/synergy/event/attack/NearAttackableEvent.py

 from intelligine.core.exceptions import NearNothingFound
 from synergine.core.exceptions import NotConcernedEvent
 from intelligine.synergy.event.src.NearEvent import NearEvent
-from xyzworld.mechanism.AroundMechanism import AroundMechanism
+from synergine_xyz.mechanism.AroundMechanism import AroundMechanism
 from intelligine.cst import ATTACKABLE, COLONY, COL_FIGHTER, BRAIN_PART_ATTACK
 
 

intelligine/synergy/event/move/MoveAction.py

 from intelligine.synergy.event.move.MoveEvent import MoveEvent
 from synergine.synergy.event.exception.ActionAborted import ActionAborted
 from intelligine.cst import BRAIN_PART_MOVE
-from xyzworld.cst import BLOCKED_SINCE
+from synergine_xyz.cst import BLOCKED_SINCE
 
 
 class MoveAction(Action):

intelligine/synergy/event/move/MoveEvent.py

 from intelligine.synergy.event.Event import Event
 from synergine.core.simulation.mechanism.Mechanism import Mechanism
 from intelligine.cst import COL_WALKER, BRAIN_SCHEMA, BRAIN_PART_MOVE
-from xyzworld.cst import POSITION
+from synergine_xyz.cst import POSITION
 
 
 class MoveEvent(Event):

intelligine/synergy/event/src/NearEvent.py

 from intelligine.core.exceptions import NearNothingFound
 from intelligine.synergy.event.Event import Event
-from xyzworld.mechanism.AroundMechanism import AroundMechanism
+from synergine_xyz.mechanism.AroundMechanism import AroundMechanism
 
 
 class NearEvent(Event):

intelligine/synergy/event/transport/PutableEvent.py

 from intelligine.synergy.event.src.NearEvent import NearEvent
 from synergine.core.exceptions import NotConcernedEvent
 from intelligine.cst import CANT_PUT_STILL, COL_TRANSPORTER_CARRYING, TRANSPORTABLE, BRAIN_SCHEMA, BRAIN_PART_PUT
-from xyzworld.mechanism.AroundMechanism import AroundMechanism
+from synergine_xyz.mechanism.AroundMechanism import AroundMechanism
 
 
 class PutableEvent(NearEvent):

intelligine/synergy/event/transport/TakeableEvent.py

 from intelligine.core.exceptions import NearNothingFound
 from synergine.core.exceptions import NotConcernedEvent
 from intelligine.synergy.event.src.NearEvent import NearEvent
-from xyzworld.mechanism.AroundMechanism import AroundMechanism
+from synergine_xyz.mechanism.AroundMechanism import AroundMechanism
 from intelligine.cst import TRANSPORTABLE, CANT_CARRY_STILL, COL_TRANSPORTER_NOT_CARRYING, BRAIN_SCHEMA, BRAIN_PART_TAKE
 
 

intelligine/synergy/object/Hole.py

-from xyzworld.SynergyObject import SynergyObject as XyzSynergyObject
+from synergine_xyz.SynergyObject import SynergyObject as XyzSynergyObject
 
 
 class Hole(XyzSynergyObject):

intelligine/synergy/object/Rock.py

-from xyzworld.SynergyObject import SynergyObject as XyzSynergyObject
+from synergine_xyz.SynergyObject import SynergyObject as XyzSynergyObject
 from intelligine.cst import IMPENETRABLE
 
 

intelligine/synergy/object/Transportable.py

-from xyzworld.SynergyObject import SynergyObject as XyzSynergyObject
+from synergine_xyz.SynergyObject import SynergyObject as XyzSynergyObject
 from intelligine.cst import TRANSPORTABLE
 
 

modules/lifegame

-../../synergine/modules/lifegame

modules/stigengine

-../../stigengine/stigengine

modules/synergine

-../../synergine/synergine

modules/xyworld

-../../synergine/modules/xyworld

modules/xyzworld

-../../synergine/modules/xyzworld

requirements.txt

+synergine>=0.0.1
+synergine_xyz>=0.0.1

run.py

-from os import getcwd
-from sys import path as ppath
-ppath.insert(1,getcwd()+'/modules') # TODO: win32 compatibilite (python path)
-
 from synergine.core.Core import Core
 from config import config
 
 if __name__ == '__main__':
-    Core.start_core(config, modules_path='modules')
+    Core.start_core(config)

tests_requirements.txt

-python-coveralls==2.4.2
-coverage==3.7.1
+synergine>=0.0.1
+synergine_xyz>=0.0.1