diff --git a/Dockerfile b/Dockerfile index 6561fa6c..4e2451eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ # https://medium.com/@albertazzir/blazing-fast-python-docker-builds-with-poetry-a78a66f5aed0 # The builder image, used to build the virtual environment -FROM python:3.11-buster as builder +FROM python:3.11-buster AS builder RUN pip install poetry==2.0.0 @@ -22,10 +22,10 @@ COPY pyproject.toml poetry.lock ./ # Because poetry will complain if a README.md is not found, we create a dummy one. RUN touch README.md -RUN poetry install --without development --extras=fit --no-root && rm -rf $POETRY_CACHE_DIR +RUN poetry install --without development --no-root && rm -rf $POETRY_CACHE_DIR # The runtime image, used to run the code -FROM python:3.11-slim-buster as runtime +FROM python:3.11-slim-buster AS runtime LABEL image.author.name="Judith Bernett" LABEL image.author.email="judith.bernett@tum.de" diff --git a/docs/conf.py b/docs/conf.py index d8642592..857cf384 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -56,9 +56,9 @@ # the built documents. # # The short X.Y version. -version = "1.1.2" +version = "1.1.3" # The full version, including alpha/beta/rc tags. -release = "1.1.2" +release = "1.1.3" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/poetry.lock b/poetry.lock index 53f4fb07..64628322 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 2.0.0 and should not be changed by hand. +# This file is automatically @generated by Poetry 2.0.1 and should not be changed by hand. [[package]] name = "aiohappyeyeballs" @@ -310,10 +310,10 @@ uvloop = ["uvloop (>=0.15.2)"] name = "bokeh" version = "3.4.3" description = "Interactive plots and applications in the browser from Python" -optional = true +optional = false python-versions = ">=3.9" groups = ["main"] -markers = "(python_version == \"3.11\" or python_version >= \"3.12\") and extra == \"fit\"" +markers = "python_version == \"3.11\" or python_version >= \"3.12\"" files = [ {file = "bokeh-3.4.3-py3-none-any.whl", hash = "sha256:c6f33817f866fc67fbeb5df79cd13a8bb592c05c591f3fd7f4f22b824f7afa01"}, {file = "bokeh-3.4.3.tar.gz", hash = "sha256:b7c22fb0f7004b04f12e1b7b26ee0269a26737a08ded848fb58f6a34ec1eb155"}, @@ -398,7 +398,7 @@ description = "Foreign Function Interface for Python calling C code." optional = false python-versions = ">=3.8" groups = ["main"] -markers = "(sys_platform == \"linux\" or sys_platform == \"darwin\") and (python_version == \"3.11\" or python_version >= \"3.12\") and (platform_python_implementation != \"PyPy\" or sys_platform == \"darwin\") and (python_version == \"3.11\" or sys_platform == \"darwin\" or sys_platform == \"linux\")" +markers = "python_version == \"3.11\" and sys_platform == \"linux\" and platform_python_implementation != \"PyPy\" or python_version == \"3.11\" and sys_platform == \"darwin\" or python_version >= \"3.12\" and sys_platform == \"linux\" and platform_python_implementation != \"PyPy\" or python_version >= \"3.12\" and sys_platform == \"darwin\"" files = [ {file = "cffi-1.17.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:df8b1c11f177bc2313ec4b2d46baec87a5f3e71fc8b45dab2ee7cae86d9aba14"}, {file = "cffi-1.17.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:8f2cdc858323644ab277e9bb925ad72ae0e67f69e804f4898c070998d50b1a67"}, @@ -616,7 +616,7 @@ files = [ {file = "click-8.1.8-py3-none-any.whl", hash = "sha256:63c132bbbed01578a06712a2d1f497bb62d9c1c0d329b7903a866228027263b2"}, {file = "click-8.1.8.tar.gz", hash = "sha256:ed53c9d8990d83c2a27deae68e4ee337473f6330c040a31d4225c9574d16096a"}, ] -markers = {main = "(python_version == \"3.11\" or python_version >= \"3.12\") and extra == \"multiprocessing\"", development = "python_version == \"3.11\" or python_version >= \"3.12\""} +markers = {main = "python_version == \"3.11\" and extra == \"multiprocessing\" or python_version >= \"3.12\" and extra == \"multiprocessing\"", development = "python_version == \"3.11\" or python_version >= \"3.12\""} [package.dependencies] colorama = {version = "*", markers = "platform_system == \"Windows\""} @@ -632,7 +632,7 @@ files = [ {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"}, {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"}, ] -markers = {main = "(platform_system == \"Windows\" or sys_platform == \"win32\" or os_name == \"nt\") and (python_version == \"3.11\" or python_version >= \"3.12\")", development = "python_version == \"3.11\" or python_version >= \"3.12\""} +markers = {main = "python_version == \"3.11\" and platform_system == \"Windows\" or python_version == \"3.11\" and sys_platform == \"win32\" or python_version == \"3.11\" and os_name == \"nt\" or python_version >= \"3.12\" and platform_system == \"Windows\" or python_version >= \"3.12\" and sys_platform == \"win32\" or python_version >= \"3.12\" and os_name == \"nt\"", development = "python_version == \"3.11\" or python_version >= \"3.12\""} [[package]] name = "colorlog" @@ -748,7 +748,7 @@ description = "cryptography is a package which provides cryptographic recipes an optional = false python-versions = "!=3.9.0,!=3.9.1,>=3.7" groups = ["main"] -markers = "(python_version == \"3.11\" or python_version >= \"3.12\") and sys_platform == \"linux\"" +markers = "python_version == \"3.11\" and sys_platform == \"linux\" or python_version >= \"3.12\" and sys_platform == \"linux\"" files = [ {file = "cryptography-44.0.0-cp37-abi3-macosx_10_9_universal2.whl", hash = "sha256:84111ad4ff3f6253820e6d3e58be2cc2a00adb29335d4cacb5ab4d4d34f2a123"}, {file = "cryptography-44.0.0-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b15492a11f9e1b62ba9d73c210e2416724633167de94607ec6069ef724fad092"}, @@ -796,10 +796,10 @@ test-randomorder = ["pytest-randomly"] name = "curve-curator" version = "0.5.1" description = "CurveCurator is an open-source analysis platform for any dose-dependent data. It fits a classical 4-parameter equation to estimate effect potency, effect size, and the statistical significance of the observed response. 2D-thresholding efficiently reduces false positives in high-throughput experiments and separates relevant from irrelevant or insignificant hits in an automated and unbiased manner. An interactive dashboard allows users to quickly explore data locally." -optional = true +optional = false python-versions = "<3.13,>=3.11" groups = ["main"] -markers = "(python_version == \"3.11\" or python_version >= \"3.12\") and extra == \"fit\"" +markers = "python_version == \"3.11\" or python_version >= \"3.12\"" files = [ {file = "curve_curator-0.5.1-py3-none-any.whl", hash = "sha256:23b74f7c92f1cc9bd0fdedb3429514df4b779fa39a98dfe5eb4ae14efb67b0ee"}, ] @@ -1511,7 +1511,7 @@ description = "Low-level, pure Python DBus protocol wrapper." optional = false python-versions = ">=3.7" groups = ["main"] -markers = "(python_version == \"3.11\" or python_version >= \"3.12\") and sys_platform == \"linux\"" +markers = "python_version == \"3.11\" and sys_platform == \"linux\" or python_version >= \"3.12\" and sys_platform == \"linux\"" files = [ {file = "jeepney-0.8.0-py3-none-any.whl", hash = "sha256:c0a454ad016ca575060802ee4d590dd912e35c122fa04e70306de3d076cce755"}, {file = "jeepney-0.8.0.tar.gz", hash = "sha256:5efe48d255973902f6badc3ce55e2aa6c5c3b3bc642059ef3a91247bcfcc5806"}, @@ -1560,7 +1560,7 @@ description = "An implementation of JSON Schema validation for Python" optional = true python-versions = ">=3.8" groups = ["main"] -markers = "(python_version == \"3.11\" or python_version >= \"3.12\") and extra == \"multiprocessing\"" +markers = "python_version == \"3.11\" and extra == \"multiprocessing\" or python_version >= \"3.12\" and extra == \"multiprocessing\"" files = [ {file = "jsonschema-4.23.0-py3-none-any.whl", hash = "sha256:fbadb6f8b144a8f8cf9f0b89ba94501d143e50411a1278633f56a7acf7fd5566"}, {file = "jsonschema-4.23.0.tar.gz", hash = "sha256:d71497fef26351a33265337fa77ffeb82423f3ea21283cd9467bb03999266bc4"}, @@ -1583,7 +1583,7 @@ description = "The JSON Schema meta-schemas and vocabularies, exposed as a Regis optional = true python-versions = ">=3.9" groups = ["main"] -markers = "(python_version == \"3.11\" or python_version >= \"3.12\") and extra == \"multiprocessing\"" +markers = "python_version == \"3.11\" and extra == \"multiprocessing\" or python_version >= \"3.12\" and extra == \"multiprocessing\"" files = [ {file = "jsonschema_specifications-2024.10.1-py3-none-any.whl", hash = "sha256:a09a0680616357d9a0ecf05c12ad234479f549239d0f5b55f3deea67475da9bf"}, {file = "jsonschema_specifications-2024.10.1.tar.gz", hash = "sha256:0f38b83639958ce1152d02a7f062902c41c8fd20d558b0c34344292d417ae272"}, @@ -2272,7 +2272,7 @@ description = "CUBLAS native runtime libraries" optional = false python-versions = ">=3" groups = ["main"] -markers = "platform_system == \"Linux\" and platform_machine == \"x86_64\" and (python_version == \"3.11\" or python_version >= \"3.12\")" +markers = "python_version == \"3.11\" and platform_system == \"Linux\" and platform_machine == \"x86_64\" or python_version >= \"3.12\" and platform_system == \"Linux\" and platform_machine == \"x86_64\"" files = [ {file = "nvidia_cublas_cu12-12.1.3.1-py3-none-manylinux1_x86_64.whl", hash = "sha256:ee53ccca76a6fc08fb9701aa95b6ceb242cdaab118c3bb152af4e579af792728"}, {file = "nvidia_cublas_cu12-12.1.3.1-py3-none-win_amd64.whl", hash = "sha256:2b964d60e8cf11b5e1073d179d85fa340c120e99b3067558f3cf98dd69d02906"}, @@ -2285,7 +2285,7 @@ description = "CUDA profiling tools runtime libs." optional = false python-versions = ">=3" groups = ["main"] -markers = "platform_system == \"Linux\" and platform_machine == \"x86_64\" and (python_version == \"3.11\" or python_version >= \"3.12\")" +markers = "python_version == \"3.11\" and platform_system == \"Linux\" and platform_machine == \"x86_64\" or python_version >= \"3.12\" and platform_system == \"Linux\" and platform_machine == \"x86_64\"" files = [ {file = "nvidia_cuda_cupti_cu12-12.1.105-py3-none-manylinux1_x86_64.whl", hash = "sha256:e54fde3983165c624cb79254ae9818a456eb6e87a7fd4d56a2352c24ee542d7e"}, {file = "nvidia_cuda_cupti_cu12-12.1.105-py3-none-win_amd64.whl", hash = "sha256:bea8236d13a0ac7190bd2919c3e8e6ce1e402104276e6f9694479e48bb0eb2a4"}, @@ -2298,7 +2298,7 @@ description = "NVRTC native runtime libraries" optional = false python-versions = ">=3" groups = ["main"] -markers = "platform_system == \"Linux\" and platform_machine == \"x86_64\" and (python_version == \"3.11\" or python_version >= \"3.12\")" +markers = "python_version == \"3.11\" and platform_system == \"Linux\" and platform_machine == \"x86_64\" or python_version >= \"3.12\" and platform_system == \"Linux\" and platform_machine == \"x86_64\"" files = [ {file = "nvidia_cuda_nvrtc_cu12-12.1.105-py3-none-manylinux1_x86_64.whl", hash = "sha256:339b385f50c309763ca65456ec75e17bbefcbbf2893f462cb8b90584cd27a1c2"}, {file = "nvidia_cuda_nvrtc_cu12-12.1.105-py3-none-win_amd64.whl", hash = "sha256:0a98a522d9ff138b96c010a65e145dc1b4850e9ecb75a0172371793752fd46ed"}, @@ -2311,7 +2311,7 @@ description = "CUDA Runtime native Libraries" optional = false python-versions = ">=3" groups = ["main"] -markers = "platform_system == \"Linux\" and platform_machine == \"x86_64\" and (python_version == \"3.11\" or python_version >= \"3.12\")" +markers = "python_version == \"3.11\" and platform_system == \"Linux\" and platform_machine == \"x86_64\" or python_version >= \"3.12\" and platform_system == \"Linux\" and platform_machine == \"x86_64\"" files = [ {file = "nvidia_cuda_runtime_cu12-12.1.105-py3-none-manylinux1_x86_64.whl", hash = "sha256:6e258468ddf5796e25f1dc591a31029fa317d97a0a94ed93468fc86301d61e40"}, {file = "nvidia_cuda_runtime_cu12-12.1.105-py3-none-win_amd64.whl", hash = "sha256:dfb46ef84d73fababab44cf03e3b83f80700d27ca300e537f85f636fac474344"}, @@ -2324,7 +2324,7 @@ description = "cuDNN runtime libraries" optional = false python-versions = ">=3" groups = ["main"] -markers = "platform_system == \"Linux\" and platform_machine == \"x86_64\" and (python_version == \"3.11\" or python_version >= \"3.12\")" +markers = "python_version == \"3.11\" and platform_system == \"Linux\" and platform_machine == \"x86_64\" or python_version >= \"3.12\" and platform_system == \"Linux\" and platform_machine == \"x86_64\"" files = [ {file = "nvidia_cudnn_cu12-9.1.0.70-py3-none-manylinux2014_x86_64.whl", hash = "sha256:165764f44ef8c61fcdfdfdbe769d687e06374059fbb388b6c89ecb0e28793a6f"}, {file = "nvidia_cudnn_cu12-9.1.0.70-py3-none-win_amd64.whl", hash = "sha256:6278562929433d68365a07a4a1546c237ba2849852c0d4b2262a486e805b977a"}, @@ -2340,7 +2340,7 @@ description = "CUFFT native runtime libraries" optional = false python-versions = ">=3" groups = ["main"] -markers = "platform_system == \"Linux\" and platform_machine == \"x86_64\" and (python_version == \"3.11\" or python_version >= \"3.12\")" +markers = "python_version == \"3.11\" and platform_system == \"Linux\" and platform_machine == \"x86_64\" or python_version >= \"3.12\" and platform_system == \"Linux\" and platform_machine == \"x86_64\"" files = [ {file = "nvidia_cufft_cu12-11.0.2.54-py3-none-manylinux1_x86_64.whl", hash = "sha256:794e3948a1aa71fd817c3775866943936774d1c14e7628c74f6f7417224cdf56"}, {file = "nvidia_cufft_cu12-11.0.2.54-py3-none-win_amd64.whl", hash = "sha256:d9ac353f78ff89951da4af698f80870b1534ed69993f10a4cf1d96f21357e253"}, @@ -2353,7 +2353,7 @@ description = "CURAND native runtime libraries" optional = false python-versions = ">=3" groups = ["main"] -markers = "platform_system == \"Linux\" and platform_machine == \"x86_64\" and (python_version == \"3.11\" or python_version >= \"3.12\")" +markers = "python_version == \"3.11\" and platform_system == \"Linux\" and platform_machine == \"x86_64\" or python_version >= \"3.12\" and platform_system == \"Linux\" and platform_machine == \"x86_64\"" files = [ {file = "nvidia_curand_cu12-10.3.2.106-py3-none-manylinux1_x86_64.whl", hash = "sha256:9d264c5036dde4e64f1de8c50ae753237c12e0b1348738169cd0f8a536c0e1e0"}, {file = "nvidia_curand_cu12-10.3.2.106-py3-none-win_amd64.whl", hash = "sha256:75b6b0c574c0037839121317e17fd01f8a69fd2ef8e25853d826fec30bdba74a"}, @@ -2366,7 +2366,7 @@ description = "CUDA solver native runtime libraries" optional = false python-versions = ">=3" groups = ["main"] -markers = "platform_system == \"Linux\" and platform_machine == \"x86_64\" and (python_version == \"3.11\" or python_version >= \"3.12\")" +markers = "python_version == \"3.11\" and platform_system == \"Linux\" and platform_machine == \"x86_64\" or python_version >= \"3.12\" and platform_system == \"Linux\" and platform_machine == \"x86_64\"" files = [ {file = "nvidia_cusolver_cu12-11.4.5.107-py3-none-manylinux1_x86_64.whl", hash = "sha256:8a7ec542f0412294b15072fa7dab71d31334014a69f953004ea7a118206fe0dd"}, {file = "nvidia_cusolver_cu12-11.4.5.107-py3-none-win_amd64.whl", hash = "sha256:74e0c3a24c78612192a74fcd90dd117f1cf21dea4822e66d89e8ea80e3cd2da5"}, @@ -2384,7 +2384,7 @@ description = "CUSPARSE native runtime libraries" optional = false python-versions = ">=3" groups = ["main"] -markers = "platform_system == \"Linux\" and platform_machine == \"x86_64\" and (python_version == \"3.11\" or python_version >= \"3.12\")" +markers = "python_version == \"3.11\" and platform_system == \"Linux\" and platform_machine == \"x86_64\" or python_version >= \"3.12\" and platform_system == \"Linux\" and platform_machine == \"x86_64\"" files = [ {file = "nvidia_cusparse_cu12-12.1.0.106-py3-none-manylinux1_x86_64.whl", hash = "sha256:f3b50f42cf363f86ab21f720998517a659a48131e8d538dc02f8768237bd884c"}, {file = "nvidia_cusparse_cu12-12.1.0.106-py3-none-win_amd64.whl", hash = "sha256:b798237e81b9719373e8fae8d4f091b70a0cf09d9d85c95a557e11df2d8e9a5a"}, @@ -2400,7 +2400,7 @@ description = "NVIDIA Collective Communication Library (NCCL) Runtime" optional = false python-versions = ">=3" groups = ["main"] -markers = "platform_system == \"Linux\" and platform_machine == \"x86_64\" and (python_version == \"3.11\" or python_version >= \"3.12\")" +markers = "python_version == \"3.11\" and platform_system == \"Linux\" and platform_machine == \"x86_64\" or python_version >= \"3.12\" and platform_system == \"Linux\" and platform_machine == \"x86_64\"" files = [ {file = "nvidia_nccl_cu12-2.20.5-py3-none-manylinux2014_aarch64.whl", hash = "sha256:1fc150d5c3250b170b29410ba682384b14581db722b2531b0d8d33c595f33d01"}, {file = "nvidia_nccl_cu12-2.20.5-py3-none-manylinux2014_x86_64.whl", hash = "sha256:057f6bf9685f75215d0c53bf3ac4a10b3e6578351de307abad9e18a99182af56"}, @@ -2413,7 +2413,7 @@ description = "Nvidia JIT LTO Library" optional = false python-versions = ">=3" groups = ["main"] -markers = "platform_system == \"Linux\" and platform_machine == \"x86_64\" and (python_version == \"3.11\" or python_version >= \"3.12\")" +markers = "python_version == \"3.11\" and platform_system == \"Linux\" and platform_machine == \"x86_64\" or python_version >= \"3.12\" and platform_system == \"Linux\" and platform_machine == \"x86_64\"" files = [ {file = "nvidia_nvjitlink_cu12-12.6.85-py3-none-manylinux2010_x86_64.manylinux_2_12_x86_64.whl", hash = "sha256:eedc36df9e88b682efe4309aa16b5b4e78c2407eac59e8c10a6a47535164369a"}, {file = "nvidia_nvjitlink_cu12-12.6.85-py3-none-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:cf4eaa7d4b6b543ffd69d6abfb11efdeb2db48270d94dfd3a452c24150829e41"}, @@ -2427,7 +2427,7 @@ description = "NVIDIA Tools Extension" optional = false python-versions = ">=3" groups = ["main"] -markers = "platform_system == \"Linux\" and platform_machine == \"x86_64\" and (python_version == \"3.11\" or python_version >= \"3.12\")" +markers = "python_version == \"3.11\" and platform_system == \"Linux\" and platform_machine == \"x86_64\" or python_version >= \"3.12\" and platform_system == \"Linux\" and platform_machine == \"x86_64\"" files = [ {file = "nvidia_nvtx_cu12-12.1.105-py3-none-manylinux1_x86_64.whl", hash = "sha256:dc21cf308ca5691e7c04d962e213f8a4aa9bbfa23d95412f452254c2caeb09e5"}, {file = "nvidia_nvtx_cu12-12.1.105-py3-none-win_amd64.whl", hash = "sha256:65f4d98982b31b60026e0e6de73fbdfc09d08a96f4656dd3665ca616a11e1e82"}, @@ -2799,15 +2799,15 @@ testing = ["pytest", "pytest-benchmark"] [[package]] name = "poetry" -version = "2.0.0" +version = "2.0.1" description = "Python dependency management and packaging made easy." optional = false python-versions = "<4.0,>=3.9" groups = ["main"] markers = "python_version == \"3.11\" or python_version >= \"3.12\"" files = [ - {file = "poetry-2.0.0-py3-none-any.whl", hash = "sha256:d099fe8b3ee4d21f32d55fe85194f004ea2492749e8fc071980f20a8c65c9416"}, - {file = "poetry-2.0.0.tar.gz", hash = "sha256:9416b1e3657ed02cda9599ae73b604bd68f187adaa2d8d1bcc804dacfa9bcd1f"}, + {file = "poetry-2.0.1-py3-none-any.whl", hash = "sha256:eb780a8acbd6eec4bc95e8ba104058c5129ea5a44115fc9b1fc0a2235412734d"}, + {file = "poetry-2.0.1.tar.gz", hash = "sha256:a2987c3162f6ded6db890701a6fc657d2cfcc702e9421ef4c345211c8bffc5d5"}, ] [package.dependencies] @@ -2821,7 +2821,7 @@ keyring = ">=25.1.0,<26.0.0" packaging = ">=24.0" pkginfo = ">=1.12,<2.0" platformdirs = ">=3.0.0,<5" -poetry-core = "2.0.0" +poetry-core = "2.0.1" pyproject-hooks = ">=1.0.0,<2.0.0" requests = ">=2.26,<3.0" requests-toolbelt = ">=1.0.0,<2.0.0" @@ -2833,15 +2833,15 @@ xattr = {version = ">=1.0.0,<2.0.0", markers = "sys_platform == \"darwin\""} [[package]] name = "poetry-core" -version = "2.0.0" +version = "2.0.1" description = "Poetry PEP 517 Build Backend" optional = false python-versions = "<4.0,>=3.9" groups = ["main"] markers = "python_version == \"3.11\" or python_version >= \"3.12\"" files = [ - {file = "poetry_core-2.0.0-py3-none-any.whl", hash = "sha256:1da7dd9279c5af8ed63f05c87a743dcadbf048dfe78f21c436710829cfff95fe"}, - {file = "poetry_core-2.0.0.tar.gz", hash = "sha256:3317a3cc3932011a61114236b2d49883f4fb1403d2f5e97771ac0d077cfa396f"}, + {file = "poetry_core-2.0.1-py3-none-any.whl", hash = "sha256:a3c7009536522cda4eb0fb3805c9dc935b5537f8727dd01efb9c15e51a17552b"}, + {file = "poetry_core-2.0.1.tar.gz", hash = "sha256:10177c2772469d9032a49f0d8707af761b1c597cea3b4fb31546e5cd436eb157"}, ] [[package]] @@ -2997,7 +2997,7 @@ description = "" optional = true python-versions = ">=3.8" groups = ["main"] -markers = "(python_version == \"3.11\" or python_version >= \"3.12\") and extra == \"multiprocessing\"" +markers = "python_version == \"3.11\" and extra == \"multiprocessing\" or python_version >= \"3.12\" and extra == \"multiprocessing\"" files = [ {file = "protobuf-5.29.3-cp310-abi3-win32.whl", hash = "sha256:3ea51771449e1035f26069c4c7fd51fba990d07bc55ba80701c78f886bf9c888"}, {file = "protobuf-5.29.3-cp310-abi3-win_amd64.whl", hash = "sha256:a4fa6f80816a9a0678429e84973f2f98cbc218cca434abe8db2ad0bffc98503a"}, @@ -3064,7 +3064,7 @@ description = "C parser in Python" optional = false python-versions = ">=3.8" groups = ["main"] -markers = "(sys_platform == \"linux\" or sys_platform == \"darwin\") and (python_version == \"3.11\" or python_version >= \"3.12\") and (platform_python_implementation != \"PyPy\" or sys_platform == \"darwin\") and (python_version == \"3.11\" or sys_platform == \"darwin\" or sys_platform == \"linux\")" +markers = "python_version == \"3.11\" and sys_platform == \"linux\" and platform_python_implementation != \"PyPy\" or python_version == \"3.11\" and sys_platform == \"darwin\" or python_version >= \"3.12\" and sys_platform == \"linux\" and platform_python_implementation != \"PyPy\" or python_version >= \"3.12\" and sys_platform == \"darwin\"" files = [ {file = "pycparser-2.22-py3-none-any.whl", hash = "sha256:c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc"}, {file = "pycparser-2.22.tar.gz", hash = "sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6"}, @@ -3253,7 +3253,7 @@ description = "A (partial) reimplementation of pywin32 using ctypes/cffi" optional = false python-versions = ">=3.6" groups = ["main"] -markers = "(python_version == \"3.11\" or python_version >= \"3.12\") and sys_platform == \"win32\"" +markers = "python_version == \"3.11\" and sys_platform == \"win32\" or python_version >= \"3.12\" and sys_platform == \"win32\"" files = [ {file = "pywin32-ctypes-0.2.3.tar.gz", hash = "sha256:d162dc04946d704503b2edc4d55f3dba5c1d539ead017afa00142c38b9885755"}, {file = "pywin32_ctypes-0.2.3-py3-none-any.whl", hash = "sha256:8a1513379d709975552d202d942d9837758905c8d01eb82b8bcc30918929e7b8"}, @@ -3432,7 +3432,7 @@ description = "Ray provides a simple, universal API for building distributed app optional = true python-versions = ">=3.9" groups = ["main"] -markers = "(python_version == \"3.11\" or python_version >= \"3.12\") and extra == \"multiprocessing\"" +markers = "python_version == \"3.11\" and extra == \"multiprocessing\" or python_version >= \"3.12\" and extra == \"multiprocessing\"" files = [ {file = "ray-2.40.0-cp310-cp310-macosx_10_15_x86_64.whl", hash = "sha256:064af8bc52cc988c82470b8e76e5df417737fa7c1d87f597a892c69eb4ec3caa"}, {file = "ray-2.40.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:45beb4019cd20b6cb10572d8012c771bccd623f544a669da6797ccf993c4bb33"}, @@ -3491,7 +3491,7 @@ description = "JSON Referencing + Python" optional = true python-versions = ">=3.8" groups = ["main"] -markers = "(python_version == \"3.11\" or python_version >= \"3.12\") and extra == \"multiprocessing\"" +markers = "python_version == \"3.11\" and extra == \"multiprocessing\" or python_version >= \"3.12\" and extra == \"multiprocessing\"" files = [ {file = "referencing-0.35.1-py3-none-any.whl", hash = "sha256:eda6d3234d62814d1c64e305c1331c9a3a6132da475ab6382eaa997b21ee75de"}, {file = "referencing-0.35.1.tar.gz", hash = "sha256:25b42124a6c8b632a425174f24087783efb348a6f1e0008e63cd4466fedf703c"}, @@ -3582,7 +3582,7 @@ description = "Python bindings to Rust's persistent data structures (rpds)" optional = true python-versions = ">=3.9" groups = ["main"] -markers = "(python_version == \"3.11\" or python_version >= \"3.12\") and extra == \"multiprocessing\"" +markers = "python_version == \"3.11\" and extra == \"multiprocessing\" or python_version >= \"3.12\" and extra == \"multiprocessing\"" files = [ {file = "rpds_py-0.22.3-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:6c7b99ca52c2c1752b544e310101b98a659b720b21db00e65edca34483259967"}, {file = "rpds_py-0.22.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:be2eb3f2495ba669d2a985f9b426c1797b7d48d6963899276d22f23e33d47e37"}, @@ -3716,7 +3716,7 @@ description = "C version of reader, parser and emitter for ruamel.yaml derived f optional = false python-versions = ">=3.9" groups = ["development"] -markers = "platform_python_implementation == \"CPython\" and (python_version == \"3.11\" or python_version >= \"3.12\")" +markers = "python_version == \"3.11\" and platform_python_implementation == \"CPython\" or python_version >= \"3.12\" and platform_python_implementation == \"CPython\"" files = [ {file = "ruamel.yaml.clib-0.2.12-cp310-cp310-macosx_13_0_arm64.whl", hash = "sha256:11f891336688faf5156a36293a9c362bdc7c88f03a8a027c2c1d8e0bcde998e5"}, {file = "ruamel.yaml.clib-0.2.12-cp310-cp310-manylinux2014_aarch64.whl", hash = "sha256:a606ef75a60ecf3d924613892cc603b154178ee25abb3055db5062da811fd969"}, @@ -3906,7 +3906,7 @@ description = "Python bindings to FreeDesktop.org Secret Service API" optional = false python-versions = ">=3.6" groups = ["main"] -markers = "(python_version == \"3.11\" or python_version >= \"3.12\") and sys_platform == \"linux\"" +markers = "python_version == \"3.11\" and sys_platform == \"linux\" or python_version >= \"3.12\" and sys_platform == \"linux\"" files = [ {file = "SecretStorage-3.3.3-py3-none-any.whl", hash = "sha256:f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99"}, {file = "SecretStorage-3.3.3.tar.gz", hash = "sha256:2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77"}, @@ -4543,10 +4543,10 @@ visual = ["SciencePlots (>=2.0.0)", "matplotlib (>=3.6.0)"] name = "tornado" version = "6.4.2" description = "Tornado is a Python web framework and asynchronous networking library, originally developed at FriendFeed." -optional = true +optional = false python-versions = ">=3.8" groups = ["main"] -markers = "(python_version == \"3.11\" or python_version >= \"3.12\") and extra == \"fit\"" +markers = "python_version == \"3.11\" or python_version >= \"3.12\"" files = [ {file = "tornado-6.4.2-cp38-abi3-macosx_10_9_universal2.whl", hash = "sha256:e828cce1123e9e44ae2a50a9de3055497ab1d0aeb440c5ac23064d9e44880da1"}, {file = "tornado-6.4.2-cp38-abi3-macosx_10_9_x86_64.whl", hash = "sha256:072ce12ada169c5b00b7d92a99ba089447ccc993ea2143c9ede887e0937aa803"}, @@ -4591,7 +4591,7 @@ description = "A language and compiler for custom Deep Learning operations" optional = false python-versions = "*" groups = ["main"] -markers = "platform_system == \"Linux\" and platform_machine == \"x86_64\" and (python_version == \"3.11\" or python_version >= \"3.12\")" +markers = "python_version == \"3.11\" and platform_system == \"Linux\" and platform_machine == \"x86_64\" or python_version >= \"3.12\" and platform_system == \"Linux\" and platform_machine == \"x86_64\"" files = [ {file = "triton-3.0.0-1-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:e1efef76935b2febc365bfadf74bcb65a6f959a9872e5bddf44cc9e0adce1e1a"}, {file = "triton-3.0.0-1-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:5ce8520437c602fb633f1324cc3871c47bee3b67acf9756c1a66309b60e3216c"}, @@ -4628,11 +4628,11 @@ description = "Backported and Experimental Type Hints for Python 3.8+" optional = false python-versions = ">=3.8" groups = ["main", "development"] +markers = "python_version == \"3.11\" or python_version >= \"3.12\"" files = [ {file = "typing_extensions-4.12.2-py3-none-any.whl", hash = "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d"}, {file = "typing_extensions-4.12.2.tar.gz", hash = "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8"}, ] -markers = {main = "python_version == \"3.11\" or python_version >= \"3.12\"", development = "python_version >= \"3.12\" or python_version == \"3.11\""} [[package]] name = "tzdata" @@ -4907,7 +4907,7 @@ description = "Python wrapper for extended filesystem attributes" optional = false python-versions = ">=3.8" groups = ["main"] -markers = "(python_version == \"3.11\" or python_version >= \"3.12\") and sys_platform == \"darwin\"" +markers = "python_version == \"3.11\" and sys_platform == \"darwin\" or python_version >= \"3.12\" and sys_platform == \"darwin\"" files = [ {file = "xattr-1.1.4-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:acb85b6249e9f3ea10cbb56df1021d43f4027212f0d004304bc9075dc7f54769"}, {file = "xattr-1.1.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:1a848ab125c0fafdc501ccd83b4c9018bba576a037a4ca5960a22f39e295552e"}, @@ -4991,10 +4991,10 @@ test = ["pytest"] name = "xyzservices" version = "2024.9.0" description = "Source of XYZ tiles providers" -optional = true +optional = false python-versions = ">=3.8" groups = ["main"] -markers = "(python_version == \"3.11\" or python_version >= \"3.12\") and extra == \"fit\"" +markers = "python_version == \"3.11\" or python_version >= \"3.12\"" files = [ {file = "xyzservices-2024.9.0-py3-none-any.whl", hash = "sha256:776ae82b78d6e5ca63dd6a94abb054df8130887a4a308473b54a6bd364de8644"}, {file = "xyzservices-2024.9.0.tar.gz", hash = "sha256:68fb8353c9dbba4f1ff6c0f2e5e4e596bb9e1db7f94f4f7dfbcb26e25aa66fde"}, @@ -5120,10 +5120,9 @@ test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools", type = ["pytest-mypy"] [extras] -fit = ["curve-curator"] multiprocessing = ["ray"] [metadata] lock-version = "2.1" python-versions = ">=3.11,<3.13" -content-hash = "971ca554729193609ee47bfc910548e20a602919073876b71ca187b41c7dbb9d" +content-hash = "bf0f826f8f395e1a264fd633e045bd60e57945e152008f1e7c8916c71e85a5a3" diff --git a/pyproject.toml b/pyproject.toml index 5c3ef3d1..9f627157 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "drevalpy" -version = "1.1.2" +version = "1.1.3" description = "Drug response evaluation of cancer cell line drug response models in a fair setting" authors = ["DrEvalPy development team"] license = "GPL-3.0" @@ -23,13 +23,13 @@ pingouin = "*" plotly = "*" matplotlib = "*" importlib-resources = "*" -curve-curator = {version = "*", optional = true} +curve-curator = "*" ray = {version = "*", optional = true} toml = {version = "^0.10.2"} poetry-plugin-export = "*" +poetry = "^2.0.1" [tool.poetry.extras] -fit = ["curve-curator"] multiprocessing = ["ray"] [tool.poetry.group.development.dependencies] diff --git a/requirements.txt b/requirements.txt index bf36f104..1f9783f5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,16 +3,18 @@ aiohttp==3.11.11 ; python_version >= "3.11" and python_version < "3.13" aiosignal==1.3.2 ; python_version >= "3.11" and python_version < "3.13" attrs==24.3.0 ; python_version >= "3.11" and python_version < "3.13" backports-tarfile==1.2.0 ; python_version >= "3.11" and python_version < "3.12" +bokeh==3.4.3 ; python_version >= "3.11" and python_version < "3.13" build==1.2.2.post1 ; python_version >= "3.11" and python_version < "3.13" cachecontrol[filecache]==0.14.2 ; python_version >= "3.11" and python_version < "3.13" certifi==2024.12.14 ; python_version >= "3.11" and python_version < "3.13" cffi==1.17.1 ; python_version >= "3.11" and python_version < "3.13" and (sys_platform == "darwin" or sys_platform == "linux") and (sys_platform == "darwin" or platform_python_implementation != "PyPy") charset-normalizer==3.4.1 ; python_version >= "3.11" and python_version < "3.13" cleo==2.1.0 ; python_version >= "3.11" and python_version < "3.13" -colorama==0.4.6 ; python_version >= "3.11" and python_version < "3.13" and (platform_system == "Windows" or os_name == "nt") +colorama==0.4.6 ; python_version >= "3.11" and python_version < "3.13" and (platform_system == "Windows" or sys_platform == "win32" or os_name == "nt") contourpy==1.3.1 ; python_version >= "3.11" and python_version < "3.13" crashtest==0.4.1 ; python_version >= "3.11" and python_version < "3.13" cryptography==44.0.0 ; python_version >= "3.11" and python_version < "3.13" and sys_platform == "linux" +curve-curator==0.5.1 ; python_version >= "3.11" and python_version < "3.13" cycler==0.12.1 ; python_version >= "3.11" and python_version < "3.13" distlib==0.3.9 ; python_version >= "3.11" and python_version < "3.13" dulwich==0.22.7 ; python_version >= "3.11" and python_version < "3.13" @@ -26,6 +28,7 @@ fsspec[http]==2024.12.0 ; python_version >= "3.11" and python_version < "3.13" idna==3.10 ; python_version >= "3.11" and python_version < "3.13" importlib-metadata==8.5.0 ; python_version >= "3.11" and python_version < "3.12" importlib-resources==6.5.2 ; python_version >= "3.11" and python_version < "3.13" +iniconfig==2.0.0 ; python_version >= "3.11" and python_version < "3.13" installer==0.7.0 ; python_version >= "3.11" and python_version < "3.13" jaraco-classes==3.4.0 ; python_version >= "3.11" and python_version < "3.13" jaraco-context==6.0.1 ; python_version >= "3.11" and python_version < "3.13" @@ -65,14 +68,16 @@ pingouin==0.5.5 ; python_version >= "3.11" and python_version < "3.13" pkginfo==1.12.0 ; python_version >= "3.11" and python_version < "3.13" platformdirs==4.3.6 ; python_version >= "3.11" and python_version < "3.13" plotly==5.24.1 ; python_version >= "3.11" and python_version < "3.13" -poetry-core==2.0.0 ; python_version >= "3.11" and python_version < "3.13" +pluggy==1.5.0 ; python_version >= "3.11" and python_version < "3.13" +poetry-core==2.0.1 ; python_version >= "3.11" and python_version < "3.13" poetry-plugin-export==1.8.0 ; python_version >= "3.11" and python_version < "3.13" -poetry==2.0.0 ; python_version >= "3.11" and python_version < "3.13" +poetry==2.0.1 ; python_version >= "3.11" and python_version < "3.13" propcache==0.2.1 ; python_version >= "3.11" and python_version < "3.13" psutil==6.1.1 ; python_version >= "3.11" and python_version < "3.13" pycparser==2.22 ; python_version >= "3.11" and python_version < "3.13" and (sys_platform == "darwin" or sys_platform == "linux") and (sys_platform == "darwin" or platform_python_implementation != "PyPy") pyparsing==3.2.1 ; python_version >= "3.11" and python_version < "3.13" pyproject-hooks==1.2.0 ; python_version >= "3.11" and python_version < "3.13" +pytest==7.4.4 ; python_version >= "3.11" and python_version < "3.13" python-dateutil==2.9.0.post0 ; python_version >= "3.11" and python_version < "3.13" pytorch-lightning==2.5.0.post0 ; python_version >= "3.11" and python_version < "3.13" pytz==2024.2 ; python_version >= "3.11" and python_version < "3.13" @@ -98,6 +103,7 @@ tomlkit==0.13.2 ; python_version >= "3.11" and python_version < "3.13" torch-geometric==2.6.1 ; python_version >= "3.11" and python_version < "3.13" torch==2.4.0 ; python_version >= "3.11" and python_version < "3.13" torchmetrics==1.6.1 ; python_version >= "3.11" and python_version < "3.13" +tornado==6.4.2 ; python_version >= "3.11" and python_version < "3.13" tqdm==4.67.1 ; python_version >= "3.11" and python_version < "3.13" triton==3.0.0 ; platform_system == "Linux" and platform_machine == "x86_64" and python_version < "3.13" and python_version >= "3.11" trove-classifiers==2025.1.7.14 ; python_version >= "3.11" and python_version < "3.13" @@ -107,5 +113,6 @@ urllib3==2.3.0 ; python_version >= "3.11" and python_version < "3.13" virtualenv==20.28.1 ; python_version >= "3.11" and python_version < "3.13" xarray==2025.1.1 ; python_version >= "3.11" and python_version < "3.13" xattr==1.1.4 ; python_version >= "3.11" and python_version < "3.13" and sys_platform == "darwin" +xyzservices==2024.9.0 ; python_version >= "3.11" and python_version < "3.13" yarl==1.18.3 ; python_version >= "3.11" and python_version < "3.13" zipp==3.21.0 ; python_version >= "3.11" and python_version < "3.12"