Skip to content

Commit 9a69958

Browse files
authored
Merge pull request #2012 from ocefpaf/fiona
add fiona and ensure latest geopandas
2 parents d9e1e9a + b46f126 commit 9a69958

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

.github/workflows/deploy-docs.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,29 @@ permissions:
1717
jobs:
1818
run:
1919
runs-on: ubuntu-latest
20+
defaults:
21+
run:
22+
shell: bash -l {0}
2023

2124
steps:
2225
- uses: actions/checkout@v4
2326
with:
2427
fetch-depth: 0
25-
ref: main
2628

2729
- name: Setup Micromamba env
2830
uses: mamba-org/setup-micromamba@v2
2931
with:
3032
environment-name: TEST
33+
init-shell: bash
3134
create-args: >-
3235
python=3
3336
--file requirements.txt
3437
--file requirements-dev.txt
3538
3639
- name: Install folium from source
37-
shell: bash -l {0}
3840
run: python -m pip install -e . --no-deps --force-reinstall
3941

4042
- name: Build documentation
41-
shell: bash -l {0}
4243
run: |
4344
set -e
4445
pushd docs

.github/workflows/test_code.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
matrix:
1414
os: [ubuntu-latest, windows-latest]
15-
python-version: ["3.8", "3.12"]
15+
python-version: ["3.9", "3.12"]
1616
experimental: [false]
1717
include:
1818
- python-version: "3.12"

.github/workflows/test_selenium.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
python-version: [ "3.8", "3.12" ]
14+
python-version: [ "3.9", "3.12" ]
1515
fail-fast: false
1616

1717
steps:

requirements-dev.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ altair>=5.0.0
22
cartopy
33
check-manifest
44
descartes
5+
fiona
56
flake8
67
flake8-builtins
78
flake8-comprehensions
@@ -10,7 +11,7 @@ flake8-mutable
1011
flake8-nb>=0.2.5
1112
geodatasets
1213
geographiclib
13-
geopandas
14+
geopandas>=1
1415
gpxpy
1516
ipykernel
1617
jenkspy

0 commit comments

Comments
 (0)