Merge branch 'edge' into tip_tracking_for_alternative_configurations

.github/actions/python/pypi-deploy/action.yaml

@@ -28,7 +28,7 @@ runs:
           fi
         fi
         status=0
-        QUIET=1 BUILD_NUMBER=${OT_BUILD} make -C ${{ inputs.project }} clean deploy twine_repository_url=${{ inputs.repository_url }} pypi_username=opentrons pypi_password=${{ inputs.password }} || status=$?
+        CI=1 QUIET=1 BUILD_NUMBER=${OT_BUILD} make -C ${{ inputs.project }} clean deploy twine_repository_url=${{ inputs.repository_url }} pypi_username=opentrons pypi_password=${{ inputs.password }} || status=$?
         if [[ ${status} != 0 ]] && [[ ${{ inputs.repository_url }} =~ "test.pypi.org" ]]; then
           echo "upload failures allowed to test pypi"
           exit 0

Dockerfile

@@ -1,14 +1,17 @@
 FROM ubuntu as base
 ENV TZ=Etc/UTC
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-RUN apt-get update && apt-get install --yes python3 pip pkg-config libsystemd-dev
+RUN apt-get update && apt-get install --yes python3 pip pkg-config libsystemd-dev git
 
 FROM base as builder
 COPY scripts scripts
 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 api/MANIFEST.in api/MANIFEST.in
 COPY api/setup.py api/setup.py
 COPY api/pypi-readme.rst api/pypi-readme.rst
@@ -18,6 +21,7 @@ COPY robot-server/setup.py robot-server/setup.py
 COPY robot-server/robot_server 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/
 

Makefile

@@ -53,9 +53,15 @@ usb_host=$(shell yarn run -s discovery find -i 169.254)
 .PHONY: setup
 setup: setup-js setup-py
 
+# Both the python and JS setup targets depend on a minimal python setup so they can create
+# virtual envs using pipenv.
+.PHONY: setup-py-toolchain
+setup-py-toolchain:
+	$(OT_PYTHON) -m pip install pipenv==2023.11.15
+
 # front-end dependecies handled by yarn
 .PHONY: setup-js
-setup-js:
+setup-js: setup-py-toolchain
 	yarn config set network-timeout 60000
 	yarn
 	$(MAKE) -C $(APP_SHELL_DIR) setup
@@ -64,8 +70,7 @@ setup-js:
 PYTHON_SETUP_TARGETS := $(addsuffix -py-setup, $(PYTHON_DIRS))
 
 .PHONY: setup-py
-setup-py:
-	$(OT_PYTHON) -m pip install pipenv==2023.11.15
+setup-py: setup-py-toolchain
 	$(MAKE) $(PYTHON_SETUP_TARGETS)
 
 

api/Makefile

@@ -199,8 +199,8 @@ emulator:
 	-$(python) -m opentrons.hardware_control.emulation.app
 
 .PHONY: deploy
-deploy: wheel
-	$(call python_upload_package,$(twine_auth_args),$(twine_repository_url),$(wheel_file))
+deploy: wheel sdist
+	$(call python_upload_package,$(twine_auth_args),$(twine_repository_url),$(wheel_file),$(sdist_file))
 
 # User must currently specify host, e.g.: `make term host=169.254.202.176`
 .PHONY: term

api/Pipfile

@@ -3,42 +3,48 @@ url = "https://pypi.python.org/simple"
 verify_ssl = true
 name = "pypi"
 
+[packages]
+jsonschema = "==4.17.3"
+pydantic = "==1.10.12"
+anyio = "==3.7.1"
+opentrons-shared-data = { editable = true, path = "../shared-data/python" }
+opentrons = { editable = true, path = "." }
+opentrons-hardware = { editable = true, path = "./../hardware", extras=["FLEX"] }
+numpy = "==1.22.3"
+
 [dev-packages]
 # atomicwrites and colorama are pytest dependencies on windows,
 # spec'd here to force lockfile inclusion
 # https://github.com/pypa/pipenv/issues/4408#issuecomment-668324177
 atomicwrites = { version = "==1.4.0", markers="sys_platform=='win32'" }
 colorama = { version = "==0.4.4", markers="sys_platform=='win32'" }
-coverage = "==5.1"
-mypy = "==0.981"
+coverage = "==7.4.1"
+mypy = "==1.8.0"
 numpydoc = "==0.9.1"
-pytest = "==7.0.1"
-pytest-asyncio = "~=0.16"
-pytest-cov = "==2.10.1"
+pytest = "==7.4.4"
+pytest-asyncio = "~=0.23.0"
+pytest-cov = "==4.1.0"
 pytest-lazy-fixture = "==0.6.3"
 pytest-xdist = "~=2.5.0"
 sphinx = "==5.0.1"
 twine = "==4.0.0"
 wheel = "==0.37.0"
-typeguard = "==2.13.1"
+typeguard = "==4.1.5"
 sphinx-substitution-extensions = "==2020.9.30.0"
 sphinxext-opengraph = "==0.8.1"
 sphinx-tabs = ">=3.4.1,<4"
-mock = "~=4.0.3"
-flake8 = "~=3.9.0"
-flake8-annotations = "~=2.6.2"
-flake8-docstrings = "~=1.6.0"
-flake8-noqa = "~=1.2.1"
-decoy = "~=1.11"
+mock = "==5.1.0"
+flake8 = "==7.0.0"
+flake8-annotations = "~=3.0.1"
+flake8-docstrings = "~=1.7.0"
+flake8-noqa = "~=1.4.0"
+decoy = "==2.1.1"
 black = "==22.3.0"
-types-mock = "==4.0.1"
+types-mock = "~=5.1.0"
 types-setuptools = "==57.0.2"
-opentrons-shared-data = { editable = true, path = "../shared-data/python" }
-opentrons = { editable = true, path = "." }
-opentrons-hardware = { editable = true, path = "./../hardware", extras=["FLEX"] }
 # specify typing-extensions explicitly to force lockfile inclusion on Python >= 3.8
 typing-extensions = ">=4.0.0,<5"
 pytest-profiling = "~=1.7.0"
 # TODO(mc, 2022-03-31): upgrade sphinx, remove this subdep pin
 jinja2 = ">=2.3,<3.1"
-hypothesis = ">=6.36,<7"
+hypothesis = "==6.96.1"