Merge pull request #391 from oturns/sedafix

reimplement isochrones
oturns · Jan 19, 2024 · d17c87d · d17c87d
2 parents e79bb6b + c0eef92
commit d17c87d
Show file tree

Hide file tree

Showing 8 changed files with 1,482 additions and 1,056 deletions.
diff --git a/.ci/310.yml b/.ci/310.yml
@@ -30,9 +30,10 @@ dependencies:
   - jupyter
   - pytest
   - pytest-cov
+  - pytest-xdist
   - codecov
   - coverage
-  - coveralls
+
   - python-wget
   - contextily
   - scikit-plot

diff --git a/.ci/311.yml b/.ci/311.yml
@@ -30,9 +30,9 @@ dependencies:
   - jupyter
   - pytest
   - pytest-cov
+  - pytest-xdist
   - codecov
   - coverage
-  - coveralls
   - python-wget
   - contextily
   - scikit-plot

diff --git a/.ci/312.yml b/.ci/312.yml
@@ -30,9 +30,10 @@ dependencies:
   - jupyter
   - pytest
   - pytest-cov
+  - pytest-xdist
   - codecov
   - coverage
-  - coveralls
+
   - python-wget
   - contextily
   - scikit-plot

diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml
@@ -46,7 +46,15 @@ jobs:
 
       - name: Test geosnap
         run: |
-          coverage run -m  pytest -v --color yes --cov=geosnap --cov-append --cov-report term-missing --cov-report xml .
+          pytest geosnap \
+           -v \
+           -r a \
+           -n auto \
+           --color yes \
+           --cov geosnap \
+           --cov-append \
+           --cov-report term-missing \
+           --cov-report xml
       - name: codecov
         uses: codecov/codecov-action@v3
         with:
@@ -62,4 +70,4 @@ jobs:
           && github.repository_owner == 'oturns'
         uses: xarray-contrib/issue-from-pytest-log@v1
         with:
-          log-path: pytest-log.jsonl
+          log-path: pytest-log.jsonl
diff --git a/docs/api.rst b/docs/api.rst
@@ -142,9 +142,9 @@ Compute shortest path distance along a network using pandana, and visualize trav
 .. autosummary::
    :toctree: generated/
 
-   analyze.compute_travel_cost_adjlist
-   analyze.isochrone
-   analyze.isochrones
+   analyze.pdna_to_adj
+   analyze.isochrones_from_gdf
+   analyze.isochrones_from_ids
 
 The ModelResults Class
 '''''''''''''''''''''''''''''''''''''''''''''