From b27775b376ff3f4e69d560bca17547f38869731c Mon Sep 17 00:00:00 2001 From: Kevin Schaper Date: Tue, 26 Sep 2023 10:05:27 -0700 Subject: [PATCH 1/3] Update requirements to allow pandas 2.x, also updated poetry lock file --- pyproject.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 699b8b9..8ec3f76 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "cat-merge" -version = "0.1.21" +version = "0.2.0" description = "" authors = [ "Monarch Initiative ", @@ -14,10 +14,10 @@ authors = [ [tool.poetry.dependencies] python = "^3.10" click = "^8" -pandas = "^1.4.2" +pandas = ">=1.4.2,<3.0.0" mkdocs = "^1.3.0" #grape = "^0.1.24" -scipy = "^1.9.1" +scipy = ">=1.9.1,<3.0.0" [tool.poetry.dev-dependencies] pytest = "^6.2.4" From 82244fd4d81498c50d346b4f0f5bcb0c3624d7b4 Mon Sep 17 00:00:00 2001 From: Kevin Schaper Date: Tue, 26 Sep 2023 10:59:37 -0700 Subject: [PATCH 2/3] back scipy back to <2.0.0 --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 8ec3f76..e3602f5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,10 +14,10 @@ authors = [ [tool.poetry.dependencies] python = "^3.10" click = "^8" -pandas = ">=1.4.2,<3.0.0" +pandas = "2.0.3" mkdocs = "^1.3.0" #grape = "^0.1.24" -scipy = ">=1.9.1,<3.0.0" +scipy = ">=1.9,<2.0.0" [tool.poetry.dev-dependencies] pytest = "^6.2.4" From 912e4d15a4c72449ac5621c5e8c8095f50d51b5c Mon Sep 17 00:00:00 2001 From: Kevin Schaper Date: Tue, 26 Sep 2023 11:00:34 -0700 Subject: [PATCH 3/3] Get more specific on pandas req --- pyproject.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index e3602f5..280d597 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,9 +14,8 @@ authors = [ [tool.poetry.dependencies] python = "^3.10" click = "^8" -pandas = "2.0.3" +pandas = ">=1.4.6,<2.1.0" mkdocs = "^1.3.0" -#grape = "^0.1.24" scipy = ">=1.9,<2.0.0" [tool.poetry.dev-dependencies]