Added some linting and tooling update

Signed-off-by: Albert Callarisa <[email protected]>

Author: acroca

.flake8

@@ -28,14 +28,13 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install flake8 pytest pytest-cov pytest-asyncio
-        pip install -r requirements.txt
-    - name: Lint with flake8
+        pip install .[dev]
+    - name: Lint with ruff
       run: |
-        flake8 . --count --show-source --statistics --exit-zero
+        ruff check
     - name: Pytest unit tests
       run: |
-        pytest -m "not e2e" --verbose
+        tox -e py${{ matrix.python-version }}
     # Sidecar for running e2e tests requires Go SDK
     - name: Install Go SDK
       uses: actions/setup-go@v5
@@ -47,6 +46,7 @@ jobs:
         go install github.com/dapr/durabletask-go@main
         durabletask-go --port 4001 &
         pytest -m "e2e" --verbose
+        tox -e py${{ matrix.python-version }} -- e2e
   publish:
     needs: build
     if: startswith(github.ref, 'refs/tags/v')
@@ -70,4 +70,4 @@ jobs:
           TWINE_PASSWORD: ${{ secrets.PYPI_UPLOAD_PASS }}
         run: |
           python -m build
-          twine upload dist/*
+          twine upload dist/*

.github/workflows/pr-validation.yml

@@ -14,7 +14,7 @@ gen-proto:
 	curl -o durabletask/internal/orchestrator_service.proto https://raw.githubusercontent.com/dapr/durabletask-protobuf/refs/heads/main/protos/orchestrator_service.proto
 	curl -H "Accept: application/vnd.github.v3+json" "https://api.github.com/repos/dapr/durabletask-protobuf/commits?path=protos/orchestrator_service.proto&sha=main&per_page=1" | jq -r '.[0].sha' > durabletask/internal/PROTO_SOURCE_COMMIT_HASH
 	# NOTE: remember to check/update pyproject.toml protobuf version to follow https://github.com/grpc/grpc/blob/v{{VERSION GRPC IO TOOL BELLOW}}/tools/distrib/python/grpcio_tools/setup.py
-	pip install grpcio-tools==1.74.0
+	pip install .[dev]
 	python3 -m grpc_tools.protoc --proto_path=.  --python_out=. --pyi_out=. --grpc_python_out=. ./durabletask/internal/orchestrator_service.proto
 	rm durabletask/internal/*.proto
 

Makefile

@@ -162,33 +162,45 @@ The following is more information about how to develop this project. Note that d
 ### Generating protobufs
 
 ```sh
-pip3 install -r dev-requirements.txt
 make gen-proto
 ```
 
 This will download the `orchestrator_service.proto` from the `microsoft/durabletask-protobuf` repo and compile it using `grpcio-tools`. The version of the source proto file that was downloaded can be found in the file `durabletask/internal/PROTO_SOURCE_COMMIT_HASH`.
 
 ### Running unit tests
 
-Unit tests can be run using the following command from the project root. Unit tests _don't_ require a sidecar process to be running.
+Unit tests can be run using the following command from the project root.
+Unit tests _don't_ require a sidecar process to be running.
+
+To run on a specific python version (eg: 3.11), run the following command from the project root:
 
 ```sh
-make test-unit
+tox -e py311
 ```
 
 ### Running E2E tests
 
-The E2E (end-to-end) tests require a sidecar process to be running. You can use the Dapr sidecar for this or run a Durable Task test sidecar using the following command:
+The E2E (end-to-end) tests require a sidecar process to be running.
+
+For non-multi app activities test you can use the Durable Task test sidecar using the following command:
 
 ```sh
 go install github.com/dapr/durabletask-go@main
 durabletask-go --port 4001
 ```
 
-To run the E2E tests, run the following command from the project root:
+Certain aspects like multi-app activities require the full dapr runtime to be running.
+
+```shell
+dapr init || true
+
+dapr run --app-id test-app --dapr-grpc-port  4001 --components-path ./examples/components/
+```
+
+To run the E2E tests on a specific python version (eg: 3.11), run the following command from the project root:
 
 ```sh
-make test-e2e
+tox -e py311 -- e2e
 ```
 
 ## Contributing
@@ -207,8 +219,8 @@ contact [[email protected]](mailto:[email protected]) with any additio
 
 ## Trademarks
 
-This project may contain trademarks or logos for projects, products, or services. Authorized use of Microsoft 
-trademarks or logos is subject to and must follow 
+This project may contain trademarks or logos for projects, products, or services. Authorized use of Microsoft
+trademarks or logos is subject to and must follow
 [Microsoft's Trademark & Brand Guidelines](https://www.microsoft.com/en-us/legal/intellectualproperty/trademarks/usage/general).
 Use of Microsoft trademarks or logos in modified versions of this project must not cause confusion or imply Microsoft sponsorship.
 Any use of third-party trademarks or logos are subject to those third-party's policies.

README.md

@@ -17,16 +17,16 @@ keywords = [
     "workflow"
 ]
 classifiers = [
-  "Development Status :: 3 - Alpha",
-  "Programming Language :: Python :: 3",
-  "License :: OSI Approved :: MIT License",
+    "Development Status :: 3 - Alpha",
+    "Programming Language :: Python :: 3",
+    "License :: OSI Approved :: MIT License",
 ]
 requires-python = ">=3.9"
 license = {file = "LICENSE"}
 readme = "README.md"
 dependencies = [
     "grpcio",
-    "protobuf>=6.31.1,<7.0.0", # follows grpcio generation version https://github.com/grpc/grpc/blob/v1.74.0/tools/distrib/python/grpcio_tools/setup.py
+    "protobuf>=6.31.1,<7.0.0", # follows grpcio generation version https://github.com/grpc/grpc/blob/v1.75.1/tools/distrib/python/grpcio_tools/setup.py
     "asyncio"
 ]
 
@@ -48,3 +48,37 @@ pythonpath = ["."]
 markers = [
     "e2e: mark a test as an end-to-end test that requires a running sidecar"
 ]
+
+[project.optional-dependencies]
+dev = [
+    "pytest",
+    "pytest-asyncio>=0.23",
+    "tox>=4.0.0",
+    "pytest-cov",
+    "ruff",
+
+    # grpc gen
+    "grpcio-tools==1.75.1",
+]
+
+[tool.ruff]
+target-version = "py310" # TODO: update to py310 when we drop support for py39
+line-length = 100
+extend-exclude = [".github", "durabletask/internal/orchestrator_service_*.*"]
+
+[tool.ruff.lint]
+select = [
+    "I",  # isort
+    "W",  # pycodestyle warnings
+    "F",  # pyflakes
+
+    # TODO: Add those back progressively as we fix the issues
+    # "E",  # pycodestyle errors
+    # "C",  # flake8-comprehensions
+    # "B",  # flake8-bugbear
+    # "UP",  # pyupgrade
+]
+
+[tool.ruff.format]
+# follow upstream quote-style instead of dapr/python-sdk to reduce diff
+quote-style = "double"

pyproject.toml

@@ -1,8 +1 @@
-autopep8
-grpcio>=1.60.0 # 1.60.0 is the version introducing protobuf 1.25.X support, newer versions are backwards compatible
-protobuf
-asyncio
-pytest
-pytest-cov
-pytest-asyncio
-flake8
+# requirements in pyproject.toml

requirements.txt

@@ -0,0 +1,34 @@
+[tox]
+skipsdist = True
+minversion = 3.10.0
+envlist =
+    py{39,310,311,312,313,314}
+    ruff,
+    mypy,
+# TODO: switch runner to uv (tox-uv plugin)
+runner = virtualenv
+
+[testenv]
+# you can run tox with the e2e pytest marker using tox factors:
+#   tox -e py39,py310,py311,py312,py313,py314 -- e2e
+# or single one with:
+#   tox -e py310-e2e
+# to use custom grpc endpoint and not capture print statements (-s arg in pytest):
+#   DAPR_GRPC_ENDPOINT=localhost:12345 tox -e py310-e2e -- -s
+setenv =
+    PYTHONDONTWRITEBYTECODE=1
+deps = .[dev]
+commands =
+    !e2e: pytest {posargs} -m "not e2e" --verbose
+    e2e: pytest {posargs} -m e2e --verbose
+commands_pre =
+    pip3 install -e {toxinidir}/
+allowlist_externals = pip3
+pass_env = DAPR_GRPC_ENDPOINT,DAPR_HTTP_ENDPOINT,DAPR_RUNTIME_HOST,DAPR_GRPC_PORT,DAPR_HTTP_PORT
+
+[testenv:ruff]
+basepython = python3
+usedevelop = False
+commands =
+    ruff check --fix
+    ruff format