diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 0000000000..39bbd2681d --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,4 @@ +{ + "image": "mcr.microsoft.com/devcontainers/universal:2", + "features": {} +} diff --git a/.github/workflows/pr-triage.yml b/.github/workflows/pr-triage.yml index 6557820f04..8842194683 100644 --- a/.github/workflows/pr-triage.yml +++ b/.github/workflows/pr-triage.yml @@ -34,7 +34,7 @@ jobs: - name: Run Triaging Script env: - GITHUB_TOKEN: ${{ secrets.ADK_TRIAGE_AGENT }} + GITHUB_TOKEN: ${{ secrets.ADK_TRIAGE_AGENT || github.token }} GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }} GOOGLE_GENAI_USE_VERTEXAI: 0 OWNER: 'google' diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml new file mode 100644 index 0000000000..e56abb6303 --- /dev/null +++ b/.github/workflows/python-package.yml @@ -0,0 +1,40 @@ +# This workflow will install Python dependencies, run tests and lint with a variety of Python versions +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python + +name: Python package + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + build: + + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: ["3.9", "3.10", "3.11"] + + steps: + - uses: actions/checkout@v4 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v3 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + python -m pip install flake8 pytest + if [ -f requirements.txt ]; then pip install -r requirements.txt; fi + - name: Lint with flake8 + run: | + # stop the build if there are Python syntax errors or undefined names + flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics + # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide + flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics + - name: Test with pytest + run: | + pytest diff --git a/.github/workflows/v2-sync.yml b/.github/workflows/v2-sync.yml index c627f40d46..7b2acb0a75 100644 --- a/.github/workflows/v2-sync.yml +++ b/.github/workflows/v2-sync.yml @@ -19,7 +19,7 @@ jobs: with: ref: v2 fetch-depth: 0 - token: ${{ secrets.RELEASE_PAT }} + token: ${{ secrets.RELEASE_PAT || github.token }} - name: Check for new commits on main id: check @@ -50,7 +50,7 @@ jobs: - name: Create sync PR if: steps.check.outputs.behind != '0' && steps.existing.outputs.exists == 'false' env: - GH_TOKEN: ${{ secrets.RELEASE_PAT }} + GH_TOKEN: ${{ secrets.RELEASE_PAT || github.token }} run: | gh pr create \ --base v2 \ diff --git a/tests/unittests/integrations/crewai/test_crewai_tool.py b/tests/unittests/integrations/crewai/test_crewai_tool.py index f7f9bfe0bd..9e6c4c29fd 100644 --- a/tests/unittests/integrations/crewai/test_crewai_tool.py +++ b/tests/unittests/integrations/crewai/test_crewai_tool.py @@ -16,9 +16,13 @@ import pytest -# Skip entire module if Python < 3.10 (must be before crewai_tool import) +# Skip entire module if crewai is not installed (must be before crewai_tool import). +# exc_type=ImportError is required because crewai_tool.py re-raises the +# ModuleNotFoundError as ImportError, which pytest 9.1+ does not catch by default. pytest.importorskip( - "google.adk.integrations.crewai.crewai_tool", reason="Requires Python 3.10+" + "google.adk.integrations.crewai.crewai_tool", + reason="Requires crewai package (pip install 'google-adk[extensions]')", + exc_type=ImportError, ) from google.adk.agents.context import Context