From f96b72f47583a083e0c78ec7c7ff4da5d3ad6a19 Mon Sep 17 00:00:00 2001 From: Suejung Shin Date: Fri, 22 Nov 2024 08:51:32 -0800 Subject: [PATCH] fix: Loosen deps ranges for compat with api, worker (#432) * fix: Pin sentry-sdk to previous version * bump down boto3 * align versions with api * demote to match worker versions * Specify minimum version for sentry-sdk --------- Co-authored-by: Michelle Tran --- pyproject.toml | 58 ++++++++++++++++++++++----------------------- uv.lock | 64 +++++++++++++++++++++++++------------------------- 2 files changed, 61 insertions(+), 61 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 2f271caf..fcbbe631 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,34 +5,34 @@ description = "Shared code used in codecov API and worker" readme = "README.md" requires-python = ">=3.12" dependencies = [ - "boto3>=1.35.59", - "cachetools>=5.5.0", + "boto3>=1.20.25", + "cachetools>=4.1.1", "cerberus>=1.3.5", "codecov-ribs>=0.1.18", "colour>=0.1.5", - "cryptography>=43.0.3", + "cryptography>=43.0.1", "django-better-admin-arrayfield>=1.4.2", - "django-model-utils>=5.0.0", + "django-model-utils>=4.5.1", "django-postgres-extra>=2.0.8", "django-prometheus>=2.3.1", "django<5", - "google-auth>=2.36.0", - "google-cloud-pubsub>=2.27.1", + "google-auth>=2.21.0", + "google-cloud-pubsub>=2.18.4", "google-cloud-storage>=2.18.2", "httpx>=0.23.0", - "ijson>=3.3.0", - "minio>=7.2.10", - "mmh3>=5.0.1", - "oauthlib>=3.2.2", - "orjson>=3.10.11", - "prometheus-client>=0.21.0", - "pyjwt>=2.9.0", - "pyparsing>=3.2.0", + "ijson>=3.2.3", + "minio>=7.1.13", + "mmh3>=4.0.1", + "oauthlib>=3.1.0", + "orjson>=3.10.9", + "prometheus-client>=0.17.1", + "pyjwt>=2.8.0", + "pyparsing>=2.4.7", "python-redis-lock>=4.0.0", - "pyyaml>=6.0.2", - "redis>=5.2.0", + "pyyaml>=6.0.1", + "redis>=4.4.4", "requests>=2.32.3", - "sentry-sdk>=2.18.0", + "sentry-sdk>=2.13.0", "sqlalchemy<2", ] @@ -42,22 +42,22 @@ build-backend = "hatchling.build" [tool.uv] dev-dependencies = [ - "factory-boy>=3.3.1", - "freezegun>=1.5.1", - "mock>=5.1.0", + "factory-boy>=3.2.0", + "freezegun>=1.1.0", + "mock>=4.0.3", "mypy>=1.13.0", - "pre-commit>=4.0.1", - "psycopg2-binary>=2.9.10", - "pytest-asyncio>=0.24.0", - "pytest-cov>=6.0.0", - "pytest-django>=4.9.0", - "pytest-mock>=3.14.0", - "pytest>=8.3.3", - "respx>=0.21.1", + "pre-commit>=2.11.1", + "psycopg2-binary>=2.9.2", + "pytest-asyncio>=0.14.0", + "pytest-cov>=5.0.0", + "pytest-django>=4.7.0", + "pytest-mock>=1.13.0", + "pytest>=8.1.1", + "respx>=0.20.2", "ruff>=0.7.3", "types-mock>=5.1.0.20240425", # NOTE: some weird interaction between existing `vcrpy` snapshots and the way # `oauth2` / `minio` deal with requests forces us to downgrade `urllib3`: "urllib3==1.26.19", - "vcrpy>=6.0.2", + "vcrpy>=4.1.1", ] diff --git a/uv.lock b/uv.lock index a9e0cbfb..e19cd618 100644 --- a/uv.lock +++ b/uv.lock @@ -1385,15 +1385,15 @@ wheels = [ [[package]] name = "sentry-sdk" -version = "2.18.0" +version = "2.13.0" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "certifi" }, { name = "urllib3" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/24/cc/0d87cc8246f52d92228aa6718a24e1988a2893f4abe2f64ec5a8bcba4185/sentry_sdk-2.18.0.tar.gz", hash = "sha256:0dc21febd1ab35c648391c664df96f5f79fb0d92d7d4225cd9832e53a617cafd", size = 293615 } +sdist = { url = "https://files.pythonhosted.org/packages/bb/41/97f673384dae5ed81cc2a568cc5c28e76deee85f8ba50def862e86150a5a/sentry_sdk-2.13.0.tar.gz", hash = "sha256:8d4a576f7a98eb2fdb40e13106e41f330e5c79d72a68be1316e7852cf4995260", size = 279937 } wheels = [ - { url = "https://files.pythonhosted.org/packages/76/9b/2d512efdb0de203d1f0312fae53433c3009ba70b0078421d25baaedc960a/sentry_sdk-2.18.0-py2.py3-none-any.whl", hash = "sha256:ee70e27d1bbe4cd52a38e1bd28a5fadb9b17bc29d91b5f2b97ae29c0a7610442", size = 317514 }, + { url = "https://files.pythonhosted.org/packages/ad/7e/e9ca09f24a6c334286631a2d32c267cdc5edad5ac03fd9d20a01a82f1c35/sentry_sdk-2.13.0-py2.py3-none-any.whl", hash = "sha256:6beede8fc2ab4043da7f69d95534e320944690680dd9a963178a49de71d726c6", size = 309078 }, ] [[package]] @@ -1454,55 +1454,55 @@ dev = [ [package.metadata] requires-dist = [ - { name = "boto3", specifier = ">=1.35.59" }, - { name = "cachetools", specifier = ">=5.5.0" }, + { name = "boto3", specifier = ">=1.20.25" }, + { name = "cachetools", specifier = ">=4.1.1" }, { name = "cerberus", specifier = ">=1.3.5" }, { name = "codecov-ribs", specifier = ">=0.1.18" }, { name = "colour", specifier = ">=0.1.5" }, - { name = "cryptography", specifier = ">=43.0.3" }, + { name = "cryptography", specifier = ">=43.0.1" }, { name = "django", specifier = "<5" }, { name = "django-better-admin-arrayfield", specifier = ">=1.4.2" }, - { name = "django-model-utils", specifier = ">=5.0.0" }, + { name = "django-model-utils", specifier = ">=4.5.1" }, { name = "django-postgres-extra", specifier = ">=2.0.8" }, { name = "django-prometheus", specifier = ">=2.3.1" }, - { name = "google-auth", specifier = ">=2.36.0" }, - { name = "google-cloud-pubsub", specifier = ">=2.27.1" }, + { name = "google-auth", specifier = ">=2.21.0" }, + { name = "google-cloud-pubsub", specifier = ">=2.18.4" }, { name = "google-cloud-storage", specifier = ">=2.18.2" }, { name = "httpx", specifier = ">=0.23.0" }, - { name = "ijson", specifier = ">=3.3.0" }, - { name = "minio", specifier = ">=7.2.10" }, - { name = "mmh3", specifier = ">=5.0.1" }, - { name = "oauthlib", specifier = ">=3.2.2" }, - { name = "orjson", specifier = ">=3.10.11" }, - { name = "prometheus-client", specifier = ">=0.21.0" }, - { name = "pyjwt", specifier = ">=2.9.0" }, - { name = "pyparsing", specifier = ">=3.2.0" }, + { name = "ijson", specifier = ">=3.2.3" }, + { name = "minio", specifier = ">=7.1.13" }, + { name = "mmh3", specifier = ">=4.0.1" }, + { name = "oauthlib", specifier = ">=3.1.0" }, + { name = "orjson", specifier = ">=3.10.9" }, + { name = "prometheus-client", specifier = ">=0.17.1" }, + { name = "pyjwt", specifier = ">=2.8.0" }, + { name = "pyparsing", specifier = ">=2.4.7" }, { name = "python-redis-lock", specifier = ">=4.0.0" }, - { name = "pyyaml", specifier = ">=6.0.2" }, - { name = "redis", specifier = ">=5.2.0" }, + { name = "pyyaml", specifier = ">=6.0.1" }, + { name = "redis", specifier = ">=4.4.4" }, { name = "requests", specifier = ">=2.32.3" }, - { name = "sentry-sdk", specifier = ">=2.18.0" }, + { name = "sentry-sdk", specifier = ">=2.13.0" }, { name = "sqlalchemy", specifier = "<2" }, ] [package.metadata.requires-dev] dev = [ - { name = "factory-boy", specifier = ">=3.3.1" }, - { name = "freezegun", specifier = ">=1.5.1" }, - { name = "mock", specifier = ">=5.1.0" }, + { name = "factory-boy", specifier = ">=3.2.0" }, + { name = "freezegun", specifier = ">=1.1.0" }, + { name = "mock", specifier = ">=4.0.3" }, { name = "mypy", specifier = ">=1.13.0" }, - { name = "pre-commit", specifier = ">=4.0.1" }, - { name = "psycopg2-binary", specifier = ">=2.9.10" }, - { name = "pytest", specifier = ">=8.3.3" }, - { name = "pytest-asyncio", specifier = ">=0.24.0" }, - { name = "pytest-cov", specifier = ">=6.0.0" }, - { name = "pytest-django", specifier = ">=4.9.0" }, - { name = "pytest-mock", specifier = ">=3.14.0" }, - { name = "respx", specifier = ">=0.21.1" }, + { name = "pre-commit", specifier = ">=2.11.1" }, + { name = "psycopg2-binary", specifier = ">=2.9.2" }, + { name = "pytest", specifier = ">=8.1.1" }, + { name = "pytest-asyncio", specifier = ">=0.14.0" }, + { name = "pytest-cov", specifier = ">=5.0.0" }, + { name = "pytest-django", specifier = ">=4.7.0" }, + { name = "pytest-mock", specifier = ">=1.13.0" }, + { name = "respx", specifier = ">=0.20.2" }, { name = "ruff", specifier = ">=0.7.3" }, { name = "types-mock", specifier = ">=5.1.0.20240425" }, { name = "urllib3", specifier = "==1.26.19" }, - { name = "vcrpy", specifier = ">=6.0.2" }, + { name = "vcrpy", specifier = ">=4.1.1" }, ] [[package]]