Skip to content

fix: unpin numpy<2 for python>3.10 #415

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

Merged
FabianHofmann merged 7 commits into from
Feb 9, 2025
Merged

fix: unpin numpy<2 for python>3.10 #415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f4751c2
fix: unpin numpy for non-windows sys_platform
ollie-bell Feb 8, 2025
d477057
fix: typo in specifier
ollie-bell Feb 8, 2025
45b2f78
fix: keep numpy<2 for 3.9 and 3.10
ollie-bell Feb 8, 2025
f9d1a1f
chore: see what happens for numpy unpinned for windows
ollie-bell Feb 9, 2025
937b427
fix: polars schema Int64 windows
ollie-bell Feb 9, 2025
835be0b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 9, 2025
8363b6a
fix: polars schema Int64 windows numpy > 2
ollie-bell Feb 9, 2025
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
4 changes: 3 additions & 1 deletion linopy/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,9 +318,11 @@ def infer_schema_polars(ds: Dataset) -> dict[Hashable, pl.DataType]:
dict: A dictionary mapping column names to their corresponding Polars data types.
"""
schema = {}
np_major_version = int(np.__version__.split(".")[0])
use_int32 = os.name == "nt" and np_major_version < 2
for name, array in ds.items():
if np.issubdtype(array.dtype, np.integer):
schema[name] = pl.Int32 if os.name == "nt" else pl.Int64
schema[name] = pl.Int32 if use_int32 else pl.Int64
elif np.issubdtype(array.dtype, np.floating):
schema[name] = pl.Float64 # type: ignore
elif np.issubdtype(array.dtype, np.bool_):
Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ classifiers = [

requires-python = ">=3.9"
dependencies = [
"numpy<2.0",
"numpy; python_version > '3.10'",
"numpy<2; python_version <= '3.10'",
"scipy",
"bottleneck",
"toolz",
Expand Down
Loading