Merge pull request #398 from oturns/lodescodes

shapely backend for isochrone
oturns · Mar 4, 2024 · dcf3b27 · dcf3b27
2 parents 9b93509 + 62c8158
commit dcf3b27
Show file tree

Hide file tree

Showing 11 changed files with 2,519 additions and 49 deletions.
diff --git a/.ci/310.yml b/.ci/310.yml
@@ -25,7 +25,8 @@ dependencies:
   - pyproj >=3
   - pandana
   - pooch
-
+  - osmnx
+
   # testing
   - jupyter
   - pytest

diff --git a/.ci/311.yml b/.ci/311.yml
@@ -25,6 +25,7 @@ dependencies:
   - pyproj >=3
   - pandana
   - pooch
+  - osmnx
 
   # testing
   - jupyter

diff --git a/.ci/312.yml b/.ci/312.yml
@@ -25,6 +25,7 @@ dependencies:
   - pyproj >=3
   - pandana
   - pooch
+  - osmnx
 
   # testing
   - jupyter

diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml
@@ -24,6 +24,8 @@ jobs:
         include:
           - environment-file: .ci/311.yml
             os: macos-latest
+          - environment-file: .ci/311.yml
+            os: macos-14  # Apple Silicon
           - environment-file: .ci/311.yml
             os: windows-latest
     defaults:
@@ -46,15 +48,16 @@ jobs:
 
       - name: Test geosnap
         run: |
-          pytest geosnap \
+          coverage run -m pytest \
            -v \
            -r a \
            -n auto \
            --color yes \
            --cov geosnap \
            --cov-append \
            --cov-report term-missing \
-           --cov-report xml
+           --cov-report xml \
+           geosnap
       - name: codecov
         uses: codecov/codecov-action@v3
         with:

diff --git a/docs/api.rst b/docs/api.rst
@@ -82,6 +82,8 @@ Querying datasets
     io.get_ltdb
     io.get_nces
     io.get_ncdb
+    io.get_network_from_gdf
+    io.project_network
 
 
 Analyze Module
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,7 +25,8 @@ dependencies: @@
       - pyproj >=3
       - pandana
       - pooch
+      - osmnx
       # testing
       - jupyter
       - pytest
@@ Expand Down @@