chore: move dev extras to dependency-groups

.devcontainer/devcontainer.json

@@ -14,7 +14,7 @@
 	// "forwardPorts": [],
 
 	// Use 'postCreateCommand' to run commands after the container is created.
-	"postCreateCommand": "uv venv --clear && uv sync --extra test --extra gen_proto",
+	"postCreateCommand": "uv venv --clear && uv sync --group gen_proto",
 
 	// Configure tool-specific properties.
 	"customizations": {

.github/workflows/codegen-check.yml

@@ -22,8 +22,6 @@ jobs:
           runCmd: |
             # fetch submodule tags since actions/checkout does not
             git submodule foreach 'git fetch --unshallow || true'
-            # Ensure dependencies are installed
-            uv sync --extra test --extra gen_proto
             # Run all code generation steps
             make codegen
 

.github/workflows/test.yml

@@ -26,9 +26,6 @@ jobs:
         uses: astral-sh/setup-uv@v7
         with:
           python-version: ${{ matrix.python }}
-      - name: Install package and test dependencies
-        run: |
-          uv sync --frozen --extra test
       - name: Run tests
         run: |
-          uv run pytest
+          uv run --frozen pytest

CONTRIBUTING.md

@@ -33,8 +33,7 @@ make codegen
 Run the upgrade script to upgrade the submodule and regenerate the protobuf stubs.
 
 ```
-uv sync --extra gen_proto
-uv run ./update_proto.sh <version>
+uv run --group gen_proto ./update_proto.sh <version>
 ```
 
 Or run the proto codegen without updating the Substrait Git submodule:
@@ -71,6 +70,5 @@ make format
 # Test
 Run tests in the project's root dir.
 ```
-uv sync --extra test
 uv run pytest
 ```

Makefile

@@ -13,10 +13,10 @@ codegen-version:
 		&& echo '"' >> src/substrait/gen/version.py
 
 codegen-proto:
-	./gen_proto.sh
+	uv run --group gen_proto ./gen_proto.sh
 
 codegen-extensions:
-	uv run --with datamodel-code-generator datamodel-codegen \
+	uv run --group gen_extensions datamodel-codegen \
 		--input-file-type jsonschema \
 		--input third_party/substrait/text/simple_extensions_schema.yaml \
 		--output src/substrait/gen/json/simple_extensions.py \

pyproject.toml

@@ -4,7 +4,7 @@ description = "A python package for Substrait."
 authors = [{name = "Substrait contributors", email = "substrait@googlegroups.com"}]
 license = {text = "Apache-2.0"}
 readme = "README.md"
-requires-python = ">=3.10"
+requires-python = ">=3.10,<3.14"
 dependencies = ["protobuf >=3.19.1,<6"]
 dynamic = ["version"]
 
@@ -13,9 +13,12 @@ write_to = "src/substrait/_version.py"
 
 [project.optional-dependencies]
 extensions = ["antlr4-python3-runtime", "pyyaml"]
-gen_proto = ["protobuf >=3.19.1,<6", "protoletariat >= 3.0.0"]
 sql = ["sqloxide", "deepdiff"]
-test = ["pytest >= 7.0.0", "antlr4-python3-runtime", "pyyaml", "sqloxide", "deepdiff", "duckdb<=1.2.2", "datafusion"]
+
+[dependency-groups]
+dev = ["pytest >= 7.0.0", "antlr4-python3-runtime", "pyyaml", "sqloxide", "deepdiff", "duckdb<=1.2.2", "datafusion"]
+gen_proto = ["protobuf >=3.19.1,<6", "protoletariat >= 3.0.0"]
+gen_extensions = ["datamodel-code-generator"]
 
 [tool.pytest.ini_options]
 pythonpath = "src"