From 1be25c103773ba0a000c02f07c30cda4ba7792d7 Mon Sep 17 00:00:00 2001 From: Dan Norman Date: Tue, 28 Nov 2023 15:36:23 -0800 Subject: [PATCH] attempt to resolve dependency walk issue --- poetry.lock | 4 ++-- pyproject.toml | 25 +++++-------------------- 2 files changed, 7 insertions(+), 22 deletions(-) diff --git a/poetry.lock b/poetry.lock index d6fcb8886..a1ab38204 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2485,11 +2485,11 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [extras] docs = ["furo", "myst-parser", "sphinx", "sphinx-autobuild", "sphinx-copybutton", "sphinx-inline-tabs", "sphinx-notfound-page", "sphinx-reredirects"] -parquet = ["numpy", "numpy", "pyarrow", "pyarrow"] +parquet = ["numpy", "pyarrow"] s3 = ["fs-s3fs"] testing = ["pytest", "pytest-durations"] [metadata] lock-version = "2.0" python-versions = "<4,>=3.8" -content-hash = "49f64ad0319fca91d3b045b325e58ed581aea3811886a5ec95cc377307c2e5f9" +content-hash = "9e9f34f7184571564a1ec39e8337d6fcb9965f222d45d06a72ae07dab2bca1fc" diff --git a/pyproject.toml b/pyproject.toml index 55deff1eb..fd9470c7b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -48,10 +48,7 @@ importlib-resources = {version = ">=5.12.0", markers = "python_version < \"3.9\" inflection = ">=0.5.1" joblib = ">=1.0.1" jsonpath-ng = ">=1.5.3" -jsonschema = [ - { version = ">=4.16.0,<4.18", python = "<3.8" }, - { version = ">=4.16.0", python = ">=3.8" }, -] +jsonschema = { version = ">=4.16.0", python = ">=3.8" } memoization = ">=0.3.2,<0.5.0" msgspec = "^0.18.4" packaging = ">=23.1" @@ -83,14 +80,8 @@ sphinx-reredirects = {version = ">=0.1.1", optional = true} fs-s3fs = {version = ">=1.1.1", optional = true} # Parquet file dependencies installed as optional 'parquet' extras -numpy = [ - { version = "<1.22", python = "<3.8", optional = true }, - { version = ">=1.22", python = ">=3.8", optional = true }, -] -pyarrow = [ - { version = ">=11", python = "<3.8", optional = true }, - { version = ">=13", python = ">=3.8", optional = true } -] +numpy = { version = ">=1.22", python = ">=3.8", optional = true } +pyarrow = { version = ">=13", python = ">=3.8", optional = true } # Testing dependencies installed as optional 'testing' extras pytest = {version=">=7.2.1", optional = true} @@ -132,14 +123,8 @@ pyarrow = [ pytest-benchmark = ">=4.0.0" pytest-snapshot = ">=0.9.0" requests-mock = ">=1.10.0" -time-machine = [ - { version = ">=2.10.0,<2.11", python = "<3.8" }, - { version = ">=2.10.0", python = ">=3.8" }, -] -types-jsonschema = [ - { version = ">=4.17.0.6,<4.18", python = "<3.8" }, - { version = ">=4.17.0.6", python = ">=3.8" }, -] +time-machine = { version = ">=2.10.0", python = ">=3.8" } +types-jsonschema ={ version = ">=4.17.0.6", python = ">=3.8" } types-python-dateutil = ">=2.8.19" types-pytz = ">=2022.7.1.2" types-requests = ">=2.28.11"