Merge branch 'chore_release-pd-8.5.0' into flex_liquid_class_cypress

Author: alexjoel42

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

@@ -30,6 +30,7 @@ concurrency:
 jobs:
   confirm-g-code:
     strategy:
+      fail-fast: false
       matrix:
         command: ['2-modules', 'swift-smoke', 'swift-turbo', 'omega', 'fast']
     name: 'Confirm G-Code (${{ matrix.command }})'
@@ -52,4 +53,13 @@ jobs:
         run: make -C g-code-testing check-for-missing-comparison-files
 
       - name: 'Run & Compare to comparison files'
-        run: make -C g-code-testing test-g-code-${{ matrix.command }}
+        id: run_tests
+        run: make -C g-code-testing test-g-code-${{ matrix.command }} test_opts="-s"
+
+      - name: 'Upload test results'
+        if: failure() && steps.run_tests.conclusion == 'failure'
+        uses: actions/upload-artifact@v4
+        with:
+          name: g-code-test-results-${{ matrix.command }}
+          path: g-code-testing/results
+          retention-days: 14

.github/workflows/pd-test-build-deploy.yaml

@@ -86,34 +86,24 @@ jobs:
           NODE_OPTIONS: '--max-old-space-size=5120'
           OT_PD_MIXPANEL_ID: ${{ secrets.OT_PD_MIXPANEL_ID }}
           OT_PD_MIXPANEL_DEV_ID: ${{ secrets.OT_PD_MIXPANEL_DEV_ID }}
-          # ToDo(kk:04/23/2025) need to setup sentry org account and project
-          # OT_PD_SENTRY_DSN: ${{ secrets.OT_PD_SENTRY_DNS }}
+          # OT_PD_SENTRY_DSN: ${{ secrets.OT_PD_SENTRY_DSN }}
           # OT_PD_SENTRY_DEV_DSN: ${{ secrets.OT_PD_SENTRY_DEV_DSN }}
         run: |
           make -C protocol-designer NODE_ENV=development
+      # - name: 'upload sourcemaps to Sentry'
+      #   uses: getsentry/action-release@v3
+      #   env:
+      #     SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+      #     SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
+      #     SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
+      #   with:
+      #     sourcemaps: protocol-designer/dist
       - name: 'upload github artifact'
         uses: actions/upload-artifact@v4
         with:
           name: 'pd-artifact'
           path: protocol-designer/dist
 
-  # ToDo(kk:04/23/2025) need to setup sentry org account and project
-  # upload-sourcemaps-pd:
-  #   timeout-minutes: 10
-  #   name: 'upload protocol designer source maps'
-  #   needs: ['build-pd']
-  #   runs-on: 'ubuntu-24.04'
-  #   if: github.event_name != 'pull_request'
-
-  #   uses: getsentry/action-release@v3
-  #   env:
-  #     SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-  #     SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
-  #     SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
-  #   with:
-  #     name: pd-artifact
-  #     sourcemaps: ./dist
-
   deploy-pd:
     timeout-minutes: 10
     name: 'deploy protocol designer'
@@ -148,3 +138,12 @@ jobs:
           # invalidate both sandbox.opentrons.com and www.sandbox.opentrons.com cloudfront caches
           aws cloudfront create-invalidation --distribution-id ${{ secrets.PD_CLOUDFRONT_SANDBOX_DISTRIBUTION_ID }} --paths "/*"
           aws cloudfront create-invalidation --distribution-id ${{ secrets.PD_CLOUDFRONT_SANDBOX_WWW_DISTRIBUTION_ID }} --paths "/*"
+      # - name: 'notify Sentry of prod deploy'
+      #   uses: getsentry/action-release@v3
+      #   env:
+      #     SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+      #     SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
+      #     SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
+      #   with:
+      #     version: ${{ steps.resolve-tag.outputs.tag }}
+      #     environment: production

.github/workflows/robot-server-lint-test.yaml

@@ -81,7 +81,7 @@ jobs:
         name: Test with opentrons_hardware
         run: make -C robot-server test-cov
       - name: Ensure assets build
-        run: make -C robot-server sdist wheel
+        run: make -C robot-server wheel
       - name: Upload coverage report
         uses: 'codecov/codecov-action@v3'
         with:

.github/workflows/shared-data-test-lint-deploy.yaml

@@ -58,9 +58,9 @@ jobs:
 
       - uses: './.github/actions/python/setup'
         with:
-          project: 'shared-data/python'
+          project: 'shared-data'
       - name: Lint
-        run: make -C shared-data/python lint
+        run: make -C shared-data lint-py
 
   python-test:
     name: 'shared-data package python ${{ matrix.python }} tests on ${{ matrix.os }}'
@@ -92,7 +92,7 @@ jobs:
           python-version: ${{ matrix.python }}
       - uses: './.github/actions/python/setup'
         with:
-          project: 'shared-data/python'
+          project: 'shared-data'
           python-version: ${{ matrix.python }}
       - name: 'set complex environment variables'
         uses: actions/github-script@v6
@@ -101,13 +101,13 @@ jobs:
             const { buildComplexEnvVars, } = require(`${process.env.GITHUB_WORKSPACE}/.github/workflows/utils.js`)
             buildComplexEnvVars(core, context)
       - name: Test
-        run: make -C shared-data/python test
+        run: make -C shared-data test-py
       - name: Ensure assets build
-        run: make -C shared-data/python sdist wheel
+        run: make -C shared-data dist-py
       - name: 'Upload coverage report'
         uses: codecov/codecov-action@v3
         with:
-          files: ./shared-data/python/coverage.xml
+          files: ./shared-data/coverage.xml
           flags: shared-data
 
   js-test:
@@ -174,7 +174,7 @@ jobs:
           python-version: '3.10'
       - uses: './.github/actions/python/setup'
         with:
-          project: 'shared-data/python'
+          project: 'shared-data'
       - name: 'set complex environment variables'
         uses: actions/github-script@v6
         with:
@@ -186,14 +186,14 @@ jobs:
         name: 'upload to test pypi'
         uses: './.github/actions/python/pypi-deploy'
         with:
-          project: 'shared-data/python'
+          project: 'shared-data'
           repository_url: 'https://test.pypi.org/legacy/'
           password: '${{ secrets.TEST_PYPI_DEPLOY_TOKEN_OPENTRONS_SHARED_DATA }}'
       - if: startsWith(env.OT_TAG, 'v')
         name: 'upload to pypi'
         uses: './.github/actions/python/pypi-deploy'
         with:
-          project: 'shared-data/python'
+          project: 'shared-data'
           repository_url: 'https://upload.pypi.org/legacy/'
           password: '${{ secrets.PYPI_DEPLOY_TOKEN_OPENTRONS_SHARED_DATA }}'
 

.gitignore

@@ -120,25 +120,6 @@ calibrations/
 *.sublime-project
 *.sublime-workspace
 
-# TODO(mc, 2020-10-30): remove this ignore when we need pyproject.toml
-# recent versions of setuptools create pyproject.toml automatically
-# we're ignoring the file for now to avoid confusion
-api/pyproject.toml
-robot-server/pyproject.toml
-update-server/pyproject.toml
-shared-data/python/pyproject.toml
-hardware/pyproject.toml
-
-# These are autogenerated by sdist generation for some reason and really
-# don't need to exist since they're just copies of the top level license
-# file
-api/LICENSE
-update-server/LICENSE
-shared-data/python/LICENSE
-shared-data/LICENSE
-robot-server/LICENSE
-performance-metrics/LICENSE
-
 # typescript incremental files
 *.tsbuildinfo
 

Config.in

@@ -2,7 +2,7 @@
 source "$BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH/api/Config.in"
 source "$BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH/update-server/Config.in"
 source "$BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH/robot-server/Config.in"
-source "$BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH/shared-data/python/Config.in"
+source "$BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH/shared-data/Config.in"
 source "$BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH/system-server/Config.in"
 source "$BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH/server-utils/Config.in"
 source "$BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH/hardware/Config.in"

Dockerfile

@@ -9,21 +9,16 @@ COPY LICENSE LICENSE
 
 COPY shared-data shared-data
 
-COPY server-utils/setup.py server-utils/setup.py
-COPY server-utils/server_utils server-utils/server_utils
+COPY server-utils server-utils
 
-COPY api/MANIFEST.in api/MANIFEST.in
-COPY api/setup.py api/setup.py
-COPY api/pypi-readme.rst api/pypi-readme.rst
-COPY api/src/opentrons api/src/opentrons
+COPY api api
 
-COPY robot-server/setup.py robot-server/setup.py
-COPY robot-server/robot_server robot-server/robot_server
+COPY robot-server robot-server
 
-RUN cd shared-data/python && python3 setup.py bdist_wheel -d /dist/
-RUN cd server-utils && python3 setup.py bdist_wheel -d /dist/
-RUN cd api && python3 setup.py bdist_wheel -d /dist/
-RUN cd robot-server && python3 setup.py bdist_wheel -d /dist/
+RUN cd shared-data && python3 -m build --outdir=/dist/ --wheel .
+RUN cd server-utils && python3 -m build --outdir=/dist/ --wheel .
+RUN cd api && python3 -m build --outdir=/dist/ --wheel .
+RUN cd robot-server && python3 -m build --outdir=/dist/ --wheel .
 
 FROM base
 COPY --from=builder /dist /dist

Makefile

@@ -25,7 +25,7 @@ HARDWARE_DIR := hardware
 USB_BRIDGE_DIR := usb-bridge
 NODE_USB_BRIDGE_CLIENT_DIR := usb-bridge/node-client
 
-PYTHON_DIRS := $(API_DIR) $(UPDATE_SERVER_DIR) $(ROBOT_SERVER_DIR) $(SERVER_UTILS_DIR) $(SHARED_DATA_DIR)/python $(G_CODE_TESTING_DIR) $(HARDWARE_DIR) $(USB_BRIDGE_DIR)
+PYTHON_DIRS := $(API_DIR) $(UPDATE_SERVER_DIR) $(ROBOT_SERVER_DIR) $(SERVER_UTILS_DIR) $(SHARED_DATA_DIR) $(G_CODE_TESTING_DIR) $(HARDWARE_DIR) $(USB_BRIDGE_DIR) $(SYSTEM_SERVER_DIR)
 
 # This may be set as an environment variable (and is by CI tasks that upload
 # to test pypi) to add a .dev extension to the python package versions. If
@@ -99,6 +99,10 @@ teardown-py: $(PYTHON_TEARDOWN_TARGETS)
 %-py-teardown: %-py-clean
 	$(MAKE) -C $* teardown
 
+# Specialize the %-py-teardown pattern rule above to account for the Makefile duopoly in shared-data.
+$(SHARED_DATA_DIR)-py-teardown: $(SHARED_DATA_DIR)-py-clean
+	$(MAKE) -C $(SHARED_DATA_DIR) teardown-py
+
 # clean all project output
 .PHONY: clean
 clean: clean-js clean-py
@@ -117,6 +121,10 @@ clean-py: $(PYTHON_CLEAN_TARGETS)
 %-py-clean:
 	$(MAKE) -C $* clean
 
+# Specialize the %-py-clean pattern rule above to account for the Makefile duopoly in shared-data.
+$(SHARED_DATA_DIR)-py-clean:
+	$(MAKE) -C $(SHARED_DATA_DIR) clean-py
+
 .PHONY: deploy-py
 deploy-py: export twine_repository_url = $(twine_repository_url)
 deploy-py: export pypi_username = $(pypi_username)

abr-testing/.gitignore

@@ -0,0 +1,6 @@
+*.py[cod]
+*.egg
+build
+htmlcov
+
+abr_testing/_version.py

abr-testing/Makefile

@@ -3,14 +3,8 @@ include ../scripts/python.mk
 
 SHX := npx shx
 
-ot_project := $(OPENTRONS_PROJECT)
-project_rs_default = $(if $(ot_project),$(ot_project),robot-stack)
-project_ir_default = $(if $(ot_project),$(ot_project),ot3)
-
 package_name = abr_testing
 package_version = $(call python_package_version,abr-testing,$(project_rs_default))
-wheel_file = dist/$(call python_get_wheelname,abr-testing,$(project_rs_default),$(package_name),$(BUILD_NUMBER))
-sdist_file = dist/$(call python_get_sdistname,abr-testing,$(project_rs_default),$(package_name))
 
 # Find the branch, sha, version that will be used to update the VERSION.json file
 version_file = $(call python_get_git_version,abr-testing,$(project_rs_default),abr-testing)
@@ -34,10 +28,10 @@ ot_sources := $(ot_py_sources)
 # Defined separately than the clean target so the wheel file doesn’t have to
 # depend on a PHONY target
 clean_cmd = $(SHX) rm -rf build dist .coverage coverage.xml '*.egg-info' '**/__pycache__' '**/*.pyc' '**/.mypy_cache'
-
+wheel_file = $(call python_get_wheelname,abr-testing,$(project_rs_default),abr_testing)
 
 .PHONY: all
-all: clean sdist wheel
+all: clean wheel
 
 .PHONY: setup
 setup:
@@ -53,38 +47,32 @@ clean:
 	$(clean_cmd)
 
 .PHONY: wheel
-wheel: export OPENTRONS_PROJECT=$(project_rs_default)
+wheel: export OPENTRONS_PROJECT=$(PROJECT)
+wheel: export HATCH_VCS_TUNABLE_TAG_PATTERN=$(call git_tag_regex_for_project,$(PROJECT))
+wheel: export HATCH_VCS_TUNABLE_RAW_OPTIONS=$(call hatch_raw_options_for_project,$(PROJECT))
 wheel:
 	rm -rf dist/*.whl
-	$(python) setup.py $(wheel_opts) bdist_wheel
-	$(SHX) rm -rf build
-	$(SHX) ls dist
-
-.PHONY: sdist
-sdist: export OPENTRONS_PROJECT=$(project_rs_default)
-sdist:
-	$(clean_cmd)
-	$(python) setup.py sdist
+	$(python) -m build --wheel .
 	$(SHX) rm -rf build
 	$(SHX) ls dist
 
 .PHONY: lint
 lint:
 	$(python) -m mypy abr_testing tests
-	$(python) -m black --check abr_testing tests setup.py
-	$(python) -m flake8 abr_testing tests setup.py
+	$(python) -m black --check abr_testing tests
+	$(python) -m flake8 abr_testing tests
 
 .PHONY: format
 format:
-	$(python) -m black abr_testing tests setup.py
+	$(python) -m black abr_testing tests
 
 .PHONY: test
 test:
 	@echo "No tests yet"
 
 .PHONY: push-no-restart-ot3
-push-no-restart-ot3: sdist Pipfile.lock
-	$(call push-python-sdist,$(host),$(ssh_key),$(ssh_opts),$(sdist_file),/opt/opentrons-robot-server,"abr_testing",,,$(version_file))
+push-no-restart-ot3: wheel Pipfile.lock
+	$(call push-python,$(host),$(ssh_key),$(ssh_opts),$(wheel_file),/opt/opentrons-robot-server/)
 
 .PHONY: push-ot3
 push-ot3: push-no-restart-ot3
@@ -98,4 +86,4 @@ PROTOCOL_DIR := abr_testing/protocols
 SIMULATION_TOOL := abr_testing/protocol_simulation/abr_sim_check.py
 EXTENSION := .py
 simulate:
-	$(python) $(SIMULATION_TOOL)
+	$(python) $(SIMULATION_TOOL)

abr-testing/Pipfile

@@ -11,7 +11,7 @@ types-httplib2 = "*"
 oauth2client = "==4.1.3"
 gspread = "==6.0.2"
 hardware-testing = {editable = true, path = "../hardware-testing"}
-opentrons-shared-data = {editable = true, path = "./../shared-data/python"}
+opentrons-shared-data = {editable = true, path = "./../shared-data"}
 opentrons-hardware = {editable = true, path = "./../hardware", extras=['FLEX']}
 opentrons = {editable = true, path = "./../api", extras=['flex-hardware']}
 slackclient = "*"
@@ -36,6 +36,7 @@ flake8-noqa = "~=1.2.1"
 requests = "==2.27.1"
 types-requests = "==2.25.6"
 google-api-python-client-stubs = "*"
+build = "~=1.2.0"
 
 [requires]
 python_version = "3.10"