diff --git a/.codesandbox/Dockerfile b/.codesandbox/Dockerfile index 0ea6da6..d5ea071 100644 --- a/.codesandbox/Dockerfile +++ b/.codesandbox/Dockerfile @@ -1,6 +1,6 @@ FROM python:3.10.12 -RUN apt-get update && apt-get install -y npm fish && \ +RUN apt-get update && apt-get install -y fish && \ pip install -U pip && \ pip install poetry && \ poetry config virtualenvs.create false && \ diff --git a/.codesandbox/setup.sh b/.codesandbox/setup.sh index 88d24ef..5b92134 100644 --- a/.codesandbox/setup.sh +++ b/.codesandbox/setup.sh @@ -2,7 +2,6 @@ WORKSPACE="/workspace" # Install python dependencies poetry update && poetry install -pip install -U scipy wcwidth cd $WORKSPACE # Install whichpy diff --git a/poetry.lock b/poetry.lock index 94eedf2..ce846ed 100644 --- a/poetry.lock +++ b/poetry.lock @@ -80,13 +80,13 @@ toml = ["tomli"] [[package]] name = "datar" -version = "0.15.0" +version = "0.15.1" description = "A Grammar of Data Manipulation in python" optional = false python-versions = ">=3.8,<4.0" files = [ - {file = "datar-0.15.0-py3-none-any.whl", hash = "sha256:34ec1c56bcc767570c12730ad3732151958ac7ee90cffa5c87e45ce6d75ff98e"}, - {file = "datar-0.15.0.tar.gz", hash = "sha256:c08d74218f670e14d357079e62904be84cd96ac8ed64f9b22c29ebfac44017a8"}, + {file = "datar-0.15.1-py3-none-any.whl", hash = "sha256:6503b5c8cabead25bfe9231fbd9e1b221f374d2e4b29096a83ed69af0cd4ed6d"}, + {file = "datar-0.15.1.tar.gz", hash = "sha256:d578761b6cb8e1517f066dd00fa1665b8626d3faef1e57d69908c3b9e2748a5f"}, ] [package.dependencies] @@ -96,8 +96,8 @@ simplug = ">=0.3,<0.4" [package.extras] arrow = ["datar-arrow (>=0.1,<0.2)"] -numpy = ["datar-numpy (>=0.3,<0.4)"] -pandas = ["datar-pandas (>=0.5,<0.6)"] +numpy = ["datar-numpy (>=0.3.2,<0.4.0)"] +pandas = ["datar-pandas (>=0.5.1,<0.6.0)"] [[package]] name = "datar-numpy" @@ -113,8 +113,6 @@ files = [ [package.dependencies] datar = ">=0.15,<0.16" numpy = ">=1.20,<2.0" -scipy = {version = ">=1.8,<2.0", optional = true, markers = "extra == \"all\""} -wcwidth = {version = ">=0.2,<0.3", optional = true, markers = "extra == \"all\""} [package.extras] all = ["scipy (>=1.8,<2.0)", "wcwidth (>=0.2,<0.3)"] @@ -571,9 +569,9 @@ files = [ ] [extras] -all = ["datar-numpy", "datar-numpy"] +all = ["scipy", "wcwidth"] [metadata] lock-version = "2.0" python-versions = "^3.8" -content-hash = "f282f54eae99b043cd7bfb19aa4a9f4f2b05a93d08580b5464722d0192ee0e63" +content-hash = "4dc62b515dd96a88fb0cd37e2a15d8d2e0d9c3b5913f49413e2abb2cee7783d6" diff --git a/pyproject.toml b/pyproject.toml index 5c21da4..14504ce 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,14 +13,13 @@ python = "^3.8" pdtypes = "^0.2" datar = "^0.15" # datar = { path = "../datar" } -datar-numpy = [ - { version = "^0.3.2", optional = true, extras = ["all"] }, - { version = "^0.3.2" } -] +datar-numpy = "^0.3.2" # datar-numpy = { path = "../datar-numpy", extras = ["all"] } +scipy = { version = "^1.8", optional = true } +wcwidth = { version = "^0.2", optional = true } [tool.poetry.extras] -all = ["datar-numpy"] +all = ["scipy", "wcwidth"] [tool.poetry.build] generate-setup-file = true