From 62029a0d009fb241bf9f13c6a99974f3c0327604 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 23 Sep 2025 12:49:54 -0500 Subject: [PATCH 1/8] PYTHON-5570 Do not freeze the lockfile --- .evergreen/scripts/setup-dev-env.sh | 4 ++-- justfile | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.evergreen/scripts/setup-dev-env.sh b/.evergreen/scripts/setup-dev-env.sh index 6e6b5965bd..38824f32b7 100755 --- a/.evergreen/scripts/setup-dev-env.sh +++ b/.evergreen/scripts/setup-dev-env.sh @@ -47,13 +47,13 @@ if [ -f $HOME/.visualStudioEnv.sh ]; then SSH_TTY=1 source $HOME/.visualStudioEnv.sh set -u fi -uv sync --frozen +uv sync echo "Setting up python environment... done." # Ensure there is a pre-commit hook if there is a git checkout. if [ -d .git ] && [ ! -f .git/hooks/pre-commit ]; then - uv run --frozen pre-commit install + uv run pre-commit install fi popd > /dev/null diff --git a/justfile b/justfile index c129b2c199..4645a4a47d 100644 --- a/justfile +++ b/justfile @@ -1,7 +1,5 @@ # See https://just.systems/man/en/ for instructions set shell := ["bash", "-c"] -# Do not modify the lock file when running justfile commands. -export UV_FROZEN := "1" # Commonly used command segments. typing_run := "uv run --group typing --extra aws --extra encryption --extra ocsp --extra snappy --extra test --extra zstd" @@ -16,7 +14,7 @@ default: [private] resync: - @uv sync --quiet --frozen + @uv sync --quiet install: bash .evergreen/scripts/setup-dev-env.sh From 0c123f16b98eaa566f10f9ea937f750da335463f Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 23 Sep 2025 12:53:03 -0500 Subject: [PATCH 2/8] update lock hook --- .pre-commit-config.yaml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ac129f95f0..d7dd00907d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -105,12 +105,6 @@ repos: # - test/test_client.py:188: te ==> the, be, we, to args: ["-L", "fle,fo,infinit,isnt,nin,te,aks"] -- repo: https://github.com/astral-sh/uv-pre-commit - # uv version. - rev: 0.8.17 - hooks: - - id: uv-lock - - repo: local hooks: - id: executable-shell @@ -128,3 +122,14 @@ repos: language: python require_serial: true additional_dependencies: ["shrub.py>=3.10.0", "pyyaml>=6.0.2"] + + - id: uv-lock + name: uv-lock + entry: uv lock + language: python + require_serial: true + files: ^(uv\.lock|pyproject\.toml|requirements.txt|requirements/.*\.txt)$ + pass_filenames: false + fail_fast: true + additional_dependencies: + - uv From 110a0fd6446079027a76fd03ba5cfad847c14a7a Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 23 Sep 2025 12:53:24 -0500 Subject: [PATCH 3/8] test lock update --- requirements/aws.txt | 2 +- uv.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/aws.txt b/requirements/aws.txt index 06e30c11c3..52bafe695e 100644 --- a/requirements/aws.txt +++ b/requirements/aws.txt @@ -1 +1 @@ -pymongo-auth-aws>=1.1.0,<2.0.0 +pymongo-auth-aws>=1.1.1,<2.0.0 diff --git a/uv.lock b/uv.lock index ce0367e872..5a7279e1ef 100644 --- a/uv.lock +++ b/uv.lock @@ -1309,7 +1309,7 @@ requires-dist = [ { name = "furo", marker = "extra == 'docs'", specifier = "==2025.7.19" }, { name = "importlib-metadata", marker = "python_full_version < '3.13' and extra == 'test'", specifier = ">=7.0" }, { name = "pykerberos", marker = "os_name != 'nt' and extra == 'gssapi'" }, - { name = "pymongo-auth-aws", marker = "extra == 'aws'", specifier = ">=1.1.0,<2.0.0" }, + { name = "pymongo-auth-aws", marker = "extra == 'aws'", specifier = ">=1.1.1,<2.0.0" }, { name = "pymongo-auth-aws", marker = "extra == 'encryption'", specifier = ">=1.1.0,<2.0.0" }, { name = "pymongocrypt", marker = "extra == 'encryption'", specifier = ">=1.13.0,<2.0.0" }, { name = "pyopenssl", marker = "extra == 'ocsp'", specifier = ">=17.2.0" }, From fe291e57b4ebe07bcb50b4e048182edb9e2ce5d4 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 23 Sep 2025 12:53:39 -0500 Subject: [PATCH 4/8] revert dep change --- requirements/aws.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/aws.txt b/requirements/aws.txt index 52bafe695e..06e30c11c3 100644 --- a/requirements/aws.txt +++ b/requirements/aws.txt @@ -1 +1 @@ -pymongo-auth-aws>=1.1.1,<2.0.0 +pymongo-auth-aws>=1.1.0,<2.0.0 From a6c8378507b3e128c69c9ab3c439c899a2436ff8 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 23 Sep 2025 12:55:08 -0500 Subject: [PATCH 5/8] test lock update --- .pre-commit-config.yaml | 18 +++++++----------- requirements/aws.txt | 2 +- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d7dd00907d..48d2673105 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -105,6 +105,13 @@ repos: # - test/test_client.py:188: te ==> the, be, we, to args: ["-L", "fle,fo,infinit,isnt,nin,te,aks"] +- repo: https://github.com/astral-sh/uv-pre-commit + # uv version. + rev: 0.8.17 + hooks: + - id: uv-lock + files: ^(uv\.lock|pyproject\.toml|requirements.txt|requirements/.*\.txt)$ + - repo: local hooks: - id: executable-shell @@ -122,14 +129,3 @@ repos: language: python require_serial: true additional_dependencies: ["shrub.py>=3.10.0", "pyyaml>=6.0.2"] - - - id: uv-lock - name: uv-lock - entry: uv lock - language: python - require_serial: true - files: ^(uv\.lock|pyproject\.toml|requirements.txt|requirements/.*\.txt)$ - pass_filenames: false - fail_fast: true - additional_dependencies: - - uv diff --git a/requirements/aws.txt b/requirements/aws.txt index 06e30c11c3..52bafe695e 100644 --- a/requirements/aws.txt +++ b/requirements/aws.txt @@ -1 +1 @@ -pymongo-auth-aws>=1.1.0,<2.0.0 +pymongo-auth-aws>=1.1.1,<2.0.0 From 196c1a00828dc274c89bc9bad1795e8d375e90fb Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 23 Sep 2025 12:55:39 -0500 Subject: [PATCH 6/8] test lock update --- requirements/aws.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/aws.txt b/requirements/aws.txt index 52bafe695e..8f1bfa2792 100644 --- a/requirements/aws.txt +++ b/requirements/aws.txt @@ -1 +1 @@ -pymongo-auth-aws>=1.1.1,<2.0.0 +pymongo-auth-aws>=1.1.2,<2.0.0 From e3f1a592ed829590d88aea5ddfd9bcb4e46393d0 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 23 Sep 2025 12:56:20 -0500 Subject: [PATCH 7/8] use local again --- .pre-commit-config.yaml | 18 +++++++++++------- requirements/aws.txt | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 48d2673105..d7dd00907d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -105,13 +105,6 @@ repos: # - test/test_client.py:188: te ==> the, be, we, to args: ["-L", "fle,fo,infinit,isnt,nin,te,aks"] -- repo: https://github.com/astral-sh/uv-pre-commit - # uv version. - rev: 0.8.17 - hooks: - - id: uv-lock - files: ^(uv\.lock|pyproject\.toml|requirements.txt|requirements/.*\.txt)$ - - repo: local hooks: - id: executable-shell @@ -129,3 +122,14 @@ repos: language: python require_serial: true additional_dependencies: ["shrub.py>=3.10.0", "pyyaml>=6.0.2"] + + - id: uv-lock + name: uv-lock + entry: uv lock + language: python + require_serial: true + files: ^(uv\.lock|pyproject\.toml|requirements.txt|requirements/.*\.txt)$ + pass_filenames: false + fail_fast: true + additional_dependencies: + - uv diff --git a/requirements/aws.txt b/requirements/aws.txt index 8f1bfa2792..06e30c11c3 100644 --- a/requirements/aws.txt +++ b/requirements/aws.txt @@ -1 +1 @@ -pymongo-auth-aws>=1.1.2,<2.0.0 +pymongo-auth-aws>=1.1.0,<2.0.0 From 5346b014578ca332d9d97a6cad0848738e1e86bc Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 23 Sep 2025 12:56:55 -0500 Subject: [PATCH 8/8] set min version --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d7dd00907d..d2b9d9a17a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -132,4 +132,4 @@ repos: pass_filenames: false fail_fast: true additional_dependencies: - - uv + - "uv>=0.8.4"