Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump python version to 3.9 and update dependencies #62

Merged
merged 1 commit into from
Oct 5, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
bump python version to 3.9 and update dependencies
nmandery committed Oct 5, 2024

Verified

This commit was signed with the committer’s verified signature.
yordis Yordis Prieto
commit cb5e64b71c924aa5eb83da3a0a893dde1920bcfb
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ permissions:
contents: read

env:
PYTHON_VERSION: "3.8"
PYTHON_VERSION: "3.9"
RUST_BACKTRACE: "1"


2 changes: 2 additions & 0 deletions h3ronpy/CHANGES.rst
Original file line number Diff line number Diff line change
@@ -12,6 +12,8 @@ Versioning <https://semver.org/spec/v2.0.0.html>`__.
Unreleased
----------

- The minimum supported python version is now 3.9.

0.21.1 - 2024-10-04
-------------------

2 changes: 1 addition & 1 deletion h3ronpy/Cargo.toml
Original file line number Diff line number Diff line change
@@ -25,6 +25,6 @@ ndarray = { version = "0.15", features = ["rayon"] }
numpy = "0.21"
ordered-float = ">=2.0.1"
py_geo_interface = { version = "0.8", features = ["f64", "wkb"] }
pyo3 = { version = "0.21", features = ["extension-module", "abi3", "abi3-py38"] }
pyo3 = { version = "0.21", features = ["extension-module", "abi3", "abi3-py39"] }
rasterh3 = { version = "^0.8", features = ["rayon"] }
rayon = { workspace = true }
11 changes: 5 additions & 6 deletions h3ronpy/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[build-system]
requires = [
"maturin==1.2",
"maturin>=1.7",
]
build-backend = "maturin"

@@ -21,8 +21,7 @@ readme = "../README.rst"

dependencies = [
"numpy<2",
"pyarrow>=10.0",
"Shapely>=1.7",
"pyarrow>=17.0"
]
classifiers = [
"Programming Language :: Python :: 3",
@@ -33,14 +32,14 @@ classifiers = [

[project.optional-dependencies]
polars = [
"polars>=1.0"
"polars>=1"
]
pandas = [
"geopandas>=0.10",
"fiona<1.10"
"geopandas>=1"
]
test = [
"rasterio",
"Shapely>=1.7",
"pytest>=6",
"h3>=3.7",
"pytest-benchmark"
4 changes: 2 additions & 2 deletions h3ronpy/python/h3ronpy/arrow/raster.py
Original file line number Diff line number Diff line change
@@ -28,7 +28,6 @@

"""

import shapely
from h3ronpy.h3ronpyrs import raster
from .. import DEFAULT_CELL_COLUMN_NAME
from . import _to_uint64_array, _to_arrow_array
@@ -136,7 +135,7 @@ def rasterize_cells(
"""
Generate a raster numpy array from arrays of cells and values.

This function requires the ``rasterio`` library.
This function requires the ``rasterio`` and `shapely` libraries to be installed.

:param cells: array with H3 cells
:param values: array with the values which shall be written into the raster
@@ -148,6 +147,7 @@ def rasterize_cells(
"""
from rasterio.transform import from_bounds
from rasterio.features import rasterize
import shapely

cells = _to_uint64_array(cells)
values = _to_arrow_array(values, None)