From ba78fe1412b244eca5b3c3c01b8ff3af45fe494c Mon Sep 17 00:00:00 2001 From: Christoffer Date: Tue, 17 Oct 2023 12:57:30 +0200 Subject: [PATCH] poetry lock fix --- poetry.lock | 141 +--------------------------------------------------- 1 file changed, 1 insertion(+), 140 deletions(-) diff --git a/poetry.lock b/poetry.lock index 911516282..82ed986a8 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,6 +1,4 @@ # This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand. -<<<<<<< HEAD -======= [[package]] name = "albumentations" @@ -25,7 +23,6 @@ scipy = ">=1.1.0" develop = ["imgaug (>=0.4.0)", "pytest"] imgaug = ["imgaug (>=0.4.0)"] tests = ["pytest"] ->>>>>>> origin/master [[package]] name = "argcomplete" @@ -345,42 +342,6 @@ files = [ test = ["pytest (>=6)"] [[package]] -<<<<<<< HEAD -name = "flake8" -version = "6.1.0" -description = "the modular source code checker: pep8 pyflakes and co" -optional = true -python-versions = ">=3.8.1" -files = [ - {file = "flake8-6.1.0-py2.py3-none-any.whl", hash = "sha256:ffdfce58ea94c6580c77888a86506937f9a1a227dfcd15f245d694ae20a6b6e5"}, - {file = "flake8-6.1.0.tar.gz", hash = "sha256:d5b3857f07c030bdb5bf41c7f53799571d75c4491748a3adcd47de929e34cd23"}, -] - -[package.dependencies] -mccabe = ">=0.7.0,<0.8.0" -pycodestyle = ">=2.11.0,<2.12.0" -pyflakes = ">=3.1.0,<3.2.0" - -[[package]] -name = "flake8-pyproject" -version = "1.2.3" -description = "Flake8 plug-in loading the configuration from pyproject.toml" -optional = true -python-versions = ">= 3.6" -files = [ - {file = "flake8_pyproject-1.2.3-py3-none-any.whl", hash = "sha256:6249fe53545205af5e76837644dc80b4c10037e73a0e5db87ff562d75fb5bd4a"}, -] - -[package.dependencies] -Flake8 = ">=5" -TOMLi = {version = "*", markers = "python_version < \"3.11\""} - -[package.extras] -dev = ["pyTest", "pyTest-cov"] - -[[package]] -======= ->>>>>>> origin/master name = "humanize" version = "4.6.0" description = "Python humanize utilities" @@ -580,20 +541,6 @@ rtd = ["attrs", "myst-parser", "pyyaml", "sphinx", "sphinx-copybutton", "sphinx- testing = ["coverage", "pytest", "pytest-cov", "pytest-regressions"] [[package]] -<<<<<<< HEAD -name = "mccabe" -version = "0.7.0" -description = "McCabe checker, plugin for flake8" -optional = true -python-versions = ">=3.6" -files = [ - {file = "mccabe-0.7.0-py2.py3-none-any.whl", hash = "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e"}, - {file = "mccabe-0.7.0.tar.gz", hash = "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325"}, -] - -[[package]] -======= ->>>>>>> origin/master name = "mdurl" version = "0.1.2" description = "Markdown URL utilities" @@ -1076,20 +1023,6 @@ dev = ["pre-commit", "tox"] testing = ["pytest", "pytest-benchmark"] [[package]] -<<<<<<< HEAD -name = "pycodestyle" -version = "2.11.0" -description = "Python style guide checker" -optional = true -python-versions = ">=3.8" -files = [ - {file = "pycodestyle-2.11.0-py2.py3-none-any.whl", hash = "sha256:5d1013ba8dc7895b548be5afb05740ca82454fd899971563d2ef625d090326f8"}, - {file = "pycodestyle-2.11.0.tar.gz", hash = "sha256:259bcc17857d8a8b3b4a2327324b79e5f020a13c16074670f9c8c8f872ea76d0"}, -] - -[[package]] -======= ->>>>>>> origin/master name = "pydantic" version = "1.10.13" description = "Data validation and settings management using python type hints" @@ -1142,20 +1075,6 @@ dotenv = ["python-dotenv (>=0.10.4)"] email = ["email-validator (>=1.0.3)"] [[package]] -<<<<<<< HEAD -name = "pyflakes" -version = "3.1.0" -description = "passive checker of Python programs" -optional = true -python-versions = ">=3.8" -files = [ - {file = "pyflakes-3.1.0-py2.py3-none-any.whl", hash = "sha256:4132f6d49cb4dae6819e5379898f2b8cce3c5f23994194c24b77d5da2e36f774"}, - {file = "pyflakes-3.1.0.tar.gz", hash = "sha256:a0aae034c444db0071aa077972ba4768d40c830d9539fd45bf4cd3f8f6992efc"}, -] - -[[package]] -======= ->>>>>>> origin/master name = "pygments" version = "2.16.1" description = "Pygments is a syntax highlighting package written in Python." @@ -1438,22 +1357,13 @@ tests = ["coverage (>=6.0.0)", "flake8", "mypy", "pytest (>=7.0.0)", "pytest-asy [[package]] name = "rich" -<<<<<<< HEAD -version = "13.5.3" -======= version = "13.6.0" ->>>>>>> origin/master description = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal" optional = false python-versions = ">=3.7.0" files = [ -<<<<<<< HEAD - {file = "rich-13.5.3-py3-none-any.whl", hash = "sha256:9257b468badc3d347e146a4faa268ff229039d4c2d176ab0cffb4c4fbc73d5d9"}, - {file = "rich-13.5.3.tar.gz", hash = "sha256:87b43e0543149efa1253f485cd845bb7ee54df16c9617b8a893650ab84b4acb6"}, -======= {file = "rich-13.6.0-py3-none-any.whl", hash = "sha256:2b38e2fe9ca72c9a00170a1a2d20c63c790d0e10ef1fe35eba76e1e7b1d7d245"}, {file = "rich-13.6.0.tar.gz", hash = "sha256:5c14d22737e6d5084ef4771b62d5d4363165b403455a30a1c8ca39dc7b644bef"}, ->>>>>>> origin/master ] [package.dependencies] @@ -1465,14 +1375,6 @@ typing-extensions = {version = ">=4.0.0,<5.0", markers = "python_version < \"3.9 jupyter = ["ipywidgets (>=7.5.1,<9)"] [[package]] -<<<<<<< HEAD -name = "scikit-learn" -version = "1.3.1" -description = "A set of python modules for machine learning and data mining" -optional = true -python-versions = ">=3.8" -files = [ -======= name = "scikit-image" version = "0.21.0" description = "Image processing in Python" @@ -1529,7 +1431,6 @@ description = "A set of python modules for machine learning and data mining" optional = true python-versions = ">=3.8" files = [ ->>>>>>> origin/master {file = "scikit-learn-1.3.1.tar.gz", hash = "sha256:1a231cced3ee3fa04756b4a7ab532dc9417acd581a330adff5f2c01ac2831fcf"}, {file = "scikit_learn-1.3.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:3153612ff8d36fa4e35ef8b897167119213698ea78f3fd130b4068e6f8d2da5a"}, {file = "scikit_learn-1.3.1-cp310-cp310-macosx_12_0_arm64.whl", hash = "sha256:6bb9490fdb8e7e00f1354621689187bef3cab289c9b869688f805bf724434755"}, @@ -1830,22 +1731,13 @@ files = [ [[package]] name = "types-requests" -<<<<<<< HEAD -version = "2.31.0.6" -======= version = "2.31.0.8" ->>>>>>> origin/master description = "Typing stubs for requests" optional = false python-versions = ">=3.7" files = [ -<<<<<<< HEAD - {file = "types-requests-2.31.0.6.tar.gz", hash = "sha256:cd74ce3b53c461f1228a9b783929ac73a666658f223e28ed29753771477b3bd0"}, - {file = "types_requests-2.31.0.6-py3-none-any.whl", hash = "sha256:a2db9cb228a81da8348b49ad6db3f5519452dd20a9c1e1a868c83c5fe88fd1a9"}, -======= {file = "types-requests-2.31.0.8.tar.gz", hash = "sha256:e1b325c687b3494a2f528ab06e411d7092cc546cc9245c000bacc2fca5ae96d4"}, {file = "types_requests-2.31.0.8-py3-none-any.whl", hash = "sha256:39894cbca3fb3d032ed8bdd02275b4273471aa5668564617cc1734b0a65ffdf8"}, ->>>>>>> origin/master ] [package.dependencies] @@ -1863,20 +1755,6 @@ files = [ ] [[package]] -<<<<<<< HEAD -name = "types-urllib3" -version = "1.26.25.14" -description = "Typing stubs for urllib3" -optional = false -python-versions = "*" -files = [ - {file = "types-urllib3-1.26.25.14.tar.gz", hash = "sha256:229b7f577c951b8c1b92c1bc2b2fdb0b49847bd2af6d1cc2a2e3dd340f3bda8f"}, - {file = "types_urllib3-1.26.25.14-py3-none-any.whl", hash = "sha256:9683bbb7fb72e32bfe9d2be6e04875fbe1b3eeec3cbb4ea231435aa7fd6b4f0e"}, -] - -[[package]] -======= ->>>>>>> origin/master name = "typing-extensions" version = "4.7.1" description = "Backported and Experimental Type Hints for Python 3.7+" @@ -1910,22 +1788,13 @@ numpy = "*" [[package]] name = "urllib3" -<<<<<<< HEAD -version = "2.0.5" -======= version = "2.0.6" ->>>>>>> origin/master description = "HTTP library with thread-safe connection pooling, file post, and more." optional = false python-versions = ">=3.7" files = [ -<<<<<<< HEAD - {file = "urllib3-2.0.5-py3-none-any.whl", hash = "sha256:ef16afa8ba34a1f989db38e1dbbe0c302e4289a47856990d0682e374563ce35e"}, - {file = "urllib3-2.0.5.tar.gz", hash = "sha256:13abf37382ea2ce6fb744d4dad67838eec857c9f4f57009891805e0b5e123594"}, -======= {file = "urllib3-2.0.6-py3-none-any.whl", hash = "sha256:7a7c7003b000adf9e7ca2a377c9688bbc54ed41b985789ed576570342a375cd2"}, {file = "urllib3-2.0.6.tar.gz", hash = "sha256:b19e1a85d206b56d7df1d5e683df4a7725252a964e3993648dd0fb5a1c157564"}, ->>>>>>> origin/master ] [package.extras] @@ -1966,19 +1835,11 @@ testing = ["big-O", "flake8 (<5)", "jaraco.functools", "jaraco.itertools", "more [extras] dev = ["black", "debugpy", "isort", "mypy", "pytest", "pytest-rerunfailures", "responses"] medical = ["connected-components-3d", "nibabel"] -<<<<<<< HEAD -ml = ["scikit-learn", "torch", "torchvision", "albumentations"] -======= ml = ["albumentations", "scikit-learn", "torch", "torchvision"] ->>>>>>> origin/master ocv = ["opencv-python-headless"] test = ["pytest", "responses"] [metadata] lock-version = "2.0" python-versions = ">=3.7.0,<3.11" -<<<<<<< HEAD -content-hash = "791455d63b5366c2242672436020cfb6ce923be62326751b60ac91deea3587a9" -======= -content-hash = "1158b8ae2bbf51d84bc42543f93bc9bb6013df9dba67dec37a4963e477a143e9" ->>>>>>> origin/master +content-hash = "1158b8ae2bbf51d84bc42543f93bc9bb6013df9dba67dec37a4963e477a143e9" \ No newline at end of file