Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump python deps for 3.10 and robot system updates #13865

Merged
merged 60 commits into from
Jan 4, 2024
Merged

chore: bump python deps for 3.10 and robot system updates #13865

Show file tree
Hide file tree
Changes from 53 commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
fc709fe
chore(hardware): bump python-can for new OE
sfoster1 Oct 24, 2023
f85279d
fix(shared-data): properly exclude tests in sdist
sfoster1 Oct 27, 2023
2617343
bump pytest in server utils
caila-marashaj Oct 27, 2023
ae72dfa
bump pytest-asyncio
caila-marashaj Oct 27, 2023
5b12e03
rest of updates from api Pipfile
caila-marashaj Oct 31, 2023
d52da42
hardware Pipfile update
caila-marashaj Oct 31, 2023
9ce515d
shared-data/python updates
caila-marashaj Oct 31, 2023
7abc8c4
server-utils changes
caila-marashaj Oct 31, 2023
d0873c1
g code testing updates
caila-marashaj Oct 31, 2023
4bac0da
update server and Pipfile updates
caila-marashaj Nov 1, 2023
7bdb66b
sysytem server & top level Pipfile updates
caila-marashaj Nov 2, 2023
55a69ae
{hardware testing update
caila-marashaj Nov 2, 2023
9863b6f
app testing updates
caila-marashaj Nov 2, 2023
36dfd4e
notify server updates
caila-marashaj Nov 2, 2023
85b9bc5
fixed quote in update server Pipfile
caila-marashaj Nov 2, 2023
38fd3ae
take out pasted commit msg
caila-marashaj Nov 2, 2023
476ca7d
handle breaking changes from 3.7 to 3.10 (#14050)
ryanthecoder Nov 28, 2023
c52e559
update all the pipfiles
sfoster1 Dec 6, 2023
a231b7c
increment pipenv
sfoster1 Dec 6, 2023
44fb1b8
increment mypy and thus pydantic
sfoster1 Dec 7, 2023
bc89b9e
api typing fixups after updates
sfoster1 Dec 7, 2023
d3db24c
bump the python version in all the workflows
sfoster1 Dec 7, 2023
22ba840
de-default sensor bindings
sfoster1 Dec 19, 2023
1af3e92
hardware typing/lint updates
sfoster1 Dec 19, 2023
03376ab
hardware fixes found by typing/lint updates
sfoster1 Dec 19, 2023
a68df58
hardware fixes from 3.10
sfoster1 Dec 19, 2023
219d461
notify-server type updates
sfoster1 Dec 19, 2023
e8eb7ff
shared-data type updates
sfoster1 Dec 19, 2023
54aa90d
update-server deps updates
sfoster1 Dec 19, 2023
35a1008
update-server typing fixes
sfoster1 Dec 19, 2023
c9bf389
update-server fixes from new typing
sfoster1 Dec 19, 2023
a8c4a4c
same pipenv in action as make
sfoster1 Dec 19, 2023
cab7ac6
no more keep-outdated
sfoster1 Dec 19, 2023
a39381a
update h-t pipfile
sfoster1 Dec 19, 2023
7f29911
h-t fxies from typing
sfoster1 Dec 19, 2023
29f423c
h-t needs flex extras
sfoster1 Dec 19, 2023
f350cb3
r-s deps
sfoster1 Dec 19, 2023
2209d45
r-s typechecking updates
sfoster1 Dec 19, 2023
01000de
tavern updates first pass
sfoster1 Dec 19, 2023
fb4049f
more tavern updates
sfoster1 Dec 20, 2023
c1cd530
fix the rest of the pydantic issues
sfoster1 Dec 20, 2023
e00b56c
update decoy to get https://github.com/mcous/decoy/pull/201
sfoster1 Dec 20, 2023
d070d66
api tests no longer need 3.7, perhaps
sfoster1 Dec 20, 2023
06fdb8b
oops slight updates
sfoster1 Dec 20, 2023
86b2ba4
specify more labware details in test
sfoster1 Dec 20, 2023
76b2244
format robot-server tests
sfoster1 Dec 20, 2023
5693a8f
fix r-s tests after rebase
sfoster1 Dec 20, 2023
d994e7d
system-server fixups
sfoster1 Dec 20, 2023
a9eb1a7
fix up server-utils typing
sfoster1 Dec 20, 2023
47685e4
s-d typing fixups
sfoster1 Dec 20, 2023
35f7ea5
get tip presence impl
sfoster1 Dec 20, 2023
3c2563d
another moved noqa
sfoster1 Dec 20, 2023
4f79f6a
no more s-d tests on 3.7
sfoster1 Dec 20, 2023
d82f20d
just dont touch app-testing
sfoster1 Dec 20, 2023
a0e8544
back to more recent sphinx
sfoster1 Dec 21, 2023
640d04d
update setup py metadata
sfoster1 Jan 2, 2024
59ecbb6
Revert null/omitted test changes.
SyntaxColoring Jan 2, 2024
f9b09eb
Revert the new null/omitted workaround.
SyntaxColoring Jan 3, 2024
82c88e7
Fix the old null/omitted workaround.
SyntaxColoring Jan 3, 2024
5a41e94
Delete outdated comment.
SyntaxColoring Jan 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/python/setup/action.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ runs:
- shell: bash
run: |
npm install --global [email protected]
$OT_PYTHON -m pip install pipenv==2021.5.29
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

among other things! note that we'll need to downgrade this to v2023.10.13 if we want to a) keep 3.7 support and b) ensure that by having i guess separate pipfiles (we shouldn't do this, if we want to do something like that we should set up a tox environment just for the api stack)

$OT_PYTHON -m pip install pipenv==2023.11.15
- shell: bash
run: 'make -C ${{ inputs.project }} setup'
10 changes: 3 additions & 7 deletions .github/workflows/api-test-lint-deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
node-version: '16'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.7'
python-version: '3.10'

- uses: './.github/actions/python/setup'
with:
Expand All @@ -75,17 +75,13 @@ jobs:
os: ['windows-2022', 'ubuntu-22.04', 'macos-latest']
# TODO(mc, 2022-02-24): expand this matrix to 3.8 and 3.9,
# preferably in a nightly cronjob on edge or something
python: ['3.7', '3.10']
python: ['3.10']
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see above re: keeping 3.7 support and testing for it

with-ot-hardware: ['true', 'false']
exclude:
- os: 'windows-2022'
with-ot-hardware: 'true'
- os: 'macos-latest'
with-ot-hardware: 'true'
- os: 'macos-latest'
python: '3.10'
- python: '3.10'
with-ot-hardware: 'true'
runs-on: '${{ matrix.os }}'
steps:
- uses: 'actions/checkout@v3'
Expand Down Expand Up @@ -152,7 +148,7 @@ jobs:
node-version: '16'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.7'
python-version: '3.10'
- name: 'set complex environment variables'
uses: actions/github-script@v6
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs-build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
node-version: '16'
- uses: 'actions/setup-python@v3'
with:
python-version: '3.7'
python-version: '3.10'
- uses: './.github/actions/python/setup'
with:
project: 'api'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/g-code-confirm-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
node-version: '12'
- uses: 'actions/setup-python@v3'
with:
python-version: '3.7'
python-version: '3.10'
- uses: './.github/actions/python/setup'
with:
project: 'g-code-testing'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/g-code-testing-lint-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
buildComplexEnvVars(core, context)
- uses: 'actions/setup-python@v4'
with:
python-version: '3.7'
python-version: '3.10'
- uses: './.github/actions/python/setup'
with:
project: 'g-code-testing'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/hardware-lint-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
- name: Setup Python
uses: 'actions/setup-python@v4'
with:
python-version: '3.7'
python-version: '3.10'

- name: Setup Hardware Project
uses: './.github/actions/python/setup'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/hardware-testing-protocols.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
- name: Setup Python
uses: 'actions/setup-python@v4'
with:
python-version: '3.7'
python-version: '3.10'

- name: Setup Project
uses: './.github/actions/python/setup'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/hardware-testing.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
- name: Setup Python
uses: 'actions/setup-python@v4'
with:
python-version: '3.7'
python-version: '3.10'

- name: Setup Project
uses: './.github/actions/python/setup'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/http-docs-build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
git checkout ${{ github.ref }}
- uses: 'actions/setup-python@v3'
with:
python-version: '3.7'
python-version: '3.10'
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/notify-server-lint-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
node-version: '16'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.7'
python-version: '3.10'

- uses: './.github/actions/python/setup'
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/robot-server-lint-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
node-version: '16'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.7'
python-version: '3.10'

- uses: './.github/actions/python/setup'
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/server-utils-lint-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
node-version: '16'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.7'
python-version: '3.10'

- uses: './.github/actions/python/setup'
with:
Expand All @@ -70,7 +70,7 @@ jobs:
node-version: '16'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.7'
python-version: '3.10'
- uses: './.github/actions/python/setup'
with:
project: 'server-utils'
Expand Down
10 changes: 4 additions & 6 deletions .github/workflows/shared-data-test-lint-deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
node-version: '16'
- uses: 'actions/setup-python@v3'
with:
python-version: '3.7'
python-version: '3.10'

- uses: './.github/actions/python/setup'
with:
Expand All @@ -71,10 +71,8 @@ jobs:
os: ['windows-2022', 'ubuntu-22.04', 'macos-latest']
# TODO(mc, 2022-02-24): expand this matrix to 3.8 and 3.9,
# preferably in a nightly cronjob on edge or something
python: ['3.7', '3.10']
exclude:
- os: 'macos-latest'
python: '3.10'
python: ['3.10']
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see above re: python 3.7 support


runs-on: '${{ matrix.os }}'
steps:
- uses: 'actions/checkout@v3'
Expand Down Expand Up @@ -164,7 +162,7 @@ jobs:
run: sudo apt-get update && sudo apt-get install libudev-dev
- uses: 'actions/setup-python@v4'
with:
python-version: '3.7'
python-version: '3.10'
- uses: './.github/actions/python/setup'
with:
project: 'shared-data/python'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/system-server-lint-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
node-version: '16'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.7'
python-version: '3.10'

- uses: './.github/actions/python/setup'
with:
Expand All @@ -72,7 +72,7 @@ jobs:
node-version: '16'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.7'
python-version: '3.10'
- uses: './.github/actions/python/setup'
with:
project: 'system-server'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-server-lint-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
node-version: '16'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.7'
python-version: '3.10'

- uses: './.github/actions/python/setup'
with:
Expand All @@ -70,7 +70,7 @@ jobs:
node-version: '16'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.7'
python-version: '3.10'
- uses: './.github/actions/python/setup'
with:
project: 'update-server'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/usb-bridge-lint-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
node-version: '16'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.7'
python-version: '3.10'

- uses: './.github/actions/python/setup'
with:
Expand All @@ -70,7 +70,7 @@ jobs:
node-version: '16'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.7'
python-version: '3.10'
- uses: './.github/actions/python/setup'
with:
project: 'usb-bridge'
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ PYTHON_SETUP_TARGETS := $(addsuffix -py-setup, $(PYTHON_DIRS))

.PHONY: setup-py
setup-py:
$(OT_PYTHON) -m pip install pipenv==2021.5.29
$(OT_PYTHON) -m pip install pipenv==2023.11.15
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see above re: tested versions and pipenv versions

$(MAKE) $(PYTHON_SETUP_TARGETS)


Expand Down Expand Up @@ -266,4 +266,4 @@ test-js-internal:

.PHONY: test-js-%
test-js-%:
$(MAKE) test-js-internal tests="$(if $(tests),$(foreach test,$(tests),$*/$(test)),$*)" test_opts="$(test_opts)" cov_opts="$(cov_opts)"
$(MAKE) test-js-internal tests="$(if $(tests),$(foreach test,$(tests),$*/$(test)),$*)" test_opts="$(test_opts)" cov_opts="$(cov_opts)"
24 changes: 12 additions & 12 deletions api/Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,24 @@ name = "pypi"
# 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", sys_platform = "== 'win32'" }
colorama = { version = "==0.4.4", sys_platform = "== 'win32'" }
atomicwrites = { version = "==1.4.0", markers="sys_platform=='win32'" }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

one annoying subtle pipenv change was they altered how you spell markers in pipfiles

colorama = { version = "==0.4.4", markers="sys_platform=='win32'" }
coverage = "==5.1"
mypy = "==0.910"
mypy = "==0.981"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

needed for numpy support

numpydoc = "==0.9.1"
pytest = "==7.0.1"
pytest-asyncio = "~=0.18"
pytest-asyncio = "~=0.16"
pytest-cov = "==2.10.1"
pytest-lazy-fixture = "==0.6.3"
pytest-xdist = "~=2.2.1"
sphinx = "==5.0.1"
twine = "==4.0.2"
wheel = "==0.30.0"
typeguard = "==2.12.1"
pytest-xdist = "~=2.5.0"
sphinx = "==4.4.0"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ecormany did you bump sphinx recently? if so, i'll bump it again here

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We've been sitting at 5.0.1. Far from the latest, but gets the job done.

twine = "==4.0.0"
wheel = "==0.37.0"
typeguard = "==2.13.1"
sphinx-substitution-extensions = "==2020.9.30.0"
sphinxext-opengraph = "==0.8.1"
sphinx-tabs = ">=3.4.1,<4"
mock = "~=4.0.2"
sphinx-tabs = ">=3.4.0,<4"
mock = "~=4.0.3"
flake8 = "~=3.9.0"
flake8-annotations = "~=2.6.2"
flake8-docstrings = "~=1.6.0"
Expand All @@ -35,7 +35,7 @@ types-mock = "==4.0.1"
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"] }
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"
Expand Down
Loading
Loading