ObjectNat 2.0.1__tar.gz → 2.1.0__tar.gz

{objectnat-2.0.1 → objectnat-2.1.0}/PKG-INFO

@@ -1,17 +1,20 @@
 Metadata-Version: 2.5
 Name: ObjectNat
-Version: 2.0.1
+Version: 2.1.0
 Summary: ObjectNat is an open-source library for object-level geospatial analysis on city networks, developed by the IDU team.
 Author-email: DDonnyy <63115678+DDonnyy@users.noreply.github.com>
 License-Expression: BSD-3-Clause
 License-File: LICENSE.txt
-Requires-Python: <3.13,>=3.11
+Requires-Python: <3.15,>=3.11
 Requires-Dist: geopandas<2.0.0,>=1.1.0
-Requires-Dist: iduedu<3.0.0,>=2.0.0
+Requires-Dist: iduedu<3.0.0,>=2.2.0
 Requires-Dist: loguru<0.8.0,>=0.7.3
-Requires-Dist: numpy<3.0.0,>=2.4.0
-Requires-Dist: pandas<4.0.0,>=3.0.0
-Requires-Dist: scipy<2.0.0,>=1.17.0
+Requires-Dist: numpy<3.0.0,>=2.0.0; python_version < '3.14'
+Requires-Dist: numpy<3.0.0,>=2.4.0; python_version >= '3.14'
+Requires-Dist: pandas<4.0.0,>=2.2.0; python_version < '3.14'
+Requires-Dist: pandas<4.0.0,>=3.0.0; python_version >= '3.14'
+Requires-Dist: scipy<2.0.0,>=1.16.0; python_version < '3.14'
+Requires-Dist: scipy<2.0.0,>=1.17.0; python_version >= '3.14'
 Requires-Dist: tqdm<5.0.0,>=4.66.2
 Description-Content-Type: text/x-rst
 
@@ -153,6 +156,9 @@ Example usage::
 Installation
 ------------
 
+ObjectNat supports Python 3.11–3.14 on Windows, macOS, and Linux. It installs
+IduEdu 2.2.0 or newer within the 2.x series.
+
 **ObjectNat** can be installed via ``pip``::
 
     pip install ObjectNat

{objectnat-2.0.1 → objectnat-2.1.0}/README.rst

@@ -136,6 +136,9 @@ Example usage::
 Installation
 ------------
 
+ObjectNat supports Python 3.11–3.14 on Windows, macOS, and Linux. It installs
+IduEdu 2.2.0 or newer within the 2.x series.
+
 **ObjectNat** can be installed via ``pip``::
 
     pip install ObjectNat

objectnat-2.1.0/objectnat/_version.py

@@ -0,0 +1 @@
+VERSION = "2.1.0"

{objectnat-2.0.1 → objectnat-2.1.0}/objectnat/methods/noise/noise_simulation.py

@@ -1,7 +1,7 @@
 import concurrent.futures
 import math
-import multiprocessing
 import time
+from collections import deque
 
 import geopandas as gpd
 import pandas as pd
@@ -178,7 +178,7 @@ def simulate_noise(
     obstacles = obstacles[["absorb_ratio", "geometry"]]
 
     # creating initial task and simulating for each point
-    task_queue = multiprocessing.Queue()
+    task_queue = deque()
     dead_area_dict = {}
     for ind, row in source_points.iterrows():
         source_point = row.geometry
@@ -208,7 +208,7 @@ def simulate_noise(
             "min_db": target_noise_db,
             "simulation_ind": ind,
         }
-        task_queue.put((_noise_from_point_task, args, kwargs))
+        task_queue.append((_noise_from_point_task, args, kwargs))
         dead_area_dict[ind] = source_point.buffer(dead_area_r, quad_segs=2)
 
     noise_gdf = _recursive_simulation_queue(
@@ -544,11 +544,9 @@ def _noise_from_point_task(task, **kwargs) -> tuple[gpd.GeoDataFrame, list[tuple
     return noise_from_point, new_tasks
 
 
-def _recursive_simulation_queue(
-    task_queue: multiprocessing.Queue, dead_area_dict: dict, dead_area_r: int, use_parallel: bool
-):
+def _recursive_simulation_queue(task_queue: deque, dead_area_dict: dict, dead_area_r: int, use_parallel: bool):
     results = []
-    total_tasks = task_queue.qsize()
+    total_tasks = len(task_queue)
 
     with tqdm(total=total_tasks, desc="Simulating noise") as pbar:
         if use_parallel:
@@ -559,8 +557,8 @@ def _recursive_simulation_queue(
             max_workers = executor._max_workers  # pylint: disable=protected-access
             future_to_task = {}
             while True:
-                while not task_queue.empty() and len(future_to_task) < max_workers:
-                    func, task, kwargs = task_queue.get_nowait()
+                while task_queue and len(future_to_task) < max_workers:
+                    func, task, kwargs = task_queue.popleft()
                     future = executor.submit(func, task, **kwargs)
                     future_to_task[future] = kwargs["simulation_ind"]
                 done, _ = concurrent.futures.wait(future_to_task.keys(), return_when=concurrent.futures.FIRST_COMPLETED)
@@ -574,7 +572,7 @@ def _recursive_simulation_queue(
                         for func, new_task, new_kwargs in new_tasks:
                             new_point = new_task[0]
                             if not local_dead_area.covers(new_point):
-                                task_queue.put((func, new_task, new_kwargs))
+                                task_queue.append((func, new_task, new_kwargs))
                                 new_dead_area_points.append(new_point.buffer(dead_area_r, quad_segs=2))
                                 new_tasks_n += 1
                         dead_area_dict[simulation_ind] = unary_union(new_dead_area_points)
@@ -584,6 +582,6 @@ def _recursive_simulation_queue(
                     results.append(result)
                     pbar.update(1)
                 time.sleep(0.01)
-                if not future_to_task and task_queue.empty():
+                if not future_to_task and not task_queue:
                     break
     return results

{objectnat-2.0.1 → objectnat-2.1.0}/pyproject.toml

@@ -3,7 +3,7 @@ name = "ObjectNat"
 dynamic = ["version"]
 description = "ObjectNat is an open-source library for object-level geospatial analysis on city networks, developed by the IDU team."
 readme = "README.rst"
-requires-python = ">=3.11,<3.13"
+requires-python = ">=3.11,<3.15"
 license = "BSD-3-Clause"
 license-files = ["LICENSE.txt"]
 authors = [
@@ -11,11 +11,14 @@ authors = [
 ]
 dependencies = [
     "geopandas>=1.1.0,<2.0.0",
-    "iduedu>=2.0.0,<3.0.0",
+    "iduedu>=2.2.0,<3.0.0",
     "loguru>=0.7.3,<0.8.0",
-    "numpy>=2.4.0,<3.0.0",
-    "pandas>=3.0.0,<4.0.0",
-    "scipy>=1.17.0,<2.0.0",
+    "numpy>=2.0.0,<3.0.0; python_version < '3.14'",
+    "numpy>=2.4.0,<3.0.0; python_version >= '3.14'",
+    "pandas>=2.2.0,<4.0.0; python_version < '3.14'",
+    "pandas>=3.0.0,<4.0.0; python_version >= '3.14'",
+    "scipy>=1.16.0,<2.0.0; python_version < '3.14'",
+    "scipy>=1.17.0,<2.0.0; python_version >= '3.14'",
     "tqdm>=4.66.2,<5.0.0",
 ]
 
@@ -28,7 +31,6 @@ dev = [
     { include-group = "test" },
     { include-group = "viz" },
     "pre-commit>=4.2.0,<5.0.0",
-    "pyarrow>=19.0.1,<20.0.0",
 ]
 docs = [
     "furo>=2025.9.25,<2026.0.0",
@@ -52,13 +54,18 @@ release = [
     "python-semantic-release>=9.15.0,<10.0.0",
 ]
 test = [
+    "matplotlib>=3.8.0,<4.0.0; python_version < '3.14'",
+    "matplotlib>=3.10.7,<4.0.0; python_version >= '3.14'",
+    "pyarrow>=18.1.0,<26.0.0; python_version < '3.14'",
+    "pyarrow>=22.0.0,<26.0.0; python_version >= '3.14'",
     "pytest>=8.3.5,<9.0.0",
     "pytest-cov>=6.0.0,<7.0.0",
 ]
 viz = [
     "folium>=0.19.5,<0.20.0",
     "mapclassify>=2.8.1,<3.0.0",
-    "matplotlib>=3.10.1,<4.0.0",
+    "matplotlib>=3.8.0,<4.0.0; python_version < '3.14'",
+    "matplotlib>=3.10.7,<4.0.0; python_version >= '3.14'",
 ]
 
 
@@ -132,6 +139,7 @@ exclude_lines = [
 
 [tool.pytest.ini_options]
 testpaths = ["tests"]
+markers = ["network: requires a live Overpass request to build an OSM graph"]
 
 # ---------------------------------------------------------------------------
 # Automated releases (python-semantic-release)

objectnat-2.0.1/objectnat/_version.py

@@ -1 +0,0 @@
-VERSION = "2.0.1"