Merge branch 'master' of https://github.com/ipeaGIT/geobr

.github/workflows/Python-CMD-check.yaml

@@ -26,7 +26,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
         # Python 3.8 support ends in 2024-10
         # Python 3.12 support starts in 2023-10
         # Check Python maintenance status at: https://www.python.org/downloads/
@@ -44,18 +44,18 @@ jobs:
           python-version: ${{ matrix.python-version }}
           cache: "pip"
 
-      - name: Install Poetry
+      - name: Install uv
         run: |
           python -m pip install --upgrade pip
-          pip install poetry
+          curl -LsSf https://astral.sh/uv/install.sh | sh
 
-      - name: Install dependencies with Poetry
-        run: poetry install
+      - name: Install dependencies with uv
+        run: uv sync
         working-directory: python-package
 
-      - name: Run tests with Poetry
+      - name: Run tests with uv
         run: |
-          poetry run pytest ./tests
+          uv run pytest -n auto ./tests
         working-directory: python-package
 
       - name: Upload check results

.github/workflows/R-CMD-check-CRAN.yaml

@@ -5,13 +5,13 @@ on:
     paths:
       - r-package/**
     branches:
-      - main
+      - master
       - dev
   pull_request:
     paths:
       - r-package/**
     branches:
-      - main
+      - master
       - dev
 
 name: R-CMD-check-as-CRAN

.gitignore

@@ -52,3 +52,4 @@ python-package/.coverage
 /r-package/.Rhistory
 /r-package/.Rhistory
 /r-package/.Rhistory
+.pdm-build

README.md

@@ -172,6 +172,7 @@ As of today, there is another R package with similar functionalities: [simplefea
 - Chile: [chilemapas](https://pacha.dev/chilemapas/)
 - Czech Republic: [RCzechia](https://github.com/jlacko/RCzechia)
 - Finland: [geofi](https://ropengov.github.io/geofi/)
+- Kazakhstan: (geokz)[https://github.com/arodionoff/geokz]
 - Peru: [mapsPERU](https://github.com/musajajorge/mapsPERU)
 - Spain: [mapSpain](https://github.com/rOpenSpain/mapSpain/)
 - UK: [geographr](https://github.com/britishredcrosssociety/geographr)

python-package/README.md

@@ -11,19 +11,18 @@
 To start the development environment run
 
 ```sh
-poetry install
+uv sync
 ```
 
 Test with
 
-`poetry run pytest`
+`uv run pytest -n auto`
 
 You can use a helper to translate a function from R.
 If you want to add `read_biomes`, just run
 
 ```sh
-poetry shell
-python helpers/translate_from_R.py read_biomes
+uv run python helpers/translate_from_R.py read_biomes
 ```
 
 It will scrape the original R function to get documentation and metadata.

python-package/geobr/utils.py

@@ -1,6 +1,7 @@
 import os
 from functools import lru_cache
 from urllib.error import HTTPError
+import tempfile
 
 import geopandas as gpd
 import pandas as pd
@@ -171,21 +172,21 @@ def load_gpkg(url):
         raise Exception(
             "Some internal url is broken."
             "Please report to https://github.com/ipeaGIT/geobr/issues"
-        )
+        ) from e
 
     # This below does not work in Windows -- see the Docs
     # Whether the name can be used to open the file a second time, while the named temporary file is still open,
     # varies across platforms (it can be so used on Unix; it cannot on Windows NT or later).
     # https://docs.python.org/2/library/tempfile.html
 
-    # with tempfile.NamedTemporaryFile(suffix='.gpkg') as fp:
-    with open("temp.gpkg", "wb") as fp:
-
+    # Create a temporary file with .gpkg extension that is automatically deleted when closed
+    with tempfile.NamedTemporaryFile(suffix=".gpkg", delete=False) as fp:
         fp.write(content)
-
+        # Need to close file before reading on Windows
+        fp.close()
         gdf = gpd.read_file(fp.name)
-
-    os.remove("temp.gpkg")
+        # Clean up temp file
+        os.unlink(fp.name)
 
     return gdf
 

python-package/pyproject.toml

@@ -1,5 +1,23 @@
-[tool.poetry]
-authors = ["João Carabetta", "Rafael H. M. Pereira", "Caio Nogueira Goncalves", "Bernardo Furtado"]
+[project]
+name = "geobr"
+version = "0.2.2"
+description = "geobr: Download Official Spatial Data Sets of Brazil"
+readme = "README.md"
+requires-python = "<4.0,>=3.9"
+license = {text = "MIT"}
+authors = [
+    {name = "João Carabetta"},
+    {name = "Rafael H. M. Pereira"},
+    {name = "Caio Nogueira Goncalves"},
+    {name = "Bernardo Furtado"},
+]
+dependencies = [
+    "geopandas>=1.0.0,<=1.1",
+    "shapely>=1.7.0,<=2.1.0",
+    "requests<3.0.0,>=2.25.1",
+    "lxml<6.0.0,>=5.1.0",
+    "html5lib==1.1",
+]
 classifiers = [
     "Intended Audience :: Science/Research",
     "Intended Audience :: Developers",
@@ -8,29 +26,19 @@ classifiers = [
     "Topic :: Scientific/Engineering :: Visualization",
     "Programming Language :: Python",
 ]
-description = "geobr: Download Official Spatial Data Sets of Brazil"
+
+[project.urls]
 homepage = "https://github.com/ipeaGIT/geobr"
-license = "MIT"
-name = "geobr"
-packages = [
-  {include = "geobr"},
-]
-readme = "README.md"
 repository = "https://github.com/ipeaGIT/geobr"
-version = "0.2.1"
 
-[tool.poetry.dependencies]
-geopandas = "^0.14.0"
-shapely = "^1.7.0"
-python = "^3.9"
-requests = "^2.25.1"
-lxml = "^5.1.0"
-html5lib = "1.1"
+[build-system]
+requires = ["pdm-backend"]
+build-backend = "pdm.backend"
 
-[tool.poetry.dev-dependencies]
-pytest = "^6.0"
-jinja2 = "^3.1.4"
-fire = "^0.5.0"
+[tool.pdm.build]
+includes = [
+    "geobr",
+]
 
 [tool.black]
 line-length = 88
@@ -53,4 +61,12 @@ exclude = '''
   )/
   | helpers/template
 )
-'''
+'''
+
+[tool.uv]
+dev-dependencies = [
+    "pytest<7.0,>=6.0",
+    "pytest-xdist>=3.5.0",
+    "jinja2<4.0.0,>=3.1.4",
+    "fire<1.0.0,>=0.5.0",
+]