diff --git a/poetry.lock b/poetry.lock index 15d1e48ac..1f4bd90c2 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,8 +1,4 @@ -<<<<<<< HEAD -# This file is automatically @generated by Poetry 1.7.0 and should not be changed by hand. -======= # This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand. ->>>>>>> 714d559 (Adds expanded DRS fields for content dates and desc) [[package]] name = "aiofiles" @@ -661,21 +657,6 @@ dev = ["flake8", "hypothesis", "ipython", "mypy (>=0.710)", "portray", "pytest ( [[package]] name = "dictionaryutils" -<<<<<<< HEAD -version = "3.4.10" -description = "Python wrapper and metaschema for datadictionary." -optional = false -python-versions = ">=3.9,<4" -files = [ - {file = "dictionaryutils-3.4.10.tar.gz", hash = "sha256:5f4ebf1a78fdb97ab7172bdbd574a1756f5689fc72e85d0b298de9419c4e47b7"}, -] - -[package.dependencies] -cdislogging = ">=1.0.0,<2.0.0" -jsonschema = ">=2.5,<4" -PyYAML = "*" -requests = ">=2.18,<3.0" -======= version = "3.4.8" description = "Python wrapper and metaschema for datadictionary." optional = false @@ -695,7 +676,6 @@ type = "git" url = "https://github.com/uc-cdis/dictionaryutils" reference = "fix/update-python-version" resolved_reference = "1653a5060e50c3036d801bd6c152d79a8c4e5e1f" ->>>>>>> 714d559 (Adds expanded DRS fields for content dates and desc) [[package]] name = "doiclient" @@ -923,8 +903,6 @@ files = [ ] [[package]] -<<<<<<< HEAD -======= name = "gdcdictionary" version = "1.2.0" description = "Gen3 generic data dictionary" @@ -940,7 +918,6 @@ jsonschema = ">=2.5.1" PyYAML = ">=5.1,<6.0" [[package]] ->>>>>>> 714d559 (Adds expanded DRS fields for content dates and desc) name = "gen3authz" version = "1.5.1" description = "Gen3 authz client" @@ -1072,31 +1049,8 @@ files = [ [[package]] name = "importlib-metadata" -<<<<<<< HEAD -version = "1.7.0" -description = "Read metadata from Python packages" -optional = false -python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" -files = [ - {file = "importlib_metadata-1.7.0-py2.py3-none-any.whl", hash = "sha256:dc15b2969b4ce36305c51eebe62d418ac7791e9a157911d58bfb1f9ccd8e2070"}, - {file = "importlib_metadata-1.7.0.tar.gz", hash = "sha256:90bb658cdbbf6d1735b6341ce708fc7024a3e14e99ffdc5783edea9f9b077f83"}, -] - -[package.dependencies] -zipp = ">=0.5" - -[package.extras] -docs = ["rst.linker", "sphinx"] -testing = ["importlib-resources (>=1.3)", "packaging", "pep517"] - -[[package]] -name = "indexclient" -version = "2.2.1" -description = "" -======= version = "3.10.1" description = "Read metadata from Python packages" ->>>>>>> 714d559 (Adds expanded DRS fields for content dates and desc) optional = false python-versions = ">=3.6" files = [ @@ -1112,15 +1066,9 @@ docs = ["jaraco.packaging (>=8.2)", "rst.linker (>=1.9)", "sphinx"] testing = ["flufl.flake8", "importlib-resources (>=1.3)", "packaging", "pep517", "pyfakefs", "pytest (>=4.6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.0.1)", "pytest-flake8", "pytest-mypy"] [[package]] -<<<<<<< HEAD -name = "indexd" -version = "3.5.0" -description = "Gen3 Indexing Service" -======= name = "indexclient" version = "2.2.0" description = "" ->>>>>>> 714d559 (Adds expanded DRS fields for content dates and desc) optional = false python-versions = "*" files = [] @@ -1458,20 +1406,12 @@ files = [ ] [[package]] -<<<<<<< HEAD -name = "numpy" -version = "1.26.2" -description = "Fundamental package for array computing in Python" -======= name = "nose" version = "1.3.7" description = "nose extends unittest to make testing easier" ->>>>>>> 714d559 (Adds expanded DRS fields for content dates and desc) optional = false python-versions = "*" files = [ -<<<<<<< HEAD -======= {file = "nose-1.3.7-py2-none-any.whl", hash = "sha256:dadcddc0aefbf99eea214e0f1232b94f2fa9bd98fa8353711dacb112bfcbbb2a"}, {file = "nose-1.3.7-py3-none-any.whl", hash = "sha256:9ff7c6cc443f8c51994b34a667bbcf45afd6d945be7477b52e97516fd17c53ac"}, {file = "nose-1.3.7.tar.gz", hash = "sha256:f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98"}, @@ -1484,7 +1424,6 @@ description = "Fundamental package for array computing in Python" optional = false python-versions = ">=3.9" files = [ ->>>>>>> 714d559 (Adds expanded DRS fields for content dates and desc) {file = "numpy-1.26.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:3703fc9258a4a122d17043e57b35e5ef1c5a5837c3db8be396c82e04c1cf9b0f"}, {file = "numpy-1.26.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:cc392fdcbd21d4be6ae1bb4475a03ce3b025cd49a9be5345d76d7585aea69440"}, {file = "numpy-1.26.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:36340109af8da8805d8851ef1d74761b3b88e81a9bd80b290bbfed61bd2b4f75"}, @@ -1683,27 +1622,6 @@ tests = ["coverage[toml] (==5.0.4)", "pytest (>=6.0.0,<7.0.0)"] [[package]] name = "pypfb" -<<<<<<< HEAD -version = "0.5.27" -description = "Python SDK for PFB format" -optional = false -python-versions = ">=3.9,<4" -files = [ - {file = "pypfb-0.5.27-py3-none-any.whl", hash = "sha256:91f11fdc5e7b51a3b38454af09176d13a578709e19de8e640715a791bfdefeb6"}, - {file = "pypfb-0.5.27.tar.gz", hash = "sha256:d83454c92cb80d09e78f6dc643545ef6e9d67323d348b1baa30b1ef6607fd03c"}, -] - -[package.dependencies] -aiohttp = ">=3.6.3,<4.0.0" -click = ">=7.1.2,<8.0.0" -dictionaryutils = ">=3.4.8,<4.0.0" -fastavro = ">=1.8.2,<1.9.0" -gen3 = ">=4.11.3,<5.0.0" -gen3dictionary = ">=2.0.3" -importlib_metadata = {version = ">=1.3.0,<2.0.0", markers = "python_full_version <= \"3.9.0\""} -python-json-logger = ">=0.1.11,<0.2.0" -PyYAML = ">=6.0.1,<7.0.0" -======= version = "0.5.26" description = "Python SDK for PFB format" optional = false @@ -1727,7 +1645,6 @@ type = "git" url = "https://github.com/uc-cdis/pypfb" reference = "fix/expand-python-versions" resolved_reference = "14e81007970c3bd5e3cdc2965f2baef589e80436" ->>>>>>> 714d559 (Adds expanded DRS fields for content dates and desc) [[package]] name = "pyreadline3" @@ -2193,22 +2110,13 @@ zstd = ["zstandard (>=0.18.0)"] [[package]] name = "werkzeug" -<<<<<<< HEAD -version = "2.3.8" -======= version = "3.0.1" ->>>>>>> 714d559 (Adds expanded DRS fields for content dates and desc) description = "The comprehensive WSGI web application library." optional = false python-versions = ">=3.8" files = [ -<<<<<<< HEAD - {file = "werkzeug-2.3.8-py3-none-any.whl", hash = "sha256:bba1f19f8ec89d4d607a3bd62f1904bd2e609472d93cd85e9d4e178f472c3748"}, - {file = "werkzeug-2.3.8.tar.gz", hash = "sha256:554b257c74bbeb7a0d254160a4f8ffe185243f52a52035060b761ca62d977f03"}, -======= {file = "werkzeug-3.0.1-py3-none-any.whl", hash = "sha256:90a285dc0e42ad56b34e696398b8122ee4c681833fb35b8334a095d82c56da10"}, {file = "werkzeug-3.0.1.tar.gz", hash = "sha256:507e811ecea72b18a404947aded4b3390e1db8f826b494d76550ef45bb3b1dcc"}, ->>>>>>> 714d559 (Adds expanded DRS fields for content dates and desc) ] [package.dependencies] @@ -2335,10 +2243,5 @@ fhir = ["fhirclient"] [metadata] lock-version = "2.0" -<<<<<<< HEAD -python-versions = ">=3.9, <4" -content-hash = "9dae4b3abd2ce022c945f1f39ce619bf80a6eaa83d15e1b1c37d8056571aeb10" -======= python-versions = "^3.9" content-hash = "6605e5d9a8d887f719a2420c2d105ddf8004ccecb0613ce9fccc2f89205e385c" ->>>>>>> 714d559 (Adds expanded DRS fields for content dates and desc)