From 062c207ec6d8a9944b4d3db30d07638ced430185 Mon Sep 17 00:00:00 2001 From: svlandeg Date: Mon, 3 Oct 2022 09:31:32 +0200 Subject: [PATCH 1/2] support both Python 3.6 and Pydantic 1.10 --- requirements.txt | 3 ++- setup.cfg | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 7d7ee1b90..c0266f308 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,8 @@ catalogue>=2.0.4,<2.1.0 confection>=0.0.1,<1.0.0 ml_datasets>=0.2.0,<0.3.0 # Third-party dependencies -pydantic>=1.7.4,!=1.8,!=1.8.1,<1.10.0 +pydantic>=1.7.4,!=1.8,!=1.8.1,<1.10.0; python_version < "3.7" +pydantic>=1.7.4,!=1.8,!=1.8.1,<1.11.0; python_version >= "3.7" numpy>=1.15.0 # Backports of modern Python features dataclasses>=0.6,<1.0; python_version < "3.7" diff --git a/setup.cfg b/setup.cfg index e1feed06d..ec3860d3c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -49,7 +49,8 @@ install_requires = # Third-party dependencies setuptools numpy>=1.15.0 - pydantic>=1.7.4,!=1.8,!=1.8.1,<1.10.0 + pydantic>=1.7.4,!=1.8,!=1.8.1,<1.10.0; python_version < "3.7" + pydantic>=1.7.4,!=1.8,!=1.8.1,<1.11.0; python_version >= "3.7" # Backports of modern Python features dataclasses>=0.6,<1.0; python_version < "3.7" typing_extensions>=3.7.4.1,<4.2.0; python_version < "3.8" From eb4dbbc494454ecf401e9a3511baf4f0cbcfa9f1 Mon Sep 17 00:00:00 2001 From: Sofie Van Landeghem Date: Tue, 4 Oct 2022 14:03:53 +0200 Subject: [PATCH 2/2] Simplify according to Adriane's suggestion Co-authored-by: Adriane Boyd --- requirements.txt | 3 +-- setup.cfg | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index c0266f308..a94633e75 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,8 +9,7 @@ catalogue>=2.0.4,<2.1.0 confection>=0.0.1,<1.0.0 ml_datasets>=0.2.0,<0.3.0 # Third-party dependencies -pydantic>=1.7.4,!=1.8,!=1.8.1,<1.10.0; python_version < "3.7" -pydantic>=1.7.4,!=1.8,!=1.8.1,<1.11.0; python_version >= "3.7" +pydantic>=1.7.4,!=1.8,!=1.8.1,<1.11.0 numpy>=1.15.0 # Backports of modern Python features dataclasses>=0.6,<1.0; python_version < "3.7" diff --git a/setup.cfg b/setup.cfg index ec3860d3c..a0347c55e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -49,8 +49,7 @@ install_requires = # Third-party dependencies setuptools numpy>=1.15.0 - pydantic>=1.7.4,!=1.8,!=1.8.1,<1.10.0; python_version < "3.7" - pydantic>=1.7.4,!=1.8,!=1.8.1,<1.11.0; python_version >= "3.7" + pydantic>=1.7.4,!=1.8,!=1.8.1,<1.11.0 # Backports of modern Python features dataclasses>=0.6,<1.0; python_version < "3.7" typing_extensions>=3.7.4.1,<4.2.0; python_version < "3.8"