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.

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

ci(api,shared-data): run test matrix on Python 3.7 thru 3.10 #9497

Merged
merged 6 commits into from
Feb 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions .github/workflows/api-test-lint-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,15 @@ jobs:
- name: Lint
run: make -C api lint
test:
name: 'opentrons package tests'
name: 'opentrons package tests on ${{ matrix.os }}, python ${{ matrix.python }}'
timeout-minutes: 30
needs: [lint]
strategy:
matrix:
os: ['windows-2019', 'ubuntu-18.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']
runs-on: '${{ matrix.os }}'
steps:
- uses: 'actions/checkout@v2'
Expand All @@ -66,7 +69,7 @@ jobs:
node-version: '14'
- uses: 'actions/setup-python@v2'
with:
python-version: '3.7'
python-version: ${{ matrix.python }}
- name: 'set complex environment variables'
uses: actions/[email protected]
with:
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/shared-data-test-lint-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,15 @@ jobs:
run: make -C shared-data/python lint

python-test:
name: 'shared-data package python tests'
name: 'shared-data package python ${{ matrix.python }} tests on ${{ matrix.os }}'
timeout-minutes: 20
needs: [python-lint]
strategy:
matrix:
os: ['windows-2019', 'ubuntu-18.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']
runs-on: '${{ matrix.os }}'
steps:
- uses: 'actions/checkout@v2'
Expand All @@ -63,7 +66,7 @@ jobs:
node-version: '14'
- uses: 'actions/setup-python@v2'
with:
python-version: '3.7'
python-version: ${{ matrix.python }}
- uses: './.github/actions/python/setup'
with:
project: 'shared-data/python'
Expand Down
7 changes: 3 additions & 4 deletions api/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,11 @@ url = "https://pypi.python.org/simple"
verify_ssl = true
name = "pypi"

[requires]
python_version = "3.7"

[dev-packages]
coverage = "==5.1"
mypy = "==0.910"
numpydoc = "==0.9.1"
pytest = "==6.1.0"
pytest = "==7.0.1"
pytest-aiohttp = "==0.3.0"
pytest-cov = "==2.10.1"
pytest-lazy-fixture = "==0.6.3"
Expand All @@ -37,3 +34,5 @@ types-setuptools = "==57.0.2"
opentrons-shared-data = {editable = true, path = "../shared-data/python"}
opentrons = {editable = true, path = "."}
opentrons-hardware = {editable = true, path = "./../hardware"}
# specify typing-extensions explicitly to force lockfile inclusion on Python >= 3.8
typing-extensions = "==3.10.0.0"
171 changes: 67 additions & 104 deletions api/Pipfile.lock

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions api/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ def get_version():
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Topic :: Scientific/Engineering",
]
KEYWORDS = ["robots", "protocols", "synbio", "pcr", "automation", "lab"]
Expand All @@ -58,10 +61,6 @@ def get_version():
"aionotify==0.2.0",
"anyio==3.3.0",
"jsonschema==3.0.2",
# TODO(mc, 2021-09-28): this spec does not match the Pipfile, and is
# intentionally loose to avoid installation problems for end-users.
# This discrepency should be resolved:
# https://github.com/Opentrons/opentrons/issues/8416
"numpy>=1.15.1,<2",
"pydantic==1.8.2",
"pyserial==3.5",
Expand Down
7 changes: 3 additions & 4 deletions shared-data/python/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ url = "https://pypi.python.org/simple"
verify_ssl = true
name = "pypi"

[requires]
python_version = "3.7"

[dev-packages]
opentrons-shared-data = {editable = true, path = "."}
mypy = "==0.800"
Expand All @@ -15,10 +12,12 @@ flake8-docstrings = "~=1.6.0"
flake8-noqa = "~=1.1.0"
twine = "==2.0.0"
wheel = "==0.30.0"
pytest = "==6.1.0"
pytest = "==7.0.1"
pytest-cov = "==2.10.1"
pytest-xdist = "~=2.2.1 "
typeguard = "==2.7.1"
# specify typing-extensions explicitly to force lockfile inclusion on Python >= 3.8
typing-extensions = "==3.10.0.0"
# 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'"}
Expand Down
64 changes: 27 additions & 37 deletions shared-data/python/Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions shared-data/python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,9 @@ def get_version():
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Topic :: Scientific/Engineering",
]
KEYWORDS = ["robots", "protocols", "synbio", "pcr", "automation", "lab"]
Expand All @@ -113,6 +116,7 @@ def get_version():
PACKAGES = find_packages(where=".", exclude=["tests"])
INSTALL_REQUIRES = [
"jsonschema==3.0.2",
"typing-extensions==3.10.0.0",
]


Expand Down