squashed commits

more squashed commits

Author: neo-jesse

.github/actions/python/cache-uv/action.yaml

@@ -0,0 +1,40 @@
+name: 'UV Python Setup'
+description: 'Set up the environment for a UV-managed Python project'
+inputs:
+  project:
+    description: 'Which project (by subdirectory) to set up'
+    required: true
+  python-version:
+    description: 'Python version to install via setup-uv'
+    required: false
+    default: '3.10'
+  install-system-deps:
+    description: 'Whether to install system dependencies (libsystemd-dev on Linux)'
+    required: false
+    default: 'true'
+runs:
+  using: 'composite'
+  steps:
+    - shell: bash
+      if: inputs.install-system-deps == 'true'
+      run: |
+        if [[ "${OSTYPE}" =~ "linux" ]]; then
+          # WORKAROUND: Remove microsoft debian repo due to https://github.com/microsoft/linux-package-repositories/issues/130. Remove line below after it is resolved
+          sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
+          sudo apt-get update
+          sudo apt-get install -y --no-install-recommends libsystemd-dev
+        fi
+    - shell: bash
+      run: npm install --global [email protected]
+    - name: Setup Python and UV
+      uses: astral-sh/setup-uv@v7
+      with:
+        python-version: ${{ inputs.python-version }}
+        enable-cache: true
+        cache-dependency-glob: |
+          ${{ inputs.project }}/pyproject.toml
+          ${{ inputs.project }}/uv.lock
+    - name: Setup Python Environment
+      id: setup-env
+      shell: bash
+      run: make -C ${{ inputs.project }} setup

.github/actions/python/setup-uv/action.yaml

@@ -4,25 +4,10 @@ inputs:
   project:
     description: 'Which project (by subdirectory) to set up'
     required: true
-  python-version:
-    description: "What Python version to use to create the project's virtual environment"
-    required: false
-    default: "false"
   install-system-deps:
     description: 'Whether to install system dependencies (libsystemd-dev on Linux)'
     required: false
     default: 'true'
-  install-dev-deps:
-    description: 'Whether to install dev optional dependencies (UV projects only: --extra dev)'
-    required: false
-    default: 'true'
-outputs:
-  start-time:
-    description: 'Start time of the setup process (Unix timestamp)'
-    value: ${{ steps.setup-env.outputs.start-time }}
-  duration:
-    description: 'Duration of the setup process in seconds'
-    value: ${{ steps.setup-env.outputs.duration }}
 runs:
   using: 'composite'
   steps:
@@ -40,70 +25,18 @@ runs:
     - name: Setup Python
       uses: actions/setup-python@v5
       with:
-        python-version: ${{ inputs.python-version != 'false' && inputs.python-version || '3.10' }}
-    - name: Check project type
-      id: project-type
-      shell: bash
-      run: |
-        # Only api and shared-data use UV for now
-        if [ "${{ inputs.project }}" == "api" ] || [ "${{ inputs.project }}" == "shared-data" ]; then
-          echo "type=uv" >> $GITHUB_OUTPUT
-        elif [ -f "${{ inputs.project }}/Pipfile" ]; then
-          echo "type=pipenv" >> $GITHUB_OUTPUT
-        else
-          echo "type=make" >> $GITHUB_OUTPUT
-        fi
-    - name: Install pipenv and virtualenv (original behavior - always installed)
-      if: steps.project-type.outputs.type != 'uv'
+        python-version: '3.10'
+    - name: Install pipenv and virtualenv
       shell: bash
       run: |
         python -m pip install --upgrade pip
         python -m pip install --user pipenv==2023.12.1
         python -m pip install --user virtualenv==20.30.0
-    - name: Install UV
-      if: steps.project-type.outputs.type == 'uv'
-      uses: astral-sh/setup-uv@v7
-    - name: Cache UV packages
-      if: steps.project-type.outputs.type == 'uv'
-      uses: ./.github/actions/python/cache-uv
-      with:
-        lockfile-path: ${{ inputs.project }}/uv.lock
     - name: Setup Python Environment
       id: setup-env
       shell: bash
       run: |
-        START_TIME=$(date +%s)
-        echo "start-time=$START_TIME" >> $GITHUB_OUTPUT
-        # Use the project type determined earlier
-        PROJECT_TYPE="${{ steps.project-type.outputs.type }}"
-        if [ "$PROJECT_TYPE" == "uv" ]; then
-          echo "::notice::Using UV for dependency management"
-          # Add dev extra if requested
-          DEV_EXTRA=""
-          if [ "${{ inputs.install-dev-deps }}" == "true" ]; then
-            DEV_EXTRA="--extra dev"
-          fi
-          if [ -f "${{ inputs.project }}/uv.lock" ]; then
-            # Use --frozen to ensure exact versions from lockfile
-            cd ${{ inputs.project }} && uv sync --frozen $DEV_EXTRA
-            # Verify dev dependencies are installed if dev extra was used
-            if [ -n "$DEV_EXTRA" ]; then
-              echo "::notice::Verifying dev dependencies are installed..."
-              uv pip list | grep -E "(sphinx|mypy|pytest|black)" || echo "::warning::Some dev dependencies may not be installed"
-            fi
-          else
-            cd ${{ inputs.project }} && uv sync $DEV_EXTRA
-            # Verify dev dependencies are installed if dev extra was used
-            if [ -n "$DEV_EXTRA" ]; then
-              echo "::notice::Verifying dev dependencies are installed..."
-              uv pip list | grep -E "(sphinx|mypy|pytest|black)" || echo "::warning::Some dev dependencies may not be installed"
-            fi
-          fi
-        else
-          # For pipenv or make projects, just call make setup
-          make -C ${{ inputs.project }} setup
-        fi
-        END_TIME=$(date +%s)
-        DURATION=$((END_TIME - START_TIME))
-        echo "duration=$DURATION" >> $GITHUB_OUTPUT
-        echo "::notice::Setup completed in ${DURATION} seconds"
+        # For pipenv projects, make setup runs "pipenv sync --dev" which always installs dev dependencies
+        # (see scripts/python.mk where pipenv_opts includes --dev)
+        make -C ${{ inputs.project }} setup
+        echo "::notice::Setup completed"

.github/actions/python/setup/action.yaml

@@ -58,13 +58,10 @@ jobs:
       - uses: 'actions/setup-node@v4'
         with:
           node-version: '22.12.0'
-      - uses: 'actions/setup-python@v4'
-        with:
-          python-version: '3.10'
-
-      - uses: './.github/actions/python/setup'
+      - uses: './.github/actions/python/setup-uv'
         with:
           project: 'api'
+          python-version: '3.10'
       - name: Lint with opentrons_hardware
         run: make -C api lint
   test:
@@ -95,25 +92,19 @@ jobs:
       - uses: 'actions/setup-node@v4'
         with:
           node-version: '22.12.0'
-      - uses: 'actions/setup-python@v4'
-        with:
-          python-version: ${{ matrix.python }}
       - name: 'set complex environment variables'
         uses: actions/github-script@v6
         with:
           script: |
             const { buildComplexEnvVars, } = require(`${process.env.GITHUB_WORKSPACE}/.github/workflows/utils.js`)
             buildComplexEnvVars(core, context)
-      - uses: './.github/actions/python/setup'
+      - uses: './.github/actions/python/setup-uv'
         with:
           project: 'api'
           python-version: ${{ matrix.python }}
-          install-dev-deps: 'true'
       - if: ${{ matrix.with-ot-hardware == 'false' }}
         name: Remove OT-3 hardware package
         run: make -C api setup-ot2
-        env:
-          OT_VIRTUALENV_VERSION: ${{ matrix.python }}
       - if: ${{ matrix.with-ot-hardware == 'false' }}
         name: Test without opentrons_hardware
         run: make -C api test-ot2
@@ -142,27 +133,12 @@ jobs:
         run: |
           git fetch -f origin ${{ github.ref }}:${{ github.ref }}
           git checkout ${{ github.ref }}
-      - name: Install UV
-        uses: astral-sh/setup-uv@v7
-      - uses: 'actions/setup-python@v4'
-        with:
-          python-version: '3.10'
-      - name: Cache UV packages
-        uses: ./.github/actions/python/cache-uv
-        with:
-          lockfile-path: package-testing/uv.lock
       - name: Set up package-testing
         id: setup
-        if: ${{ matrix.os != 'windows-2022' }}
-        working-directory: package-testing
-        shell: bash
-        run: make setup
-      - name: Set up package-testing (Windows)
-        id: setup-windows
-        if: ${{ matrix.os == 'windows-2022' }}
-        working-directory: package-testing
-        shell: pwsh
-        run: make setup-windows
+        uses: './.github/actions/python/setup-uv'
+        with:
+          project: 'package-testing'
+          python-version: '3.10'
       - name: Run the tests
         if: ${{ matrix.os != 'windows-2022' }}
         shell: bash
@@ -175,7 +151,7 @@ jobs:
         working-directory: package-testing
         run: make test-windows
       - name: Save the test results
-        if: ${{ always() && steps.setup.outcome == 'success' || steps.setup-windows.outcome == 'success' }}
+        if: ${{ always() && steps.setup.outcome == 'success' }}
         id: results
         uses: actions/upload-artifact@v4
         with:
@@ -209,19 +185,19 @@ jobs:
       - uses: 'actions/setup-node@v4'
         with:
           node-version: '22.12.0'
-      - uses: 'actions/setup-python@v4'
-        with:
-          python-version: '3.10'
       - name: 'set complex environment variables'
         uses: actions/github-script@v6
         with:
           script: |
             const { buildComplexEnvVars, } = require(`${process.env.GITHUB_WORKSPACE}/.github/workflows/utils.js`)
             buildComplexEnvVars(core, context)
-      - uses: './.github/actions/python/setup'
+      - uses: './.github/actions/python/setup-uv'
         with:
           project: 'api'
-          install-dev-deps: 'false'
+          python-version: '3.10'
+      - name: 'build api distributables'
+        shell: bash
+        run: make -C api sdist wheel
       # creds and repository configuration for deploying python wheels
       - if: ${{ !env.OT_TAG }}
         name: 'upload to test pypi'

.github/workflows/api-test-lint-deploy.yaml

@@ -83,10 +83,7 @@ jobs:
       - uses: 'actions/setup-node@v4'
         with:
           node-version: '22.12.0'
-      - uses: 'actions/setup-python@v3'
-        with:
-          python-version: '3.10'
-      - uses: './.github/actions/python/setup'
+      - uses: './.github/actions/python/setup-uv'
         with:
           project: 'api'
       - name: 'Build docs'

.github/workflows/docs-build.yaml

@@ -42,13 +42,9 @@ jobs:
       - uses: 'actions/setup-node@v4'
         with:
           node-version: '12'
-      - uses: 'actions/setup-python@v3'
-        with:
-          python-version: '3.10'
-      - uses: './.github/actions/python/setup'
+      - uses: './.github/actions/python/setup-uv'
         with:
           project: 'g-code-testing'
-
       - name: 'Verify no missing comparison files'
         run: make -C g-code-testing check-for-missing-comparison-files
 

.github/workflows/g-code-confirm-tests.yaml

@@ -60,10 +60,7 @@ jobs:
           script: |
             const { buildComplexEnvVars } = require(`${process.env.GITHUB_WORKSPACE}/.github/workflows/utils.js`)
             buildComplexEnvVars(core, context)
-      - uses: 'actions/setup-python@v4'
-        with:
-          python-version: '3.10'
-      - uses: './.github/actions/python/setup'
+      - uses: './.github/actions/python/setup-uv'
         with:
           project: 'g-code-testing'
       - name: 'cache yarn cache'

.github/workflows/g-code-testing-lint-test.yaml

@@ -52,13 +52,8 @@ jobs:
         with:
           node-version: '12'
 
-      - name: Setup Python
-        uses: 'actions/setup-python@v4'
-        with:
-          python-version: '3.10'
-
       - name: Setup Hardware Project
-        uses: './.github/actions/python/setup'
+        uses: './.github/actions/python/setup-uv'
         with:
           project: 'hardware'