From 4f89c07e807b405e2196dc40327aa5b4642eef30 Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Mon, 21 Oct 2024 13:23:47 +0200 Subject: [PATCH 1/7] add fiona and ensure latest geopandas --- requirements-dev.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index ae76a9351..f35857e80 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -2,6 +2,7 @@ altair>=5.0.0 cartopy check-manifest descartes +fiona flake8 flake8-builtins flake8-comprehensions @@ -10,7 +11,7 @@ flake8-mutable flake8-nb>=0.2.5 geodatasets geographiclib -geopandas +geopandas>=1 gpxpy ipykernel jenkspy From 4450e63fa5423d6412a9e60d0cb70ebd3facd5d9 Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Mon, 21 Oct 2024 13:32:20 +0200 Subject: [PATCH 2/7] default bash --- .github/workflows/deploy-docs.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index 2b0ee1232..496a092a0 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -17,6 +17,9 @@ permissions: jobs: run: runs-on: ubuntu-latest + defaults: + run: + shell: bash -l {0} steps: - uses: actions/checkout@v4 @@ -28,17 +31,16 @@ jobs: uses: mamba-org/setup-micromamba@v2 with: environment-name: TEST + init-shell: bash create-args: >- python=3 --file requirements.txt --file requirements-dev.txt - name: Install folium from source - shell: bash -l {0} run: python -m pip install -e . --no-deps --force-reinstall - name: Build documentation - shell: bash -l {0} run: | set -e pushd docs From 0c0c04c0ccad9527adfdb4602bad49948989dfcd Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Mon, 21 Oct 2024 13:52:40 +0200 Subject: [PATCH 3/7] remove pulling from main --- .github/workflows/deploy-docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index 496a092a0..40c946733 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -25,7 +25,7 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - ref: main + # ref: main - name: Setup Micromamba env uses: mamba-org/setup-micromamba@v2 From 6d44f3eba4b3347fcffd74a19b520b02bb80e869 Mon Sep 17 00:00:00 2001 From: Filipe Date: Mon, 21 Oct 2024 15:04:08 +0200 Subject: [PATCH 4/7] remove ref: main Co-authored-by: Frank Anema <33519926+Conengmo@users.noreply.github.com> --- .github/workflows/deploy-docs.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index 40c946733..5bde04a76 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -25,7 +25,6 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - # ref: main - name: Setup Micromamba env uses: mamba-org/setup-micromamba@v2 From 2c8b037519f324badae0258b698cde12761a565e Mon Sep 17 00:00:00 2001 From: Conengmo <33519926+Conengmo@users.noreply.github.com> Date: Mon, 21 Oct 2024 15:34:19 +0200 Subject: [PATCH 5/7] upgrade code test matrix --- .github/workflows/test_code.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_code.yml b/.github/workflows/test_code.yml index 37f103be7..126abfe7e 100644 --- a/.github/workflows/test_code.yml +++ b/.github/workflows/test_code.yml @@ -12,10 +12,10 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - python-version: ["3.8", "3.12"] + python-version: ["3.9", "3.13"] experimental: [false] include: - - python-version: "3.12" + - python-version: "3.13" os: "ubuntu-latest" experimental: true fail-fast: false From 2dab73fb304b7cd6069310c71f3fbcdc72583121 Mon Sep 17 00:00:00 2001 From: Conengmo <33519926+Conengmo@users.noreply.github.com> Date: Mon, 21 Oct 2024 15:35:48 +0200 Subject: [PATCH 6/7] only do 3.8 -> 3.9 --- .github/workflows/test_code.yml | 2 +- .github/workflows/test_selenium.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_code.yml b/.github/workflows/test_code.yml index 126abfe7e..421d14448 100644 --- a/.github/workflows/test_code.yml +++ b/.github/workflows/test_code.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - python-version: ["3.9", "3.13"] + python-version: ["3.9", "3.12"] experimental: [false] include: - python-version: "3.13" diff --git a/.github/workflows/test_selenium.yml b/.github/workflows/test_selenium.yml index e0ec1efdb..6aa70fe87 100644 --- a/.github/workflows/test_selenium.yml +++ b/.github/workflows/test_selenium.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [ "3.8", "3.12" ] + python-version: [ "3.9", "3.12" ] fail-fast: false steps: From b46f126bcb5fff27f243fb42fb6ef06ef48c77b8 Mon Sep 17 00:00:00 2001 From: Conengmo <33519926+Conengmo@users.noreply.github.com> Date: Mon, 21 Oct 2024 15:40:47 +0200 Subject: [PATCH 7/7] restore missed 3.13 --- .github/workflows/test_code.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_code.yml b/.github/workflows/test_code.yml index 421d14448..ff644d600 100644 --- a/.github/workflows/test_code.yml +++ b/.github/workflows/test_code.yml @@ -15,7 +15,7 @@ jobs: python-version: ["3.9", "3.12"] experimental: [false] include: - - python-version: "3.13" + - python-version: "3.12" os: "ubuntu-latest" experimental: true fail-fast: false