From c272fdae55b0fabe310364cff2d24f7d12383233 Mon Sep 17 00:00:00 2001 From: birgits Date: Fri, 16 Feb 2024 13:51:55 -0800 Subject: [PATCH] Restrict pandas version --- eDisGo_env.yml | 2 +- eDisGo_env_dev.yml | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eDisGo_env.yml b/eDisGo_env.yml index f35301247..45b797e16 100644 --- a/eDisGo_env.yml +++ b/eDisGo_env.yml @@ -5,7 +5,7 @@ channels: dependencies: - python >= 3.8, < 3.10 - pip - - pandas >= 1.4 + - pandas >= 1.4, < 2.2.0 - conda-forge::fiona - conda-forge::geopy - conda-forge::geopandas diff --git a/eDisGo_env_dev.yml b/eDisGo_env_dev.yml index a59866094..ae86632ac 100644 --- a/eDisGo_env_dev.yml +++ b/eDisGo_env_dev.yml @@ -5,7 +5,7 @@ channels: dependencies: - python >= 3.8, < 3.10 - pip - - pandas >= 1.4 + - pandas >= 1.4, < 2.2.0 - conda-forge::fiona - conda-forge::geopy - conda-forge::geopandas diff --git a/setup.py b/setup.py index 71e1618b6..4f570f745 100644 --- a/setup.py +++ b/setup.py @@ -46,7 +46,7 @@ def read(fname): "networkx >= 2.5.0", # newer pandas versions don't work with specified sqlalchemy versions, but upgrading # sqlalchemy leads to new errors.. should be fixed at some point - "pandas < 2.2.0", + "pandas >= 1.4.0, < 2.2.0", "plotly", "pydot", "pygeos",