wip

Author: blink1073

.evergreen/run-tests.sh

@@ -26,6 +26,10 @@ else
 fi
 
 # Start the test runner.
-uv run ${UV_ARGS} --reinstall .evergreen/scripts/run_tests.py "$@"
+set -x
+env | grep UV
+uv sync ${UV_ARGS}
+git status
+# uv run ${UV_ARGS} python .evergreen/scripts/run_tests.py "$@"
 
 popd

.evergreen/scripts/run_tests.py

@@ -30,13 +30,13 @@
 
 
 def list_packages():
-    packages = dict()
+    packages = set()
     for distribution in importlib_metadata.distributions():
-        packages[distribution.name] = distribution
+        packages.add(distribution.name)
     print("Package             Version     URL")
     print("------------------- ----------- ----------------------------------------------------")
     for name in sorted(packages):
-        distribution = packages[name]
+        distribution = importlib_metadata.distribution(name)
         url = ""
         if distribution.origin is not None:
             url = distribution.origin.url

.evergreen/scripts/setup_tests.py

@@ -160,7 +160,6 @@ def handle_test_env() -> None:
 
     write_env("PIP_QUIET")  # Quiet by default.
     write_env("PIP_PREFER_BINARY")  # Prefer binary dists by default.
-    write_env("UV_FROZEN")  # Do not modify lock files.
 
     # Set an environment variable for the test name and sub test name.
     write_env(f"TEST_{test_name.upper()}")
@@ -236,7 +235,7 @@ def handle_test_env() -> None:
     if is_set("MONGODB_URI"):
         write_env("PYMONGO_MUST_CONNECT", "true")
 
-    if is_set("DISABLE_TEST_COMMANDS") or opts.disable_test_commands:
+    if opts.disable_test_commands:
         write_env("PYMONGO_DISABLE_TEST_COMMANDS", "1")
 
     if test_name == "enterprise_auth":
@@ -380,7 +379,7 @@ def handle_test_env() -> None:
     if sub_test_name == "pyopenssl":
         UV_ARGS.append("--extra ocsp")
 
-    if is_set("TEST_CRYPT_SHARED") or opts.crypt_shared:
+    if opts.crypt_shared:
         config = read_env(f"{DRIVERS_TOOLS}/mo-expansion.sh")
         CRYPT_SHARED_DIR = Path(config["CRYPT_SHARED_LIB_PATH"]).parent.as_posix()
         LOGGER.info("Using crypt_shared_dir %s", CRYPT_SHARED_DIR)
@@ -450,14 +449,14 @@ def handle_test_env() -> None:
 
     # Add coverage if requested.
     # Only cover CPython. PyPy reports suspiciously low coverage.
-    if (is_set("COVERAGE") or opts.cov) and platform.python_implementation() == "CPython":
+    if opts.cov and platform.python_implementation() == "CPython":
         # Keep in sync with combine-coverage.sh.
         # coverage >=5 is needed for relative_files=true.
         UV_ARGS.append("--group coverage")
         TEST_ARGS = f"{TEST_ARGS} --cov"
         write_env("COVERAGE")
 
-    if is_set("GREEN_FRAMEWORK") or opts.green_framework:
+    if opts.green_framework:
         framework = opts.green_framework or os.environ["GREEN_FRAMEWORK"]
         UV_ARGS.append(f"--group {framework}")
 

.evergreen/scripts/utils.py

@@ -60,6 +60,9 @@ class Distro:
     "ocsp",
 ]
 
+# Mapping of env variables to options
+OPTION_TO_ENV_VAR = {"cov": "COVERAGE", "crypt_shared": "TEST_CRYPT_SHARED"}
+
 
 def get_test_options(
     description, require_sub_test_name=True, allow_extra_opts=False
@@ -94,6 +97,9 @@ def get_test_options(
     )
     parser.add_argument("--auth", action="store_true", help="Whether to add authentication.")
     parser.add_argument("--ssl", action="store_true", help="Whether to add TLS configuration.")
+    parser.add_argument(
+        "--test-min-deps", action="store_true", help="Test against minimum dependency versions"
+    )
 
     # Add the test modifiers.
     if require_sub_test_name:
@@ -121,35 +127,51 @@ def get_test_options(
         parser.add_argument(
             "--disable-test-commands", action="store_true", help="Disable test commands."
         )
-        parser.add_argument(
-            "--test-min-deps", action="store_true", help="Test against minimum dependency versions"
-        )
 
     # Get the options.
     if not allow_extra_opts:
         opts, extra_opts = parser.parse_args(), []
     else:
         opts, extra_opts = parser.parse_known_args()
-    if opts.verbose:
-        LOGGER.setLevel(logging.DEBUG)
-    elif opts.quiet:
-        LOGGER.setLevel(logging.WARNING)
 
     # Handle validation and environment variable overrides.
     test_name = opts.test_name
     sub_test_name = opts.sub_test_name if require_sub_test_name else ""
     if require_sub_test_name and test_name in SUB_TEST_REQUIRED and not sub_test_name:
         raise ValueError(f"Test '{test_name}' requires a sub_test_name")
-    if "auth" in test_name or os.environ.get("AUTH") == "auth":
+    handle_env_overrides(opts)
+    if "auth" in test_name:
         opts.auth = True
         # 'auth_aws ecs' shouldn't have extra auth set.
         if test_name == "auth_aws" and sub_test_name == "ecs":
             opts.auth = False
-    if os.environ.get("SSL") == "ssl":
-        opts.ssl = True
+    if opts.verbose:
+        LOGGER.setLevel(logging.DEBUG)
+    elif opts.quiet:
+        LOGGER.setLevel(logging.WARNING)
     return opts, extra_opts
 
 
+def handle_env_overrides(opts: argparse.Namespace) -> None:
+    # Get the options, and then allow environment variable overrides.
+    for key in vars(opts):
+        if key in OPTION_TO_ENV_VAR:
+            env_var = OPTION_TO_ENV_VAR[key]
+        else:
+            env_var = key.upper()
+        if env_var in os.environ:
+            if env_var == "AUTH":
+                opts.auth = os.environ.get("AUTH") == "auth"
+            elif env_var == "SSL":
+                ssl_opt = os.environ.get("SSL", "")
+                opts.ssl = ssl_opt and ssl_opt.lower() != "nossl"
+            elif isinstance(getattr(opts, key), bool):
+                if os.environ[env_var]:
+                    setattr(opts, key, True)
+            else:
+                setattr(opts, key, os.environ[env_var])
+
+
 def read_env(path: Path | str) -> dict[str, str]:
     config = dict()
     with Path(path).open() as fid:

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

pyproject.toml

@@ -49,23 +49,22 @@ Tracker = "https://jira.mongodb.org/projects/PYTHON/issues"
 dev = [
     "pre-commit>=4.0"
 ]
-pip = ["pip"]
-# TODO: PYTHON-5464
-gevent = ["gevent", "cffi>=2.0.0b1;python_version=='3.14'"]
-eventlet = ["eventlet"]
+pip = ["pip>23.0"]
+gevent = ["gevent>=20.9"]
+eventlet = ["eventlet>0.29"]
 coverage = [
-    "pytest-cov",
+    "pytest-cov>=2.9.0",
     "coverage>=5,<=7.10.6"
 ]
 mockupdb = [
     "mockupdb@git+https://github.com/mongodb-labs/mongo-mockup-db@master"
 ]
-perf = ["simplejson"]
+perf = ["simplejson>3.17"]
 typing = [
-    "mypy==1.18.1",
+    "mypy==1.17.1",
     "pyright==1.1.405",
-    "typing_extensions",
-    "pip"
+    "typing_extensions>3.10",
+    "pip>23.0"
 ]
 
 # Used to call hatch_build.py
@@ -131,6 +130,7 @@ markers = [
     "auth: tests that rely on authentication",
     "ocsp: tests that rely on ocsp",
     "atlas_connect: tests that rely on an atlas connection",
+    "data_lake: tests that rely on atlas data lake",
     "perf: benchmark tests",
     "search_index: search index helper tests",
     "kms: client-side field-level encryption tests using kms",
@@ -235,7 +235,7 @@ dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?)|dummy.*)$"
 
 [tool.ruff.lint.per-file-ignores]
 "pymongo/__init__.py" = ["E402"]
-".evergreen/scripts/*.py" = ["T201"]
+".evergreen/scripts/run_tests.py" = ["T201"]
 "test/*.py" = ["PT", "E402", "PLW", "SIM", "E741", "PTH", "S", "B904", "E722", "T201",
     "RET", "ARG", "F405", "B028", "PGH001", "B018", "F403", "RUF015", "E731", "B007",
     "UP031", "F401", "B023", "F811"]

requirements/encryption.txt

@@ -1,3 +1,3 @@
 pymongo-auth-aws>=1.1.0,<2.0.0
 pymongocrypt>=1.13.0,<2.0.0
-certifi;os.name=='nt' or sys_platform=='darwin'
+certifi>=2022.5.18.1;os.name=='nt' or sys_platform=='darwin'

requirements/gssapi.txt

@@ -1,2 +1,2 @@
-pykerberos;os.name!='nt'
+pykerberos>=1.2.4;os.name!='nt'
 winkerberos>=0.5.0;os.name=='nt'

requirements/ocsp.txt

@@ -5,8 +5,8 @@
 # Fallback to certifi on Windows if we can't load CA certs from the system
 # store and just use certifi on macOS.
 # https://www.pyopenssl.org/en/stable/api/ssl.html#OpenSSL.SSL.Context.set_default_verify_paths
-certifi;os.name=='nt' or sys_platform=='darwin'
+certifi>=2022.5.18.1;os.name=='nt' or sys_platform=='darwin'
 pyopenssl>=17.2.0
-requests<3.0.0
+requests>2.23,<3.0.0
 cryptography>=2.5
 service_identity>=18.1.0

requirements/snappy.txt

@@ -1 +1 @@
-python-snappy
+python-snappy>=0.6.0