feat: add extra_pypi_dependencies (#120)

Author: lidavidm

adbc_drivers_dev/generate.py

@@ -130,7 +130,19 @@ class ValidationConfig(BaseModel):
             "description": """Additional dependencies to install for validation workflows. Specify as key-value pairs. Example:
 
 [validation.extra-dependencies]
-pytest = "^7.0"
+pytest = ">=7,<8"
+black = "*\""""
+        },
+    )
+
+    extra_pypi_dependencies: dict[str, typing.Any] = Field(
+        default_factory=dict,
+        alias="extra-pypi-dependencies",
+        json_schema_extra={
+            "description": """Additional dependencies to install for validation workflows. Specify as key-value pairs. Example:
+
+[validation.extra-pypi-dependencies]
+pytest = ">=7,<8"
 black = "*\""""
         },
     )
@@ -289,7 +301,10 @@ def to_dict(self) -> dict[str, typing.Any]:
             "permissions": self._permissions,
             "aws": self.aws.model_dump() if self.aws else None,
             "gcloud": self.gcloud,
-            "validation": {"extra_dependencies": self.validation.extra_dependencies},
+            "validation": {
+                "extra_dependencies": self.validation.extra_dependencies,
+                "extra_pypi_dependencies": self.validation.extra_pypi_dependencies,
+            },
         }
 
     def __eq__(self, other: object) -> bool:

adbc_drivers_dev/templates/pixi.toml

@@ -51,3 +51,6 @@ python = ">=3.13.5,<3.14"
 [pypi-dependencies]
 adbc-drivers-dev = { git = "https://github.com/adbc-drivers/dev" }
 adbc-drivers-validation = { git = "https://github.com/adbc-drivers/validation" }
+<% for key, value in validation["extra_pypi_dependencies"].items() %>
+<{key}> = "<{value}>"
+<% endfor %>

tests/test_workflow.py

@@ -35,6 +35,7 @@ def test_model_default() -> None:
     assert config.aws is None
     assert config.gcloud is False
     assert config.validation.extra_dependencies == {}
+    assert config.validation.extra_pypi_dependencies == {}
 
     assert config.to_dict() == {
         "driver": "(unknown)",
@@ -51,7 +52,10 @@ def test_model_default() -> None:
         "permissions": {},
         "aws": None,
         "gcloud": False,
-        "validation": {"extra_dependencies": {}},
+        "validation": {
+            "extra_dependencies": {},
+            "extra_pypi_dependencies": {},
+        },
     }
 
     assert config == GenerateConfig.model_validate({})
@@ -211,11 +215,19 @@ def test_validation_config_alias() -> None:
         {"validation": {"extra-dependencies": {"pytest": "^7.0", "black": "*"}}}
     )
     assert config.validation.extra_dependencies == {"pytest": "^7.0", "black": "*"}
+    assert config.validation.extra_pypi_dependencies == {}
 
     config = GenerateConfig.model_validate(
         {"validation": {"extra_dependencies": {"mypy": "^1.0"}}}
     )
     assert config.validation.extra_dependencies == {"mypy": "^1.0"}
+    assert config.validation.extra_pypi_dependencies == {}
+
+    config = GenerateConfig.model_validate(
+        {"validation": {"extra_pypi_dependencies": {"mypy": ">=1.0"}}}
+    )
+    assert config.validation.extra_dependencies == {}
+    assert config.validation.extra_pypi_dependencies == {"mypy": ">=1.0"}
 
 
 def test_params_aws_and_gcloud() -> None:
@@ -254,7 +266,10 @@ def test_default_model() -> None:
     assert config["lang"] == {}
     assert config["secrets"] == {}
     assert config["gcloud"] is False
-    assert config["validation"] == {"extra-dependencies": {}}
+    assert config["validation"] == {
+        "extra-dependencies": {},
+        "extra-pypi-dependencies": {},
+    }
 
     # Should not include None values (environment, aws)
     assert "environment" not in config