Browse Source

fix: sub packaging

master
mco 4 months ago
parent
commit
29645bd903
18 changed files with 23 additions and 27 deletions
  1. +3
    -7
      ants/__init__.py
  2. +3
    -0
      ants/applicators/__init__.py
  3. +1
    -1
      ants/applicators/collisionsystem.py
  4. +1
    -1
      ants/applicators/dashboardsystem.py
  5. +2
    -2
      ants/applicators/movementsystem.py
  6. +0
    -0
      ants/conf/__init__.py
  7. +0
    -0
      ants/log/__init__.py
  8. +6
    -0
      ants/objects/__init__.py
  9. +1
    -1
      ants/objects/ant.py
  10. +1
    -1
      ants/objects/baseobject.py
  11. +1
    -1
      ants/objects/dashboard.py
  12. +2
    -2
      ants/objects/farm.py
  13. +1
    -1
      ants/objects/source.py
  14. +0
    -0
      ants/objects/utils.py
  15. +0
    -0
      ants/renderer/__init__.py
  16. +0
    -3
      applicators/__init__.py
  17. +0
    -6
      objects/__init__.py
  18. +1
    -1
      setup.cfg

+ 3
- 7
ants/__init__.py View File

@ -5,13 +5,9 @@ import sdl2
import sdl2.ext
import sdl2.sdlgfx
import logging
import log
import conf
import renderer
from objects import Farm, Source, Dashboard
from applicators import MovementSystem
from applicators import DashboardSystem
from applicators import CollisionSystem
from ants import log, conf, renderer
from ants.objects import Farm, Source, Dashboard
from ants.applicators import MovementSystem, DashboardSystem, CollisionSystem
def run(config):


+ 3
- 0
ants/applicators/__init__.py View File

@ -0,0 +1,3 @@
from ants.applicators.movementsystem import MovementSystem
from ants.applicators.collisionsystem import CollisionSystem
from ants.applicators.dashboardsystem import DashboardSystem

applicators/collisionsystem.py → ants/applicators/collisionsystem.py View File

@ -1,6 +1,6 @@
import sdl2
import sdl2.ext
from objects import Ant
from ants.objects import Ant
class CollisionSystem(sdl2.ext.Applicator):

applicators/dashboardsystem.py → ants/applicators/dashboardsystem.py View File

@ -1,6 +1,6 @@
import sdl2
import sdl2.ext
from objects import Dashboard
from ants.objects import Dashboard
class DashboardSystem(sdl2.ext.Applicator):

applicators/movementsystem.py → ants/applicators/movementsystem.py View File

@ -1,8 +1,8 @@
import random
import sdl2
import sdl2.ext
from objects import Ant
from objects import Direction
from ants.objects import Ant
from ants.objects import Direction
class MovementSystem(sdl2.ext.Applicator):

conf/__init__.py → ants/conf/__init__.py View File


log/__init__.py → ants/log/__init__.py View File


+ 6
- 0
ants/objects/__init__.py View File

@ -0,0 +1,6 @@
from ants.objects.utils import Direction, History, Life, Velocity, Size, Food, Font, Status
from ants.objects.baseobject import BaseObject, spritefactory, COLORS
from ants.objects.farm import Farm
from ants.objects.ant import Ant
from ants.objects.source import Source
from ants.objects.dashboard import Dashboard

objects/ant.py → ants/objects/ant.py View File

@ -1,6 +1,6 @@
import random
import logging
from objects import BaseObject, Velocity, Direction, History, Life, Size, Food, Status
from ants.objects import BaseObject, Velocity, Direction, History, Life, Size, Food, Status
class Ant(BaseObject):

objects/baseobject.py → ants/objects/baseobject.py View File

@ -1,5 +1,5 @@
from uuid import uuid4
from objects import Size
from ants.objects import Size
import sdl2
import sdl2.ext

objects/dashboard.py → ants/objects/dashboard.py View File

@ -1,5 +1,5 @@
from sdl2.ext import Color
from objects import BaseObject, Size, Font
from ants.objects import BaseObject, Size, Font
class Dashboard(BaseObject):

objects/farm.py → ants/objects/farm.py View File

@ -1,7 +1,7 @@
import random
import logging
from objects import BaseObject, Size, Food
from objects import ant
from ants.objects import BaseObject, Size, Food
from ants.objects import ant
class Farm(BaseObject):

objects/source.py → ants/objects/source.py View File

@ -1,5 +1,5 @@
import random
from objects import BaseObject, Size, Food
from ants.objects import BaseObject, Size, Food
class Source(BaseObject):

objects/utils.py → ants/objects/utils.py View File


renderer/__init__.py → ants/renderer/__init__.py View File


+ 0
- 3
applicators/__init__.py View File

@ -1,3 +0,0 @@
from applicators.movementsystem import MovementSystem
from applicators.collisionsystem import CollisionSystem
from applicators.dashboardsystem import DashboardSystem

+ 0
- 6
objects/__init__.py View File

@ -1,6 +0,0 @@
from objects.utils import Direction, History, Life, Velocity, Size, Food, Font, Status
from objects.baseobject import BaseObject, spritefactory, COLORS
from objects.farm import Farm
from objects.ant import Ant
from objects.source import Source
from objects.dashboard import Dashboard

+ 1
- 1
setup.cfg View File

@ -1,5 +1,5 @@
[metadata]
version = 2.0.1
version = 2.1.0
license = WTFPL
classifiers =
Programming Language :: Python :: 3


Loading…
Cancel
Save