diff --git a/Makefile b/Makefile index 820b211..7e50735 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ debug: uv pdb python3 a_maze_ing.py config.txt clean: - rm -rf */**/__pycache__ __pycache__ .mypy_cache .venv dist build */**/*.egg-info *.egg-info test.txt + rm -rf */**/__pycache__ */__pycache__ __pycache__ .mypy_cache .venv dist build */**/*.egg-info */*.egg-info *.egg-info test.txt fclean: clean rm mazegen-1.0.0-py3-none-any.whl diff --git a/a_maze_ing.py b/a_maze_ing.py index 11a7d1e..a819a90 100644 --- a/a_maze_ing.py +++ b/a_maze_ing.py @@ -474,7 +474,7 @@ class MazeMLX: self.mlx.mlx_loop_hook(self.mlx_ptr, self.draw_image, amazing) self.mlx.mlx_hook(self.win_ptr, 33, 0, self.close_loop, None) self.mlx.mlx_hook( - self.win_ptr, 2, 1 << 0, self.handle_key_press, amazing + self.win_ptr, 2, 1 << 0, self.handle_key_press_mteriier, amazing ) self.mlx.mlx_loop(self.mlx_ptr) diff --git a/pyproject.toml b/pyproject.toml index 24738e3..29c3590 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [project] -name = "A-Maze-ing" +name = "mazegen" version = "0.1.0" description = "This is the way" readme = "README.md" @@ -30,5 +30,8 @@ requires = ["setuptools>=78.1.0", "wheel>=0.45.1"] build-backend = "setuptools.build_meta" [tool.setuptools] -package-dir = {"" = "src/amaz_lib"} +package-dir = {"" = "src"} + +[tool.setuptools.packages.find] +where = ["src"] diff --git a/src/AMazeIng.py b/src/AMazeIng.py index 8af39c9..9828e81 100644 --- a/src/AMazeIng.py +++ b/src/AMazeIng.py @@ -2,7 +2,7 @@ from typing import Generator from typing_extensions import Self from pydantic import BaseModel, Field, model_validator, ConfigDict -from .amaz_lib import Maze, MazeGenerator, MazeSolver +from .mazegen import Maze, MazeGenerator, MazeSolver class AMazeIng(BaseModel): diff --git a/src/amaz_lib/__init__.py b/src/amaz_lib/__init__.py deleted file mode 100644 index f89d378..0000000 --- a/src/amaz_lib/__init__.py +++ /dev/null @@ -1,18 +0,0 @@ -from .Cell import Cell -from .Maze import Maze -from .MazeGenerator import MazeGenerator, DepthFirstSearch -from .MazeGenerator import Kruskal -from .MazeSolver import MazeSolver, AStar, DepthFirstSearchSolver - -__version__ = "1.0.0" -__author__ = "us" -__all__ = [ - "Cell", - "Maze", - "MazeGenerator", - "DepthFirstSearchSolver", - "MazeSolver", - "AStar", - "Kruskal", - "DepthFirstSearch", -] diff --git a/src/amaz_lib/Cell.py b/src/mazegen/Cell.py similarity index 100% rename from src/amaz_lib/Cell.py rename to src/mazegen/Cell.py diff --git a/src/amaz_lib/Maze.py b/src/mazegen/Maze.py similarity index 100% rename from src/amaz_lib/Maze.py rename to src/mazegen/Maze.py diff --git a/src/amaz_lib/MazeGenerator.py b/src/mazegen/MazeGenerator.py similarity index 100% rename from src/amaz_lib/MazeGenerator.py rename to src/mazegen/MazeGenerator.py diff --git a/src/amaz_lib/MazeSolver.py b/src/mazegen/MazeSolver.py similarity index 100% rename from src/amaz_lib/MazeSolver.py rename to src/mazegen/MazeSolver.py diff --git a/src/mazegen/__init__.py b/src/mazegen/__init__.py new file mode 100644 index 0000000..8377a3f --- /dev/null +++ b/src/mazegen/__init__.py @@ -0,0 +1,18 @@ +from mazegen.Cell import Cell +from mazegen.Maze import Maze +from mazegen.MazeGenerator import MazeGenerator, DepthFirstSearch +from mazegen.MazeGenerator import Kruskal +from mazegen.MazeSolver import MazeSolver, AStar, DepthFirstSearchSolver + +__version__ = "1.0.0" +__author__ = "us" +__all__ = [ + "Cell", + "Maze", + "MazeGenerator", + "DepthFirstSearchSolver", + "MazeSolver", + "AStar", + "Kruskal", + "DepthFirstSearch", +] diff --git a/src/amaz_lib/py.typed b/src/mazegen/py.typed similarity index 100% rename from src/amaz_lib/py.typed rename to src/mazegen/py.typed diff --git a/src/parsing/Parsing.py b/src/parsing/Parsing.py index a54ced2..713b32f 100644 --- a/src/parsing/Parsing.py +++ b/src/parsing/Parsing.py @@ -1,5 +1,5 @@ -from ..amaz_lib import DepthFirstSearch, Kruskal -from ..amaz_lib import AStar, DepthFirstSearchSolver +from ..mazegen import DepthFirstSearch, Kruskal +from ..mazegen import AStar, DepthFirstSearchSolver from typing import Any diff --git a/uv.lock b/uv.lock index bc5e8a2..b46861e 100644 --- a/uv.lock +++ b/uv.lock @@ -6,36 +6,6 @@ resolution-markers = [ "python_full_version < '3.11'", ] -[[package]] -name = "a-maze-ing" -version = "0.1.0" -source = { editable = "." } -dependencies = [ - { name = "numpy", version = "2.2.6", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.11'" }, - { name = "numpy", version = "2.4.3", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.11'" }, - { name = "pydantic" }, -] - -[package.dev-dependencies] -dev = [ - { name = "flake8" }, - { name = "mypy" }, - { name = "pytest" }, -] - -[package.metadata] -requires-dist = [ - { name = "numpy", specifier = ">=2.2.6" }, - { name = "pydantic", specifier = ">=2.12.5" }, -] - -[package.metadata.requires-dev] -dev = [ - { name = "flake8", specifier = ">=7.3.0" }, - { name = "mypy", specifier = ">=1.19.1" }, - { name = "pytest", specifier = ">=9.0.2" }, -] - [[package]] name = "annotated-types" version = "0.7.0" @@ -174,6 +144,36 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/b2/c8/d148e041732d631fc76036f8b30fae4e77b027a1e95b7a84bb522481a940/librt-0.8.1-cp314-cp314t-win_arm64.whl", hash = "sha256:bf512a71a23504ed08103a13c941f763db13fb11177beb3d9244c98c29fb4a61", size = 48755, upload-time = "2026-02-17T16:12:47.943Z" }, ] +[[package]] +name = "mazegen" +version = "0.1.0" +source = { editable = "." } +dependencies = [ + { name = "numpy", version = "2.2.6", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.11'" }, + { name = "numpy", version = "2.4.3", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.11'" }, + { name = "pydantic" }, +] + +[package.dev-dependencies] +dev = [ + { name = "flake8" }, + { name = "mypy" }, + { name = "pytest" }, +] + +[package.metadata] +requires-dist = [ + { name = "numpy", specifier = ">=2.2.6" }, + { name = "pydantic", specifier = ">=2.12.5" }, +] + +[package.metadata.requires-dev] +dev = [ + { name = "flake8", specifier = ">=7.3.0" }, + { name = "mypy", specifier = ">=1.19.1" }, + { name = "pytest", specifier = ">=9.0.2" }, +] + [[package]] name = "mccabe" version = "0.7.0"