From ff53981a73d1b5ac55632631f35a765507b07c87 Mon Sep 17 00:00:00 2001 From: virio-andreyana Date: Wed, 15 Feb 2023 09:20:14 +0100 Subject: [PATCH 1/3] Fix warning in rule build_shapes --- scripts/build_shapes.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/build_shapes.py b/scripts/build_shapes.py index cda27963..539002ef 100644 --- a/scripts/build_shapes.py +++ b/scripts/build_shapes.py @@ -237,9 +237,11 @@ def nuts3(country_shapes, nuts3, nuts3pop, nuts3gdp, ch_cantons, ch_popgdp): manual = gpd.GeoDataFrame( [["BA1", "BA", 3871.0], ["RS1", "RS", 7210.0], ["AL1", "AL", 2893.0]], columns=["NUTS_ID", "country", "pop"], - ).set_index("NUTS_ID") + ) manual["geometry"] = manual["country"].map(country_shapes) manual = manual.dropna() + manual = manual.set_index("NUTS_ID") + manual = manual.set_crs('ETRS89') df = pd.concat([df, manual], sort=False) From 03db47ed5e4b1e02a784dbf0274627ecb0714b73 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 15 Feb 2023 09:16:13 +0000 Subject: [PATCH 2/3] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- scripts/build_shapes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build_shapes.py b/scripts/build_shapes.py index 539002ef..ffe6380a 100644 --- a/scripts/build_shapes.py +++ b/scripts/build_shapes.py @@ -241,7 +241,7 @@ def nuts3(country_shapes, nuts3, nuts3pop, nuts3gdp, ch_cantons, ch_popgdp): manual["geometry"] = manual["country"].map(country_shapes) manual = manual.dropna() manual = manual.set_index("NUTS_ID") - manual = manual.set_crs('ETRS89') + manual = manual.set_crs("ETRS89") df = pd.concat([df, manual], sort=False) From cac98dc8e9cb0db34177ed1ae02e62bdfc8bc045 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Wed, 15 Feb 2023 10:29:34 +0100 Subject: [PATCH 3/3] upgrade cache action from v2 to v3 --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8b888cbe..26111c94 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -81,7 +81,7 @@ jobs: run: echo "DATE=$(date +'%Y%m%d')" >> $GITHUB_ENV - name: Create environment cache - uses: actions/cache@v2 + uses: actions/cache@v3 id: cache with: path: ${{ matrix.prefix }}