From 316aba52fc5bb54da240188f9d17d40cee357195 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Feb 2025 15:04:16 +0100 Subject: [PATCH 1/7] chore(deps): bump pytest-timeout from 1.4.2 to 2.3.1 (#324) Bumps [pytest-timeout](https://github.com/pytest-dev/pytest-timeout) from 1.4.2 to 2.3.1. - [Commits](https://github.com/pytest-dev/pytest-timeout/compare/1.4.2...2.3.1) --- updated-dependencies: - dependency-name: pytest-timeout dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- poetry.lock | 16 ++++++++-------- pyproject.toml | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/poetry.lock b/poetry.lock index c3a26a2b..6a72b4c3 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.5 and should not be changed by hand. [[package]] name = "adlfs" @@ -1846,17 +1846,17 @@ test = ["pytest (>=6,!=8.1.*)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytes [[package]] name = "pytest-timeout" -version = "1.4.2" -description = "py.test plugin to abort hanging tests" +version = "2.3.1" +description = "pytest plugin to abort hanging tests" optional = false -python-versions = "*" +python-versions = ">=3.7" files = [ - {file = "pytest-timeout-1.4.2.tar.gz", hash = "sha256:20b3113cf6e4e80ce2d403b6fb56e9e1b871b510259206d40ff8d609f48bda76"}, - {file = "pytest_timeout-1.4.2-py2.py3-none-any.whl", hash = "sha256:541d7aa19b9a6b4e475c759fd6073ef43d7cdc9a92d95644c260076eb257a063"}, + {file = "pytest-timeout-2.3.1.tar.gz", hash = "sha256:12397729125c6ecbdaca01035b9e5239d4db97352320af155b3f5de1ba5165d9"}, + {file = "pytest_timeout-2.3.1-py3-none-any.whl", hash = "sha256:68188cb703edfc6a18fad98dc25a3c61e9f24d644b0b70f33af545219fc7813e"}, ] [package.dependencies] -pytest = ">=3.6.0" +pytest = ">=7.0.0" [[package]] name = "pytz" @@ -2361,4 +2361,4 @@ torch-pyg = ["torch"] [metadata] lock-version = "2.0" python-versions = "^3.8" -content-hash = "1d300df9c2d88cdedec1de4013ababea3676c1c15cf7191013be81017bd9fa6a" +content-hash = "a445652eee06b32ae590314c8a51f9acfb615155cf91f656f1f1c42d799fb11d" diff --git a/pyproject.toml b/pyproject.toml index 953e99a6..1e3a9054 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -60,7 +60,7 @@ pytest = "^7.1.1" pytest-black = "^0.3.12" pytest-cov = "^2.12.0" pytest-flake8 = "^1.0.7" -pytest-timeout = "^1.4.2" +pytest-timeout = ">=1.4.2,<3.0.0" pre-commit = "^2.15.0" [tool.poe.tasks] From 566d8be0c427450ccee6e8b4991da228a338e25d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Feb 2025 15:35:23 +0100 Subject: [PATCH 2/7] chore(deps): bump pytest from 7.4.4 to 8.3.4 (#325) Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.4.4 to 8.3.4. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/7.4.4...8.3.4) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Katarina Supe <61758502+katarinasupe@users.noreply.github.com> --- poetry.lock | 16 ++++++++-------- pyproject.toml | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/poetry.lock b/poetry.lock index 6a72b4c3..a310ce5d 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1771,13 +1771,13 @@ files = [ [[package]] name = "pytest" -version = "7.4.4" +version = "8.3.4" description = "pytest: simple powerful testing with Python" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "pytest-7.4.4-py3-none-any.whl", hash = "sha256:b090cdf5ed60bf4c45261be03239c2c1c22df034fbffe691abe93cd80cea01d8"}, - {file = "pytest-7.4.4.tar.gz", hash = "sha256:2cf0005922c6ace4a3e2ec8b4080eb0d9753fdc93107415332f50ce9e7994280"}, + {file = "pytest-8.3.4-py3-none-any.whl", hash = "sha256:50e16d954148559c9a74109af1eaf0c945ba2d8f30f0a3d3335edde19788b6f6"}, + {file = "pytest-8.3.4.tar.gz", hash = "sha256:965370d062bce11e73868e0335abac31b4d3de0e82f4007408d242b4f8610761"}, ] [package.dependencies] @@ -1785,11 +1785,11 @@ colorama = {version = "*", markers = "sys_platform == \"win32\""} exceptiongroup = {version = ">=1.0.0rc8", markers = "python_version < \"3.11\""} iniconfig = "*" packaging = "*" -pluggy = ">=0.12,<2.0" -tomli = {version = ">=1.0.0", markers = "python_version < \"3.11\""} +pluggy = ">=1.5,<2" +tomli = {version = ">=1", markers = "python_version < \"3.11\""} [package.extras] -testing = ["argcomplete", "attrs (>=19.2.0)", "hypothesis (>=3.56)", "mock", "nose", "pygments (>=2.7.2)", "requests", "setuptools", "xmlschema"] +dev = ["argcomplete", "attrs (>=19.2)", "hypothesis (>=3.56)", "mock", "pygments (>=2.7.2)", "requests", "setuptools", "xmlschema"] [[package]] name = "pytest-black" @@ -2361,4 +2361,4 @@ torch-pyg = ["torch"] [metadata] lock-version = "2.0" python-versions = "^3.8" -content-hash = "a445652eee06b32ae590314c8a51f9acfb615155cf91f656f1f1c42d799fb11d" +content-hash = "f9485eac42d65b2054577d83b2e0203ac973e460f3628140eac6738811930458" diff --git a/pyproject.toml b/pyproject.toml index 1e3a9054..e4d6bc3b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -56,7 +56,7 @@ docker = ["docker"] [tool.poetry.group.dev.dependencies] black = "^22.3.0" -pytest = "^7.1.1" +pytest = ">=7.1.1,<9.0.0" pytest-black = "^0.3.12" pytest-cov = "^2.12.0" pytest-flake8 = "^1.0.7" From 9386109f20cc79130f2769b14bdfcfb5746cc98d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Feb 2025 15:54:33 +0100 Subject: [PATCH 3/7] chore(deps): bump psutil from 5.9.8 to 6.1.1 (#326) Bumps [psutil](https://github.com/giampaolo/psutil) from 5.9.8 to 6.1.1. - [Changelog](https://github.com/giampaolo/psutil/blob/master/HISTORY.rst) - [Commits](https://github.com/giampaolo/psutil/compare/release-5.9.8...release-6.1.1) --- updated-dependencies: - dependency-name: psutil dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Katarina Supe <61758502+katarinasupe@users.noreply.github.com> --- poetry.lock | 44 +++++++++++++++++++++++--------------------- pyproject.toml | 2 +- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/poetry.lock b/poetry.lock index a310ce5d..d4d2fcb6 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1496,31 +1496,33 @@ files = [ [[package]] name = "psutil" -version = "5.9.8" +version = "6.1.1" description = "Cross-platform lib for process and system monitoring in Python." optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" -files = [ - {file = "psutil-5.9.8-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:26bd09967ae00920df88e0352a91cff1a78f8d69b3ecabbfe733610c0af486c8"}, - {file = "psutil-5.9.8-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:05806de88103b25903dff19bb6692bd2e714ccf9e668d050d144012055cbca73"}, - {file = "psutil-5.9.8-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:611052c4bc70432ec770d5d54f64206aa7203a101ec273a0cd82418c86503bb7"}, - {file = "psutil-5.9.8-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:50187900d73c1381ba1454cf40308c2bf6f34268518b3f36a9b663ca87e65e36"}, - {file = "psutil-5.9.8-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:02615ed8c5ea222323408ceba16c60e99c3f91639b07da6373fb7e6539abc56d"}, - {file = "psutil-5.9.8-cp27-none-win32.whl", hash = "sha256:36f435891adb138ed3c9e58c6af3e2e6ca9ac2f365efe1f9cfef2794e6c93b4e"}, - {file = "psutil-5.9.8-cp27-none-win_amd64.whl", hash = "sha256:bd1184ceb3f87651a67b2708d4c3338e9b10c5df903f2e3776b62303b26cb631"}, - {file = "psutil-5.9.8-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:aee678c8720623dc456fa20659af736241f575d79429a0e5e9cf88ae0605cc81"}, - {file = "psutil-5.9.8-cp36-abi3-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8cb6403ce6d8e047495a701dc7c5bd788add903f8986d523e3e20b98b733e421"}, - {file = "psutil-5.9.8-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d06016f7f8625a1825ba3732081d77c94589dca78b7a3fc072194851e88461a4"}, - {file = "psutil-5.9.8-cp36-cp36m-win32.whl", hash = "sha256:7d79560ad97af658a0f6adfef8b834b53f64746d45b403f225b85c5c2c140eee"}, - {file = "psutil-5.9.8-cp36-cp36m-win_amd64.whl", hash = "sha256:27cc40c3493bb10de1be4b3f07cae4c010ce715290a5be22b98493509c6299e2"}, - {file = "psutil-5.9.8-cp37-abi3-win32.whl", hash = "sha256:bc56c2a1b0d15aa3eaa5a60c9f3f8e3e565303b465dbf57a1b730e7a2b9844e0"}, - {file = "psutil-5.9.8-cp37-abi3-win_amd64.whl", hash = "sha256:8db4c1b57507eef143a15a6884ca10f7c73876cdf5d51e713151c1236a0e68cf"}, - {file = "psutil-5.9.8-cp38-abi3-macosx_11_0_arm64.whl", hash = "sha256:d16bbddf0693323b8c6123dd804100241da461e41d6e332fb0ba6058f630f8c8"}, - {file = "psutil-5.9.8.tar.gz", hash = "sha256:6be126e3225486dff286a8fb9a06246a5253f4c7c53b475ea5f5ac934e64194c"}, +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,>=2.7" +files = [ + {file = "psutil-6.1.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:9ccc4316f24409159897799b83004cb1e24f9819b0dcf9c0b68bdcb6cefee6a8"}, + {file = "psutil-6.1.1-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:ca9609c77ea3b8481ab005da74ed894035936223422dc591d6772b147421f777"}, + {file = "psutil-6.1.1-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:8df0178ba8a9e5bc84fed9cfa61d54601b371fbec5c8eebad27575f1e105c0d4"}, + {file = "psutil-6.1.1-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:1924e659d6c19c647e763e78670a05dbb7feaf44a0e9c94bf9e14dfc6ba50468"}, + {file = "psutil-6.1.1-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:018aeae2af92d943fdf1da6b58665124897cfc94faa2ca92098838f83e1b1bca"}, + {file = "psutil-6.1.1-cp27-none-win32.whl", hash = "sha256:6d4281f5bbca041e2292be3380ec56a9413b790579b8e593b1784499d0005dac"}, + {file = "psutil-6.1.1-cp27-none-win_amd64.whl", hash = "sha256:c777eb75bb33c47377c9af68f30e9f11bc78e0f07fbf907be4a5d70b2fe5f030"}, + {file = "psutil-6.1.1-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:fc0ed7fe2231a444fc219b9c42d0376e0a9a1a72f16c5cfa0f68d19f1a0663e8"}, + {file = "psutil-6.1.1-cp36-abi3-macosx_11_0_arm64.whl", hash = "sha256:0bdd4eab935276290ad3cb718e9809412895ca6b5b334f5a9111ee6d9aff9377"}, + {file = "psutil-6.1.1-cp36-abi3-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b6e06c20c05fe95a3d7302d74e7097756d4ba1247975ad6905441ae1b5b66003"}, + {file = "psutil-6.1.1-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:97f7cb9921fbec4904f522d972f0c0e1f4fabbdd4e0287813b21215074a0f160"}, + {file = "psutil-6.1.1-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:33431e84fee02bc84ea36d9e2c4a6d395d479c9dd9bba2376c1f6ee8f3a4e0b3"}, + {file = "psutil-6.1.1-cp36-cp36m-win32.whl", hash = "sha256:384636b1a64b47814437d1173be1427a7c83681b17a450bfc309a1953e329603"}, + {file = "psutil-6.1.1-cp36-cp36m-win_amd64.whl", hash = "sha256:8be07491f6ebe1a693f17d4f11e69d0dc1811fa082736500f649f79df7735303"}, + {file = "psutil-6.1.1-cp37-abi3-win32.whl", hash = "sha256:eaa912e0b11848c4d9279a93d7e2783df352b082f40111e078388701fd479e53"}, + {file = "psutil-6.1.1-cp37-abi3-win_amd64.whl", hash = "sha256:f35cfccb065fff93529d2afb4a2e89e363fe63ca1e4a5da22b603a85833c2649"}, + {file = "psutil-6.1.1.tar.gz", hash = "sha256:cf8496728c18f2d0b45198f06895be52f36611711746b7f30c464b422b50e2f5"}, ] [package.extras] -test = ["enum34", "ipaddress", "mock", "pywin32", "wmi"] +dev = ["abi3audit", "black", "check-manifest", "coverage", "packaging", "pylint", "pyperf", "pypinfo", "pytest-cov", "requests", "rstcheck", "ruff", "sphinx", "sphinx_rtd_theme", "toml-sort", "twine", "virtualenv", "vulture", "wheel"] +test = ["pytest", "pytest-xdist", "setuptools"] [[package]] name = "pyarrow" @@ -2361,4 +2363,4 @@ torch-pyg = ["torch"] [metadata] lock-version = "2.0" python-versions = "^3.8" -content-hash = "f9485eac42d65b2054577d83b2e0203ac973e460f3628140eac6738811930458" +content-hash = "41cf965b91b648ca4a2e3860280614d198a45443f0deba859d02acfd5c13afed" diff --git a/pyproject.toml b/pyproject.toml index e4d6bc3b..0cbcf2b6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -36,7 +36,7 @@ python = "^3.8" pymgclient = "^1.3.1" networkx = "^3.0" pydantic = "^2.3.0" -psutil = "^5.9.0" +psutil = ">=5.9,<7.0" dacite = "^1.6.0" adlfs = "^2023.9.0" neo4j = ">=4.4.3" From fc5969969ff3010c86e9e92a589231d5a95ff895 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Feb 2025 15:56:39 +0100 Subject: [PATCH 4/7] chore(deps): bump pytest-black from 0.3.12 to 0.6.0 (#328) Bumps [pytest-black](https://github.com/coherent-oss/pytest-black) from 0.3.12 to 0.6.0. - [Commits](https://github.com/coherent-oss/pytest-black/compare/0.3.12...v0.6.0) --- updated-dependencies: - dependency-name: pytest-black dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Katarina Supe <61758502+katarinasupe@users.noreply.github.com> --- poetry.lock | 11 ++++++----- pyproject.toml | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/poetry.lock b/poetry.lock index d4d2fcb6..2ca17326 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1795,17 +1795,18 @@ dev = ["argcomplete", "attrs (>=19.2)", "hypothesis (>=3.56)", "mock", "pygments [[package]] name = "pytest-black" -version = "0.3.12" +version = "0.6.0" description = "A pytest plugin to enable format checking with black" optional = false -python-versions = ">=2.7" +python-versions = ">=3.5" files = [ - {file = "pytest-black-0.3.12.tar.gz", hash = "sha256:1d339b004f764d6cd0f06e690f6dd748df3d62e6fe1a692d6a5500ac2c5b75a5"}, + {file = "pytest_black-0.6.0-py3-none-any.whl", hash = "sha256:7eb747f54b6c997497b5cbc66a988be114b92016dbfa66d210d1d1f9f6b2dc76"}, + {file = "pytest_black-0.6.0.tar.gz", hash = "sha256:ecb77455f379805cb4bd8f45a813a3754c3bbee3199adf1b3665c0dfd086b511"}, ] [package.dependencies] black = {version = "*", markers = "python_version >= \"3.6\""} -pytest = ">=3.5.0" +pytest = ">=7.0.0" toml = "*" [[package]] @@ -2363,4 +2364,4 @@ torch-pyg = ["torch"] [metadata] lock-version = "2.0" python-versions = "^3.8" -content-hash = "41cf965b91b648ca4a2e3860280614d198a45443f0deba859d02acfd5c13afed" +content-hash = "46e5eedac9928b522e965be9734117d5641f0dc2ac7ef71754f12c113073dec6" \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 0cbcf2b6..1f8e3a5d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -56,8 +56,8 @@ docker = ["docker"] [tool.poetry.group.dev.dependencies] black = "^22.3.0" +pytest-black = ">=0.3.12,<0.7.0" pytest = ">=7.1.1,<9.0.0" -pytest-black = "^0.3.12" pytest-cov = "^2.12.0" pytest-flake8 = "^1.0.7" pytest-timeout = ">=1.4.2,<3.0.0" From ada9e10486a846d64be96ddef47f337affb521d4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Feb 2025 16:57:28 +0100 Subject: [PATCH 5/7] chore(deps): bump black from 22.12.0 to 24.8.0 (#327) * chore(deps): bump black from 22.12.0 to 24.8.0 Bumps [black](https://github.com/psf/black) from 22.12.0 to 24.8.0. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/compare/22.12.0...24.8.0) --- updated-dependencies: - dependency-name: black dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * Formatting changes - new black --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Katarina Supe <61758502+katarinasupe@users.noreply.github.com> Co-authored-by: katarinasupe --- .../transformations/translators/translator.py | 6 +-- gqlalchemy/vendors/neo4j.py | 16 ++++--- poetry.lock | 47 ++++++++++++------- pyproject.toml | 2 +- 4 files changed, 42 insertions(+), 29 deletions(-) diff --git a/gqlalchemy/transformations/translators/translator.py b/gqlalchemy/transformations/translators/translator.py index 51f40369..ff4db415 100644 --- a/gqlalchemy/transformations/translators/translator.py +++ b/gqlalchemy/transformations/translators/translator.py @@ -40,10 +40,8 @@ class Translator(ABC): # Lambda function to concat list of labels - merge_labels: Callable[[Set[str]], str] = ( - lambda labels, default_node_label: LABELS_CONCAT.join([label for label in sorted(labels)]) - if len(labels) - else default_node_label + merge_labels: Callable[[Set[str]], str] = lambda labels, default_node_label: ( + LABELS_CONCAT.join([label for label in sorted(labels)]) if len(labels) else default_node_label ) @abstractmethod diff --git a/gqlalchemy/vendors/neo4j.py b/gqlalchemy/vendors/neo4j.py index 24428948..a5b5aa58 100644 --- a/gqlalchemy/vendors/neo4j.py +++ b/gqlalchemy/vendors/neo4j.py @@ -73,12 +73,16 @@ def get_indexes(self) -> List[Neo4jIndex]: for result in self.execute_and_fetch("SHOW INDEX;"): indexes.append( Neo4jIndex( - result[Neo4jConstants.LABEL][0] - if result[Neo4jConstants.TYPE] != Neo4jConstants.LOOKUP - else result[Neo4jConstants.LABEL], - result[Neo4jConstants.PROPERTIES][0] - if result[Neo4jConstants.TYPE] != Neo4jConstants.LOOKUP - else result[Neo4jConstants.PROPERTIES], + ( + result[Neo4jConstants.LABEL][0] + if result[Neo4jConstants.TYPE] != Neo4jConstants.LOOKUP + else result[Neo4jConstants.LABEL] + ), + ( + result[Neo4jConstants.PROPERTIES][0] + if result[Neo4jConstants.TYPE] != Neo4jConstants.LOOKUP + else result[Neo4jConstants.PROPERTIES] + ), result[Neo4jConstants.TYPE], result[Neo4jConstants.UNIQUENESS], ) diff --git a/poetry.lock b/poetry.lock index 2ca17326..f67b1b0b 100644 --- a/poetry.lock +++ b/poetry.lock @@ -279,36 +279,47 @@ aio = ["azure-core[aio] (>=1.30.0)"] [[package]] name = "black" -version = "22.12.0" +version = "24.8.0" description = "The uncompromising code formatter." optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "black-22.12.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9eedd20838bd5d75b80c9f5487dbcb06836a43833a37846cf1d8c1cc01cef59d"}, - {file = "black-22.12.0-cp310-cp310-win_amd64.whl", hash = "sha256:159a46a4947f73387b4d83e87ea006dbb2337eab6c879620a3ba52699b1f4351"}, - {file = "black-22.12.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d30b212bffeb1e252b31dd269dfae69dd17e06d92b87ad26e23890f3efea366f"}, - {file = "black-22.12.0-cp311-cp311-win_amd64.whl", hash = "sha256:7412e75863aa5c5411886804678b7d083c7c28421210180d67dfd8cf1221e1f4"}, - {file = "black-22.12.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c116eed0efb9ff870ded8b62fe9f28dd61ef6e9ddd28d83d7d264a38417dcee2"}, - {file = "black-22.12.0-cp37-cp37m-win_amd64.whl", hash = "sha256:1f58cbe16dfe8c12b7434e50ff889fa479072096d79f0a7f25e4ab8e94cd8350"}, - {file = "black-22.12.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:77d86c9f3db9b1bf6761244bc0b3572a546f5fe37917a044e02f3166d5aafa7d"}, - {file = "black-22.12.0-cp38-cp38-win_amd64.whl", hash = "sha256:82d9fe8fee3401e02e79767016b4907820a7dc28d70d137eb397b92ef3cc5bfc"}, - {file = "black-22.12.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:101c69b23df9b44247bd88e1d7e90154336ac4992502d4197bdac35dd7ee3320"}, - {file = "black-22.12.0-cp39-cp39-win_amd64.whl", hash = "sha256:559c7a1ba9a006226f09e4916060982fd27334ae1998e7a38b3f33a37f7a2148"}, - {file = "black-22.12.0-py3-none-any.whl", hash = "sha256:436cc9167dd28040ad90d3b404aec22cedf24a6e4d7de221bec2730ec0c97bcf"}, - {file = "black-22.12.0.tar.gz", hash = "sha256:229351e5a18ca30f447bf724d007f890f97e13af070bb6ad4c0a441cd7596a2f"}, + {file = "black-24.8.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:09cdeb74d494ec023ded657f7092ba518e8cf78fa8386155e4a03fdcc44679e6"}, + {file = "black-24.8.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:81c6742da39f33b08e791da38410f32e27d632260e599df7245cccee2064afeb"}, + {file = "black-24.8.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:707a1ca89221bc8a1a64fb5e15ef39cd755633daa672a9db7498d1c19de66a42"}, + {file = "black-24.8.0-cp310-cp310-win_amd64.whl", hash = "sha256:d6417535d99c37cee4091a2f24eb2b6d5ec42b144d50f1f2e436d9fe1916fe1a"}, + {file = "black-24.8.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:fb6e2c0b86bbd43dee042e48059c9ad7830abd5c94b0bc518c0eeec57c3eddc1"}, + {file = "black-24.8.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:837fd281f1908d0076844bc2b801ad2d369c78c45cf800cad7b61686051041af"}, + {file = "black-24.8.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:62e8730977f0b77998029da7971fa896ceefa2c4c4933fcd593fa599ecbf97a4"}, + {file = "black-24.8.0-cp311-cp311-win_amd64.whl", hash = "sha256:72901b4913cbac8972ad911dc4098d5753704d1f3c56e44ae8dce99eecb0e3af"}, + {file = "black-24.8.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:7c046c1d1eeb7aea9335da62472481d3bbf3fd986e093cffd35f4385c94ae368"}, + {file = "black-24.8.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:649f6d84ccbae73ab767e206772cc2d7a393a001070a4c814a546afd0d423aed"}, + {file = "black-24.8.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2b59b250fdba5f9a9cd9d0ece6e6d993d91ce877d121d161e4698af3eb9c1018"}, + {file = "black-24.8.0-cp312-cp312-win_amd64.whl", hash = "sha256:6e55d30d44bed36593c3163b9bc63bf58b3b30e4611e4d88a0c3c239930ed5b2"}, + {file = "black-24.8.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:505289f17ceda596658ae81b61ebbe2d9b25aa78067035184ed0a9d855d18afd"}, + {file = "black-24.8.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:b19c9ad992c7883ad84c9b22aaa73562a16b819c1d8db7a1a1a49fb7ec13c7d2"}, + {file = "black-24.8.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1f13f7f386f86f8121d76599114bb8c17b69d962137fc70efe56137727c7047e"}, + {file = "black-24.8.0-cp38-cp38-win_amd64.whl", hash = "sha256:f490dbd59680d809ca31efdae20e634f3fae27fba3ce0ba3208333b713bc3920"}, + {file = "black-24.8.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:eab4dd44ce80dea27dc69db40dab62d4ca96112f87996bca68cd75639aeb2e4c"}, + {file = "black-24.8.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:3c4285573d4897a7610054af5a890bde7c65cb466040c5f0c8b732812d7f0e5e"}, + {file = "black-24.8.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9e84e33b37be070ba135176c123ae52a51f82306def9f7d063ee302ecab2cf47"}, + {file = "black-24.8.0-cp39-cp39-win_amd64.whl", hash = "sha256:73bbf84ed136e45d451a260c6b73ed674652f90a2b3211d6a35e78054563a9bb"}, + {file = "black-24.8.0-py3-none-any.whl", hash = "sha256:972085c618ee94f402da1af548a4f218c754ea7e5dc70acb168bfaca4c2542ed"}, + {file = "black-24.8.0.tar.gz", hash = "sha256:2500945420b6784c38b9ee885af039f5e7471ef284ab03fa35ecdde4688cd83f"}, ] [package.dependencies] click = ">=8.0.0" mypy-extensions = ">=0.4.3" +packaging = ">=22.0" pathspec = ">=0.9.0" platformdirs = ">=2" -tomli = {version = ">=1.1.0", markers = "python_full_version < \"3.11.0a7\""} -typing-extensions = {version = ">=3.10.0.0", markers = "python_version < \"3.10\""} +tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} +typing-extensions = {version = ">=4.0.1", markers = "python_version < \"3.11\""} [package.extras] colorama = ["colorama (>=0.4.3)"] -d = ["aiohttp (>=3.7.4)"] +d = ["aiohttp (>=3.7.4)", "aiohttp (>=3.7.4,!=3.9.0)"] jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"] uvloop = ["uvloop (>=0.15.2)"] @@ -2364,4 +2375,4 @@ torch-pyg = ["torch"] [metadata] lock-version = "2.0" python-versions = "^3.8" -content-hash = "46e5eedac9928b522e965be9734117d5641f0dc2ac7ef71754f12c113073dec6" \ No newline at end of file +content-hash = "38ea312782742de6e67cc7fe227a13f60fbc9711e126a91829da2853b85b0e93" diff --git a/pyproject.toml b/pyproject.toml index 1f8e3a5d..d57b4af3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -55,7 +55,7 @@ torch_pyg = ["torch"] docker = ["docker"] [tool.poetry.group.dev.dependencies] -black = "^22.3.0" +black = ">=22.3,<25.0" pytest-black = ">=0.3.12,<0.7.0" pytest = ">=7.1.1,<9.0.0" pytest-cov = "^2.12.0" From 9c544c111bf01718c8a57d009139c917a5e32d1c Mon Sep 17 00:00:00 2001 From: katarinasupe Date: Wed, 12 Feb 2025 17:21:15 +0100 Subject: [PATCH 6/7] Add flexible dependenies versioning - no breaking changes --- pyproject.toml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index d57b4af3..98a141a0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,12 +34,12 @@ exclude = ''' [tool.poetry.dependencies] python = "^3.8" pymgclient = "^1.3.1" -networkx = "^3.0" +networkx = ">=2.5.1,<4.0.0" pydantic = "^2.3.0" psutil = ">=5.9,<7.0" dacite = "^1.6.0" -adlfs = "^2023.9.0" -neo4j = ">=4.4.3" +adlfs = ">=2023.9.0,<2025.0.0" +neo4j = ">=4.4.3,<6.0.0" numpy = "^1.24.1" pyarrow = { version = "^13.0.0", optional = true } @@ -55,13 +55,13 @@ torch_pyg = ["torch"] docker = ["docker"] [tool.poetry.group.dev.dependencies] -black = ">=22.3,<25.0" +black = ">=22.3.0,<25.0.0" pytest-black = ">=0.3.12,<0.7.0" pytest = ">=7.1.1,<9.0.0" -pytest-cov = "^2.12.0" +pytest-cov = ">=2.12.0,<4.0.0" pytest-flake8 = "^1.0.7" pytest-timeout = ">=1.4.2,<3.0.0" -pre-commit = "^2.15.0" +pre-commit = ">=2.15.0,<4.0.0" [tool.poe.tasks] install-pyg-cpu = "pip install torch-scatter torch-sparse torch-cluster torch-spline-conv torch-geometric -f https://data.pyg.org/whl/torch-1.13.0+cpu.html" From deb38177aefd9364d936999ee2d106b292f07cab Mon Sep 17 00:00:00 2001 From: katarinasupe Date: Wed, 12 Feb 2025 17:22:17 +0100 Subject: [PATCH 7/7] update lock --- poetry.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/poetry.lock b/poetry.lock index f67b1b0b..d4ae665d 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.5 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand. [[package]] name = "adlfs" @@ -2375,4 +2375,4 @@ torch-pyg = ["torch"] [metadata] lock-version = "2.0" python-versions = "^3.8" -content-hash = "38ea312782742de6e67cc7fe227a13f60fbc9711e126a91829da2853b85b0e93" +content-hash = "a0fcd0d7d221e2e0893c9c3bec567053eaf951611ca85c663ccab6e5177c1aec"