From 09fb76de15c25ec987b1fb46c95ace1c5053706e Mon Sep 17 00:00:00 2001 From: "Kevin R. Thornton" Date: Wed, 27 Sep 2023 09:17:51 -0700 Subject: [PATCH 1/4] Pin max version of jsonschema to work around tskit issue. --- pyproject.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 3f0970277..2f5633be9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,6 +6,9 @@ requires = [ "setuptools_scm", "pybind11[global]==2.11.1", "cmake>=3.27.2" +# NOTE: this jsonschema pin is a hack until tskit issue 2840 +# is resolved + "jsonschema<=4.18.6" ] build-backend = "setuptools.build_meta" From 149b55b1eef07c2fc2a25a03b210781ae4990d7f Mon Sep 17 00:00:00 2001 From: "Kevin R. Thornton" Date: Wed, 27 Sep 2023 09:25:49 -0700 Subject: [PATCH 2/4] do requirements file, too --- requirements/development.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/requirements/development.txt b/requirements/development.txt index c3b3c259c..8a17e8b80 100644 --- a/requirements/development.txt +++ b/requirements/development.txt @@ -8,6 +8,9 @@ scipy attrs black demes~=0.2.2 +# NOTE: this jsonschema pin is a hack until tskit issue 2840 +# is resolved +jsonschema<=4.18.6 #below are for building package #and running tests From 55a3aa9ad5758f85fc812a4930c593d4b8b245ab Mon Sep 17 00:00:00 2001 From: "Kevin R. Thornton" Date: Wed, 27 Sep 2023 09:33:54 -0700 Subject: [PATCH 3/4] undo changes to pyproject.toml --- pyproject.toml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 2f5633be9..3f0970277 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,9 +6,6 @@ requires = [ "setuptools_scm", "pybind11[global]==2.11.1", "cmake>=3.27.2" -# NOTE: this jsonschema pin is a hack until tskit issue 2840 -# is resolved - "jsonschema<=4.18.6" ] build-backend = "setuptools.build_meta" From ca43b10f8ba2e0f39c87ec443513e75063237304 Mon Sep 17 00:00:00 2001 From: "Kevin R. Thornton" Date: Wed, 27 Sep 2023 09:34:46 -0700 Subject: [PATCH 4/4] make the change to setup.cfg --- setup.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup.cfg b/setup.cfg index 3939d79f4..1a474fb47 100644 --- a/setup.cfg +++ b/setup.cfg @@ -27,6 +27,9 @@ install_requires = scipy tskit ~= 0.5.0 demes ~= 0.2.2 +# NOTE: this jsonschema pin is a hack until tskit issue 2840 +# is resolved + jsonschema < 4.18.7 setup_requires = setuptools setuptools_scm