From b6b21a2cd763ab4c33315626582e6078d2bf5879 Mon Sep 17 00:00:00 2001 From: Frances Hartwell Date: Wed, 26 Apr 2023 11:29:37 -0400 Subject: [PATCH 1/2] unpin pandas --- deepecho/models/base.py | 2 +- setup.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deepecho/models/base.py b/deepecho/models/base.py index cd16926..fa44058 100644 --- a/deepecho/models/base.py +++ b/deepecho/models/base.py @@ -248,6 +248,6 @@ def sample(self, num_entities=None, context=None, sequence_length=None): for column, value in zip(self._context_columns, context_values): group[column] = value - output = output.append(group) + output = pd.concat([output, group]) return output[self._output_columns].reset_index(drop=True) diff --git a/setup.py b/setup.py index 881d7a6..ce3cd4b 100644 --- a/setup.py +++ b/setup.py @@ -13,8 +13,8 @@ install_requires = [ "numpy>=1.20.0,<2;python_version<'3.10'", - "numpy>=1.23.3,<2;python_version>='3.10'", - "pandas>=1.1.3,<2;python_version<'3.10'", + "numpy>=1.23.3;python_version>='3.10'", + "pandas>=1.1.3;python_version<'3.10'", "pandas>=1.3.4,<2;python_version>='3.10'", "torch>=1.8.0,<2;python_version<'3.10'", "torch>=1.11.0,<2;python_version>='3.10'", From 63c6b126d343a34c91685a72739e2b9b3b4eebab Mon Sep 17 00:00:00 2001 From: Frances Hartwell Date: Thu, 27 Apr 2023 13:43:40 -0400 Subject: [PATCH 2/2] fix --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index ce3cd4b..7211cd1 100644 --- a/setup.py +++ b/setup.py @@ -13,9 +13,9 @@ install_requires = [ "numpy>=1.20.0,<2;python_version<'3.10'", - "numpy>=1.23.3;python_version>='3.10'", + "numpy>=1.23.3,<2;python_version>='3.10'", "pandas>=1.1.3;python_version<'3.10'", - "pandas>=1.3.4,<2;python_version>='3.10'", + "pandas>=1.3.4;python_version>='3.10'", "torch>=1.8.0,<2;python_version<'3.10'", "torch>=1.11.0,<2;python_version>='3.10'", 'tqdm>=4.15,<5',