From 0a4d684517d8e8d7b5f4104b6566e417bc17781a Mon Sep 17 00:00:00 2001 From: Jo Booth Date: Mon, 16 Dec 2024 16:28:47 -0500 Subject: [PATCH 1/5] chore: LEAP-1700: bump pyredis and fakeredis --- poetry.lock | 52 +++++++++++++++++++++++++++++++++----------------- pyproject.toml | 4 ++-- 2 files changed, 37 insertions(+), 19 deletions(-) diff --git a/poetry.lock b/poetry.lock index 83ea851df632..2ec99e1c0e01 100644 --- a/poetry.lock +++ b/poetry.lock @@ -75,6 +75,17 @@ typing-extensions = {version = ">=4", markers = "python_version < \"3.11\""} [package.extras] tests = ["mypy (>=0.800)", "pytest", "pytest-asyncio"] +[[package]] +name = "async-timeout" +version = "5.0.1" +description = "Timeout context manager for asyncio programs" +optional = false +python-versions = ">=3.8" +files = [ + {file = "async_timeout-5.0.1-py3-none-any.whl", hash = "sha256:39e3809566ff85354557ec2398b55e096c8364bacac9405a7a1fa429e77fe76c"}, + {file = "async_timeout-5.0.1.tar.gz", hash = "sha256:d9321a7a3d5a6a5e187e824d2fa0793ce379a202935782d555d6e9d2735677d3"}, +] + [[package]] name = "attr" version = "0.3.1" @@ -1064,23 +1075,26 @@ typing-extensions = "*" [[package]] name = "fakeredis" -version = "1.5.0" -description = "Fake implementation of redis API for testing purposes." +version = "2.26.1" +description = "Python implementation of redis API, can be used for testing purposes." optional = false -python-versions = ">=3.5" +python-versions = "<4.0,>=3.7" files = [ - {file = "fakeredis-1.5.0-py3-none-any.whl", hash = "sha256:e0416e4941cecd3089b0d901e60c8dc3c944f6384f5e29e2261c0d3c5fa99669"}, - {file = "fakeredis-1.5.0.tar.gz", hash = "sha256:1ac0cef767c37f51718874a33afb5413e69d132988cb6a80c6e6dbeddf8c7623"}, + {file = "fakeredis-2.26.1-py3-none-any.whl", hash = "sha256:68a5615d7ef2529094d6958677e30a6d30d544e203a5ab852985c19d7ad57e32"}, + {file = "fakeredis-2.26.1.tar.gz", hash = "sha256:69f4daafe763c8014a6dbf44a17559c46643c95447b3594b3975251a171b806d"}, ] [package.dependencies] -redis = "<3.6.0" -six = ">=1.12" -sortedcontainers = "*" +redis = {version = ">=4.3", markers = "python_full_version > \"3.8.0\""} +sortedcontainers = ">=2,<3" +typing-extensions = {version = ">=4.7,<5.0", markers = "python_version < \"3.11\""} [package.extras] -aioredis = ["aioredis"] -lua = ["lupa"] +bf = ["pyprobables (>=0.6,<0.7)"] +cf = ["pyprobables (>=0.6,<0.7)"] +json = ["jsonpath-ng (>=1.6,<2.0)"] +lua = ["lupa (>=2.1,<3.0)"] +probabilistic = ["pyprobables (>=0.6,<0.7)"] [[package]] name = "filelock" @@ -3531,17 +3545,21 @@ md = ["cmarkgfm (>=0.8.0)"] [[package]] name = "redis" -version = "3.5.3" -description = "Python client for Redis key-value store" +version = "5.2.1" +description = "Python client for Redis database and key-value store" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +python-versions = ">=3.8" files = [ - {file = "redis-3.5.3-py2.py3-none-any.whl", hash = "sha256:432b788c4530cfe16d8d943a09d40ca6c16149727e4afe8c2c9d5580c59d9f24"}, - {file = "redis-3.5.3.tar.gz", hash = "sha256:0e7e0cfca8660dea8b7d5cd8c4f6c5e29e11f31158c0b0ae91a397f00e5a05a2"}, + {file = "redis-5.2.1-py3-none-any.whl", hash = "sha256:ee7e1056b9aea0f04c6c2ed59452947f34c4940ee025f5dd83e6a6418b6989e4"}, + {file = "redis-5.2.1.tar.gz", hash = "sha256:16f2e22dff21d5125e8481515e386711a34cbec50f0e44413dd7d9c060a54e0f"}, ] +[package.dependencies] +async-timeout = {version = ">=4.0.3", markers = "python_full_version < \"3.11.3\""} + [package.extras] -hiredis = ["hiredis (>=0.1.3)"] +hiredis = ["hiredis (>=3.0.0)"] +ocsp = ["cryptography (>=36.0.1)", "pyopenssl (==23.2.1)", "requests (>=2.31.0)"] [[package]] name = "referencing" @@ -4615,4 +4633,4 @@ uwsgi = ["pyuwsgi", "uwsgitop"] [metadata] lock-version = "2.0" python-versions = ">=3.10,<4" -content-hash = "5124c308584e6f9d7493d37f6d471947f30ab4eaedb1b13c3c6ac9a71c3eaccd" +content-hash = "c3656998ba6d9776676dc2f99551f05dd0227ac0f1eb0905a34a15528ad3af04" diff --git a/pyproject.toml b/pyproject.toml index b1e374e588cb..f25f5352791a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -189,7 +189,7 @@ ujson = ">=3.0.0" xmljson = "0.2.1" colorama = ">=0.4.4" pyboxen = ">=1.3.0" -redis = "~=3.5" +redis = "~=5.2.1" sentry-sdk = ">=2.16.0" launchdarkly-server-sdk = "8.2.1" python-json-logger = "2.0.4" @@ -211,7 +211,7 @@ pytest-cov = "2.12.1" pytest-django = "4.1.0" pytest-mock = "1.10.3" tavern = "2.3.0" -fakeredis = "1.5.0" +fakeredis = "~=2.26.1" pytest-env = "0.6.2" responses = "0.13.0" pytest-xdist = "~=2.5.0" From 99998d7b9f584a8aac489a61f304ad8ae30a3747 Mon Sep 17 00:00:00 2001 From: Jo Booth Date: Wed, 18 Dec 2024 17:14:01 -0500 Subject: [PATCH 2/5] bump rq and django-rq --- poetry.lock | 29 ++++++++++++++--------------- pyproject.toml | 4 ++-- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/poetry.lock b/poetry.lock index 2ec99e1c0e01..29a60cd13d25 100644 --- a/poetry.lock +++ b/poetry.lock @@ -857,23 +857,22 @@ test = ["django (>=1.8.0)", "pytest (>=3.0.5)", "pytest-cov (>=2.4.0)", "pytest- [[package]] name = "django-rq" -version = "2.5.1" +version = "3.0.0" description = "An app that provides django integration for RQ (Redis Queue)" optional = false python-versions = "*" files = [ - {file = "django-rq-2.5.1.tar.gz", hash = "sha256:f08486602664d73a6e335872c868d79663e380247e6307496d01b8fa770fefd8"}, - {file = "django_rq-2.5.1-py2.py3-none-any.whl", hash = "sha256:7be1e10e7091555f9f36edf100b0dbb205ea2b98683d74443d2bdf3c6649a03f"}, + {file = "django-rq-3.0.0.tar.gz", hash = "sha256:7bdadb85d9909c118cf1ee1b9bdd1a74ebf141bf8f3c2de2409fcac6080f67ac"}, + {file = "django_rq-3.0.0-py2.py3-none-any.whl", hash = "sha256:bd2ef287a28301f64c4282293648e4f8c6076dd895a545c9c6b98bde4a82a4ce"}, ] [package.dependencies] -django = ">=2.0" -redis = ">=3" -rq = ">=1.2" +django = ">=3.2" +redis = ">=3.5" +rq = ">=2" [package.extras] -sentry = ["raven (>=6.1.0)"] -testing = ["mock (>=2.0.0)"] +sentry = ["sentry-sdk (>=1.0.0)"] [[package]] name = "django-storages" @@ -3881,18 +3880,18 @@ files = [ [[package]] name = "rq" -version = "1.10.1" +version = "2.0.0" description = "RQ is a simple, lightweight, library for creating background jobs, and processing them." optional = false -python-versions = ">=3.5" +python-versions = ">=3.8" files = [ - {file = "rq-1.10.1-py2.py3-none-any.whl", hash = "sha256:92f4cf38b2364c1697b541e77c0fe62b7e5242fa864324f262be126ee2a07e3a"}, - {file = "rq-1.10.1.tar.gz", hash = "sha256:62d06b44c3acfa5d1933c5a4ec3fbc2484144a8af60e318d0b8447c5236271e2"}, + {file = "rq-2.0.0-py3-none-any.whl", hash = "sha256:a3a767876675dcc42683bac1869494c5020ba7fcf5c026d1f6d36a8ab98573a6"}, + {file = "rq-2.0.0.tar.gz", hash = "sha256:76d2a4a27f8fd5c4cfa200cd442efe3c1fd73525c676af06f07fcc0b81bdb70d"}, ] [package.dependencies] -click = ">=5.0.0" -redis = ">=3.5.0" +click = ">=5" +redis = ">=3.5" [[package]] name = "rsa" @@ -4633,4 +4632,4 @@ uwsgi = ["pyuwsgi", "uwsgitop"] [metadata] lock-version = "2.0" python-versions = ">=3.10,<4" -content-hash = "c3656998ba6d9776676dc2f99551f05dd0227ac0f1eb0905a34a15528ad3af04" +content-hash = "851146e7b04cbb59e384126428e400fd8f8339ffc00c43663fe2502ffe9ae8ff" diff --git a/pyproject.toml b/pyproject.toml index f25f5352791a..04893d61b8d2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -161,7 +161,7 @@ django-debug-toolbar = "3.2.1" django-environ = "0.10.0" django-filter = "24.3" django-model-utils = "4.1.1" -django-rq = "2.5.1" +django-rq = "~=3.0.0" django-cors-headers = "3.6.0" django-extensions = "3.2.3" django-user-agents = "0.4.0" @@ -183,7 +183,7 @@ python-dateutil = ">=2.8.1" pytz = "~=2022.1" requests = "~=2.32.3" urllib3 = "^1.26.18" -rq = "1.10.1" +rq = "~=2.0.0" rules = "3.4" ujson = ">=3.0.0" xmljson = "0.2.1" From f2fd8a5fd616c68caf2c07b6aad6cf94422a8c46 Mon Sep 17 00:00:00 2001 From: Jo Booth Date: Wed, 18 Dec 2024 17:19:53 -0500 Subject: [PATCH 3/5] empty for FM From 4cc9de245a876b27cd530118ce869380fd85bd13 Mon Sep 17 00:00:00 2001 From: Jo Booth Date: Thu, 19 Dec 2024 17:02:44 -0500 Subject: [PATCH 4/5] empty for FM From 993a065e01b43d74047de5624c5643698cf7cdd8 Mon Sep 17 00:00:00 2001 From: Jo Booth Date: Fri, 20 Dec 2024 16:25:58 -0500 Subject: [PATCH 5/5] empty for FM