3.2.3 dev (#201)

* fix: remove calls to map2model

* fix: remove m2m from deps

* fix: use os/python matrix

* remove gdal install from test

* only run for changes of python files or the workflow

* remove conda defaults channel

* style: style fixes by ruff and autoformatting by black

* remove map2model import

* Update linting_and_testing.yml

* trying to specify python version in conda install

* fix: make shapely imports backwards compatible

* points reverted

* remove incorrect type hinting

* fix: making test work on ALL python. use pathlib and not importlib to find files

* fix: multilinestring import

* fixing more shapley bugs

* add version constraint on shapely

* remove . add gdal back

* actually add gdal

* make workflow runs on all pushes

* replace dwithin

* fix short_line

* fix dependency file path and handle >= version condition in check_all_dependencies

* remove gdal from dependencies.txt

* change order of dependencies

* display gdal owslib versions

* fix: specify gdal 3.4.3 for windows python 3.10

* print gdal owslib shapely version

* set gdal>=3.6.2 and shapely>=2.0.2 in dependencies.txt

* change back to shapely>=2 in dependencies.txt

* remove gdal>=3.6.2 from dependencies.txt

* windows python 3.10 glda=3.4.3

* add geos version compatibility for shapely.dwithin

* add back branch and path restrictions

* remove print statements

---------

Co-authored-by: Lachlan Grose <[email protected]>
Co-authored-by: lachlangrose <[email protected]>
Co-authored-by: Noelle Cheng <[email protected]>

Author: 3 people

.github/workflows/linting_and_testing.yml

@@ -1,7 +1,20 @@
 name: Linting and Testing
 
 on:
-    [push]
+  push:
+    branches:
+    - master
+    paths:
+      - '**.py'
+      - .github/workflows/linting_and_testing.yml
+  
+  pull_request:
+    branches:
+      - master
+    paths:
+      - '**.py'
+      - .github/workflows/linting_and_testing.yml
+  workflow_dispatch:
 
 jobs:
   linting:
@@ -21,29 +34,42 @@ jobs:
 
 
   testing:
-    name: Testing
-    runs-on: ubuntu-24.04
+    name: Testing${{ matrix.os }} python ${{ matrix.python-version }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: ${{ fromJSON(vars.BUILD_OS)}}
+        python-version: ${{ fromJSON(vars.PYTHON_VERSIONS)}}
+        
     steps:
       - uses: actions/checkout@v4
-      - name: Install GDAL
-        run: |
-          sudo add-apt-repository ppa:ubuntugis/ubuntugis-unstable
-          sudo apt-get update
-          sudo apt-get install -y libgdal-dev gdal-bin
+      - uses: conda-incubator/setup-miniconda@v3
+        with:
+            python-version: ${{ matrix.python-version }}
+            conda-remove-defaults: "true"
 
-      - name: Install dependencies
+
+      - name: Install dependencies for windows python 3.10
+        if: ${{ matrix.os == 'windows-latest' && matrix.python-version == '3.10' }}
         run: |
-            conda update -n base -c defaults conda -y 
-            conda install -n base conda-libmamba-solver -c conda-forge -y
-            conda install -c conda-forge gdal -y
-            conda install -c conda-forge -c loop3d --file dependencies.txt -y
-            conda install pytest -y
+            conda run -n test conda info
+            conda run -n test conda install -c loop3d -c conda-forge "gdal=3.4.3" python=${{ matrix.python-version }} -y
+            conda run -n test conda install -c loop3d -c conda-forge --file dependencies.txt python=${{ matrix.python-version }} -y
+            conda run -n test conda install pytest python=${{ matrix.python-version }} -y
 
+      - name: Install dependencies for other environments
+        if: ${{ matrix.os != 'windows-latest' || matrix.python-version != '3.10' }}
+        run: |
+            conda run -n test conda info
+            conda run -n test conda install -c loop3d -c conda-forge gdal python=${{ matrix.python-version }} -y
+            conda run -n test conda install -c loop3d -c conda-forge --file dependencies.txt python=${{ matrix.python-version }} -y
+            conda run -n test conda install pytest python=${{ matrix.python-version }} -y
+            
       - name: Install map2loop
         run: |
-            python -m pip install .
+            conda run -n test python -m pip install .
 
       - name: Run tests
         run: |
-            pytest
-
+            conda run -n test  pytest

dependencies.txt

@@ -1,10 +1,9 @@
 numpy
 scipy
 geopandas
-shapely
+shapely>=2
 networkx
 owslib
-map2model
 loopprojectfile==0.2.2
 beartype
 pytest

map2loop/__init__.py

@@ -30,7 +30,7 @@ class DependencyChecker:
 
     def __init__(self, package_name, dependency_file="dependencies.txt"):
         self.package_name = package_name
-        self.dependency_file = pathlib.Path(__file__).parent / dependency_file
+        self.dependency_file = pathlib.Path(__file__).parent.parent / dependency_file
         self.required_version = self.get_required_version()
         self.installed_version = self.get_installed_version()
 
@@ -93,7 +93,7 @@ def check_version(self):
 
 
 def check_all_dependencies(dependency_file="dependencies.txt"):
-    dependencies_path = pathlib.Path(__file__).parent / dependency_file
+    dependencies_path = pathlib.Path(__file__).parent.parent / dependency_file
     try:
         with dependencies_path.open("r") as file:
             for line in file:
@@ -103,6 +103,8 @@ def check_all_dependencies(dependency_file="dependencies.txt"):
                 if line:
                     if "==" in line:
                         package_name, _ = line.split("==")
+                    elif ">=" in line:
+                        package_name, _ = line.split(">=")
                     else:
                         package_name = line
 

map2loop/_datasets/geodata_files/load_map2loop_data.py

@@ -1,8 +1,12 @@
 import geopandas
-from importlib.resources import files
+import map2loop
+import pathlib
 from osgeo import gdal
 gdal.UseExceptions()
-
+def map2loop_dir(folder)-> pathlib.Path:
+    path = pathlib.Path(map2loop.__file__).parent
+    path = path / "_datasets"/"geodata_files"/f'{folder}'
+    return path
 def load_hamersley_geology():
     """
     Loads Hamersley geology data from a shapefile
@@ -14,8 +18,9 @@ def load_hamersley_geology():
     Returns:
         geopandas.GeoDataFrame: The geology data
     """
-    stream = files("map2loop._datasets.geodata_files.hamersley").joinpath("geology.geojson")
-    return geopandas.read_file(stream)
+    
+    path = map2loop_dir('hamersley') / "geology.geojson"
+    return geopandas.read_file(str(path))
 
 
 def load_hamersley_structure():
@@ -30,8 +35,8 @@ def load_hamersley_structure():
         geopandas.GeoDataFrame: The structure data
     """
 
-    path = files("map2loop._datasets.geodata_files.hamersley").joinpath("structure.geojson")
-    return geopandas.read_file(path)
+    path = map2loop_dir('hamersley') / "structure.geojson"
+    return geopandas.read_file(str(path))
 
 
 def load_hamersley_dtm():
@@ -41,5 +46,5 @@ def load_hamersley_dtm():
     Returns:
         gdal.Dataset: The DTM data
     """
-    path = files("map2loop._datasets.geodata_files.hamersley").joinpath("dtm_rp.tif")
-    return gdal.Open(path)
+    path = map2loop_dir('hamersley') / "dtm_rp.tif"
+    return gdal.Open(str(path))

map2loop/data_checks.py

@@ -41,7 +41,7 @@ def check_geology_fields_validity(mapdata) -> tuple[bool, str]:
     # 2. Validate geometry
     failed, message = validate_geometry(
         geodata=geology_data,
-        expected_geom_types=[shapely.Polygon, shapely.MultiPolygon],
+        expected_geom_types=[shapely.geometry.Polygon, shapely.geometry.MultiPolygon],
         datatype_name="GEOLOGY"
     )
     if failed: