From d6678faf7ada55c26159cf37d6e170a83be5ebef Mon Sep 17 00:00:00 2001 From: Mikhail Kiselyov Date: Mon, 5 Feb 2024 10:18:28 +0300 Subject: [PATCH 1/2] fix pyproject.toml --- pyproject.toml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 33eb83c..a942f3f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,12 +1,13 @@ [project] name = "octreelib" -dependencies = [ - "numpy", -] -version = "0.0.1" +dynamic = ["dependencies"] +version = "0.0.5" [tool.setuptools] include-package-data = false +[tool.setuptools.dynamic] +dependencies = { file = ["requirements.txt"] } + [tool.setuptools.packages.find] exclude = ["test*"] \ No newline at end of file From 7280a01ecd005945d93b2804e91f0806d1fe2284 Mon Sep 17 00:00:00 2001 From: Mikhail Kiselyov Date: Mon, 5 Feb 2024 10:24:01 +0300 Subject: [PATCH 2/2] =?UTF-8?q?fix=20black=20=F0=9F=99=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- octreelib/grid/__init__.py | 1 + octreelib/internal/__init__.py | 1 + octreelib/octree/octree.py | 4 +--- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/octreelib/grid/__init__.py b/octreelib/grid/__init__.py index 1a6b187..5ab521c 100644 --- a/octreelib/grid/__init__.py +++ b/octreelib/grid/__init__.py @@ -1,6 +1,7 @@ """ This module contains base classes and implementations for Grid, GridConfig """ + import octreelib.grid.grid_base as grid_base_module import octreelib.grid.grid as grid_module diff --git a/octreelib/internal/__init__.py b/octreelib/internal/__init__.py index ece40d3..66e5ec1 100644 --- a/octreelib/internal/__init__.py +++ b/octreelib/internal/__init__.py @@ -1,6 +1,7 @@ """ This module contains library's internal classes, functions and definitions """ + import octreelib.internal.interfaces as interfaces_module import octreelib.internal.point as point_module import octreelib.internal.typing as typing_module diff --git a/octreelib/octree/octree.py b/octreelib/octree/octree.py index 31e1df1..ed42f1f 100644 --- a/octreelib/octree/octree.py +++ b/octreelib/octree/octree.py @@ -140,9 +140,7 @@ def n_leaves(self): return ( sum([child.n_leaves for child in self._children]) if self._has_children - else 1 - if len(self._points) != 0 - else 0 + else 1 if len(self._points) != 0 else 0 ) @property