Skip to content

build(deps): add Python 3.12 version markers for incompatible dependencies #87

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.

Sign up for GitHub

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

Open
LucianBell wants to merge 1 commit into
base: main
Choose a base branch
from
Open

build(deps): add Python 3.12 version markers for incompatible dependencies #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ work/*
.pytest_cache/*
docs/source/_build
docs/build
.venv
.venv*
dist
*~
.python-version
25 changes: 19 additions & 6 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,25 @@ authors = ["Christopher Villalobos <cvillalobos@ufl.edu>"]
license = "BSD-3-Clause"

[tool.poetry.dependencies]
python = "^3.8"
Fiona = "^1.9"
python = ">=3.8,<4.0"

numpy = [
{version = "^1.16", python = "<3.12"},
{version = "^2.4", python = ">=3.12"}
]

Fiona = [
{version = "^1.9", python = "<3.12"},
{version = "^1.10", python = ">=3.12"}
]

rasterio = [
{version = "^1.0", python = "<3.12"},
{version = "^1.5", python = ">=3.12"}
]

jinja2 = "^3.0"
numpy = "^1.16"
rasterio = "^1.0"
rtree = "^0.8"
rtree = "^0.8"

[tool.poetry.dev-dependencies]
pytest = "^5.1"
Expand All @@ -32,4 +45,4 @@ black = "^22.8.0"

[build-system]
requires = ["setuptools", "poetry-core>=1.0.0"]
build-backend = "poetry.core.masonry.api"
build-backend = "poetry.core.masonry.api"
7 changes: 6 additions & 1 deletion pythia/io.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@
import fiona
import numpy.ma as ma
import rasterio
from functools import cache

try:
from functools import cache
except ImportError:
from functools import lru_cache as cache

from typing import Any, Dict, Tuple
from pythia.gis import euclidean_distance

Expand Down