From b93f300181f35c2c17f29176f037f9af7614d7b6 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Mon, 2 Dec 2024 13:21:44 -0500 Subject: [PATCH] use the lock file for pinning dependencies, not the project definition (#18305) * use the lock file for pinning dependencies, not the project definition * fixup * `>=` * trying v4.3.3 * undo * undo * rebase-strategy: auto * Revert "rebase-strategy: auto" This reverts commit 659eb4d043679e140f27e9beffc8f03daa36086c. * Revert "Revert "rebase-strategy: auto"" This reverts commit bf8a5ff5248432af612f24fed788fd098f08eb7a. * Revert "Revert "Revert "rebase-strategy: auto""" This reverts commit 49e7d19a8de5f0e4df504de7b4d54c8be2ec4ac5. --- poetry.lock | 4 +- pyproject.toml | 114 ++++++++++++++++++++++++------------------------- 2 files changed, 59 insertions(+), 59 deletions(-) diff --git a/poetry.lock b/poetry.lock index d51f59876b7b..7a9537f8577d 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.4 and should not be changed by hand. [[package]] name = "aiofiles" @@ -3232,4 +3232,4 @@ upnp = ["miniupnpc"] [metadata] lock-version = "2.0" python-versions = ">=3.9, <3.13" -content-hash = "1182fe0e323bfa90442e480a61da515ec6b7b41d8df938447221ca709cb78eaa" +content-hash = "e10970249250be3c223e32f5185605087c3a24aaa8dbefbdb74eda56cd96a950" diff --git a/pyproject.toml b/pyproject.toml index 9d6cbe1d34a7..e08c8e9c53f7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -38,68 +38,68 @@ priority = "supplemental" [tool.poetry.dependencies] python = ">=3.9, <3.13" -aiofiles = "24.1.0" # Async IO for files -aiohttp = "3.10.4" # HTTP server for full node rpc -aiosqlite = "0.20.0" # asyncio wrapper for sqlite, to store blocks -anyio = "4.6.2.post1" -bitstring = "4.1.4" # Binary data management library -boto3 = "1.35.43" # AWS S3 for Data Layer S3 plugin -chiabip158 = "1.5.1" # bip158-style wallet filters -chiapos = "2.0.7" # proof of space -chia_rs = "0.16.0" -chiavdf = "1.1.8" # timelord and vdf verification -click = "8.1.7" # For the CLI -clvm = "0.9.11" -clvm_tools = "0.4.9" # Currying Program.to other conveniences -clvm_tools_rs = "0.1.45" # Rust implementation of clvm_tools' compiler -colorama = "0.4.6" # Colorizes terminal output -colorlog = "6.9.0" # Adds color to logs -concurrent_log_handler = "0.9.25" # Concurrently log and rotate logs -cryptography = "43.0.1" # Python cryptography library for TLS - keyring conflict -dnslib = "0.9.25" # dns lib -dnspython = "2.6.1" # Query DNS seeds -filelock = "3.16.1" # For reading and writing config multiprocess and multithread safely (non-reentrant locks) -keyring = "25.5.0" # Store keys in MacOS Keychain, Windows Credential Locker -packaging = "24.0" -pip = "24.2" -psutil = "6.1.0" -pyyaml = "6.0.2" # Used for config file format -setproctitle = "1.3.3" # Gives the chia processes readable names -setuptools = "75.5.0" -sortedcontainers = "2.4.0" # For maintaining sorted mempools -typing-extensions = "4.12.2" # typing backports like Protocol and TypedDict -watchdog = "4.0.1" # Filesystem event watching - watches keyring.yaml +aiofiles = ">=24.1.0" # Async IO for files +aiohttp = ">=3.10.4" # HTTP server for full node rpc +aiosqlite = ">=0.20.0" # asyncio wrapper for sqlite, to store blocks +anyio = ">=4.6.2.post1" +bitstring = ">=4.1.4" # Binary data management library +boto3 = ">=1.35.43" # AWS S3 for Data Layer S3 plugin +chiabip158 = ">=1.5.1" # bip158-style wallet filters +chiapos = ">=2.0.7" # proof of space +chia_rs = ">=0.16.0" +chiavdf = ">=1.1.8" # timelord and vdf verification +click = ">=8.1.7" # For the CLI +clvm = ">=0.9.11" +clvm_tools = ">=0.4.9" # Currying Program.to other conveniences +clvm_tools_rs = ">=0.1.45" # Rust implementation of clvm_tools' compiler +colorama = ">=0.4.6" # Colorizes terminal output +colorlog = ">=6.9.0" # Adds color to logs +concurrent_log_handler = ">=0.9.25" # Concurrently log and rotate logs +cryptography = ">=43.0.1" # Python cryptography library for TLS - keyring conflict +dnslib = ">=0.9.25" # dns lib +dnspython = ">=2.6.1" # Query DNS seeds +filelock = ">=3.16.1" # For reading and writing config multiprocess and multithread safely (non-reentrant locks) +keyring = ">=25.5.0" # Store keys in MacOS Keychain, Windows Credential Locker +packaging = ">=24.0" +pip = ">=24.2" +psutil = ">=6.1.0" +pyyaml = ">=6.0.2" # Used for config file format +setproctitle = ">=1.3.3" # Gives the chia processes readable names +setuptools = ">=75.5.0" +sortedcontainers = ">=2.4.0" # For maintaining sorted mempools +typing-extensions = ">=4.12.2" # typing backports like Protocol and TypedDict +watchdog = ">=4.0.1" # Filesystem event watching - watches keyring.yaml zstd = [ - {version="1.5.5.1", python = "<3.12"}, - {version="1.5.5.1", python = "3.12", source="chia"}, + {version=">=1.5.5.1", python = "<3.12"}, + {version=">=1.5.5.1", python = "3.12", source="chia"}, ] -importlib-resources = "6.4.5" -hsms = "0.3.1" -aiohttp_cors = { version = "0.7.0", optional = true } -build = { version = "1.2.1", optional = true } -coverage = { version = "7.6.4", optional = true } -diff-cover = { version = "9.2.0", optional = true } +importlib-resources = ">=6.4.5" +hsms = ">=0.3.1" +aiohttp_cors = { version = ">=0.7.0", optional = true } +build = { version = ">=1.2.1", optional = true } +coverage = { version = ">=7.6.4", optional = true } +diff-cover = { version = ">=9.2.0", optional = true } # TODO: but... keyrings_cryptfile goes 15 minutes without locking while this does in 75 seconds -"keyrings.cryptfile" = { version = "1.3.9", optional = true } -mypy = { version = "1.11.1", optional = true } -pre-commit = [ { version = "3.5.0", python = "<3.9", optional = true }, { version = "3.7.1", python = ">=3.9", optional = true } ] -py3createtorrent = { version = "1.2.1", optional = true } -pyinstaller = { version = "6.9.0", optional = true } -pytest = { version = "8.3.3", optional = true } -pytest-cov = { version = "5.0.0", optional = true } -pytest-mock = { version = "3.14.0", optional = true } -pytest-monitor = { version = "1.6.6", platform = "linux", optional = true } -pytest-xdist = { version = "3.6.1", optional = true } -types-aiofiles = { version = "24.1.0.20240626", optional = true } -types-cryptography = { version = "3.3.23.2", optional = true } -types-pyyaml = { version = "6.0.12.20240917", optional = true } -types-setuptools = { version = "75.5.0.20241122", optional = true } -lxml = { version = "5.2.2", optional = true } -miniupnpc = { version = "2.2.2", source = "chia", optional = true } +"keyrings.cryptfile" = { version = ">=1.3.9", optional = true } +mypy = { version = ">=1.11.1", optional = true } +pre-commit = [ { version = "3.5.0", python = "<3.9", optional = true }, { version = ">=3.7.1", python = ">=3.9", optional = true } ] +py3createtorrent = { version = ">=1.2.1", optional = true } +pyinstaller = { version = ">=6.9.0", optional = true } +pytest = { version = ">=8.3.3", optional = true } +pytest-cov = { version = ">=5.0.0", optional = true } +pytest-mock = { version = ">=3.14.0", optional = true } +pytest-monitor = { version = ">=1.6.6", platform = "linux", optional = true } +pytest-xdist = { version = ">=3.6.1", optional = true } +types-aiofiles = { version = ">=24.1.0.20240626", optional = true } +types-cryptography = { version = ">=3.3.23.2", optional = true } +types-pyyaml = { version = ">=6.0.12.20240917", optional = true } +types-setuptools = { version = ">=75.5.0.20241122", optional = true } +lxml = { version = ">=5.2.2", optional = true } +miniupnpc = { version = ">=2.2.2", source = "chia", optional = true } # big-o = {version = "0.11.0", optional = true} # numpy = [ -# {version="1.24.4", python = "<3.9", optional = true}, -# {version="1.26.4", python = ">=3.9", optional = true}] +# {version="<=1.24.4", python = "<3.9", optional = true}, +# {version=">=1.26.4", python = ">=3.9", optional = true}] ruff = { version = "0.7.1", optional = true }