From 2d94974feea47748a853a778e92c30ffbdcf10fe Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Tue, 20 Jul 2021 16:17:59 -0400 Subject: [PATCH 01/26] Add opentrons recipes --- recipes/opentrons/meta.yaml | 51 +++++++++++++++++++++++++ recipes/opentrons_shared_data/meta.yaml | 42 ++++++++++++++++++++ 2 files changed, 93 insertions(+) create mode 100644 recipes/opentrons/meta.yaml create mode 100644 recipes/opentrons_shared_data/meta.yaml diff --git a/recipes/opentrons/meta.yaml b/recipes/opentrons/meta.yaml new file mode 100644 index 0000000000000..45ac5de0fb482 --- /dev/null +++ b/recipes/opentrons/meta.yaml @@ -0,0 +1,51 @@ +{% set name = "opentrons" %} +{% set version = "4.4.0" %} + +package: + name: {{ name|lower }} + version: {{ version }} + +source: + url: https://github.com/{{ name|capitalize }}/{{ name }}/archive/refs/tags/v{{ version }}.tar.gz + sha256: 6dd85756b1c99050926abf6d518fc8179a367a8a0c53d67d170c87312419cf3f + +build: + number: 0 + noarch: python + entry_points: + - opentrons_simulate = opentrons.simulate:main + - opentrons_execute = opentrons.execute:main + script: cd api/ && {{ PYTHON }} -m pip install . -vv + +requirements: + host: + - python >=3.6 + - pip + run: + - python >=3.6 + - pyserial ==3.5 + - numpy >=1.15.1 + - jsonschema >=3.0.2,<4 + - aionotify ==0.2.0 + - opentrons_shared_data =={{ version }} + - typing-extensions >=3.7.4.3 + - pydantic==1.4 + +test: + imports: + - opentrons + commands: + - pip check + requires: + - pip + +about: + home: https://www.opentrons.com/ot-2 + license: Apache-2.0 + license_file: LICENSE + dev_url: https://github.com/Opentrons/opentrons + doc_url: https://docs.opentrons.com + +extra: + recipe-maintainers: + - mrakitin diff --git a/recipes/opentrons_shared_data/meta.yaml b/recipes/opentrons_shared_data/meta.yaml new file mode 100644 index 0000000000000..00944a8f06cdf --- /dev/null +++ b/recipes/opentrons_shared_data/meta.yaml @@ -0,0 +1,42 @@ +{% set name = "opentrons_shared_data" %} +{% set version = "4.4.0" %} + +package: + name: {{ name|lower }} + version: {{ version }} + +source: + url: https://github.com/{{ name|capitalize }}/{{ name }}/archive/refs/tags/v{{ version }}.tar.gz + sha256: 6dd85756b1c99050926abf6d518fc8179a367a8a0c53d67d170c87312419cf3f + +build: + number: 0 + noarch: python + script: cd shared-data/python && {{ PYTHON }} -m pip install . -vv + +requirements: + host: + - python >=3.6 + - pip + run: + - python >=3.6 + - jsonschema >=3.0.2,<4 + +test: + imports: + - opentrons_shared_data + commands: + - pip check + requires: + - pip + +about: + home: https://www.opentrons.com/ot-2 + license: Apache-2.0 + license_file: LICENSE + dev_url: https://github.com/Opentrons/opentrons + doc_url: https://docs.opentrons.com + +extra: + recipe-maintainers: + - mrakitin From d1e21c3366bd160e92ba65365f0a06b644f5155e Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Tue, 20 Jul 2021 16:25:42 -0400 Subject: [PATCH 02/26] Add summary and update the URLs for opentrons --- recipes/opentrons/meta.yaml | 7 +++++-- recipes/opentrons_shared_data/meta.yaml | 5 +++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/recipes/opentrons/meta.yaml b/recipes/opentrons/meta.yaml index 45ac5de0fb482..f8dfd4cf7650a 100644 --- a/recipes/opentrons/meta.yaml +++ b/recipes/opentrons/meta.yaml @@ -40,10 +40,13 @@ test: - pip about: - home: https://www.opentrons.com/ot-2 + home: https://www.opentrons.com license: Apache-2.0 license_file: LICENSE - dev_url: https://github.com/Opentrons/opentrons + summary: | + The Opentrons API is a simple framework designed to make writing automated + biology lab protocols easy + dev_url: https://github.com/Opentrons/opentrons/tree/edge/api doc_url: https://docs.opentrons.com extra: diff --git a/recipes/opentrons_shared_data/meta.yaml b/recipes/opentrons_shared_data/meta.yaml index 00944a8f06cdf..a7006ac1f94cd 100644 --- a/recipes/opentrons_shared_data/meta.yaml +++ b/recipes/opentrons_shared_data/meta.yaml @@ -31,10 +31,11 @@ test: - pip about: - home: https://www.opentrons.com/ot-2 + home: https://www.opentrons.com license: Apache-2.0 license_file: LICENSE - dev_url: https://github.com/Opentrons/opentrons + summary: A bundle of data and python binding that supports the Opentrons API + dev_url: https://github.com/Opentrons/opentrons/tree/edge/shared-data doc_url: https://docs.opentrons.com extra: From 5114ba610e0551570f3aabca03a7c36d70911a44 Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Tue, 20 Jul 2021 16:26:57 -0400 Subject: [PATCH 03/26] Correct dependency formatting; sorted. --- recipes/opentrons/meta.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/opentrons/meta.yaml b/recipes/opentrons/meta.yaml index f8dfd4cf7650a..0165497ca6917 100644 --- a/recipes/opentrons/meta.yaml +++ b/recipes/opentrons/meta.yaml @@ -23,13 +23,13 @@ requirements: - pip run: - python >=3.6 - - pyserial ==3.5 - - numpy >=1.15.1 - - jsonschema >=3.0.2,<4 - aionotify ==0.2.0 + - jsonschema >=3.0.2,<4 + - numpy >=1.15.1 - opentrons_shared_data =={{ version }} + - pydantic ==1.4 + - pyserial ==3.5 - typing-extensions >=3.7.4.3 - - pydantic==1.4 test: imports: From 8bb6f53bbd4e43a6fb79eb7223d385da82b800f6 Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Tue, 20 Jul 2021 16:35:30 -0400 Subject: [PATCH 04/26] Do not parametrize the GH URL --- recipes/opentrons/meta.yaml | 2 +- recipes/opentrons_shared_data/meta.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/opentrons/meta.yaml b/recipes/opentrons/meta.yaml index 0165497ca6917..73a83b79b69e8 100644 --- a/recipes/opentrons/meta.yaml +++ b/recipes/opentrons/meta.yaml @@ -6,7 +6,7 @@ package: version: {{ version }} source: - url: https://github.com/{{ name|capitalize }}/{{ name }}/archive/refs/tags/v{{ version }}.tar.gz + url: https://github.com/Opentrons/opentrons/archive/refs/tags/v{{ version }}.tar.gz sha256: 6dd85756b1c99050926abf6d518fc8179a367a8a0c53d67d170c87312419cf3f build: diff --git a/recipes/opentrons_shared_data/meta.yaml b/recipes/opentrons_shared_data/meta.yaml index a7006ac1f94cd..1261b205f401f 100644 --- a/recipes/opentrons_shared_data/meta.yaml +++ b/recipes/opentrons_shared_data/meta.yaml @@ -6,7 +6,7 @@ package: version: {{ version }} source: - url: https://github.com/{{ name|capitalize }}/{{ name }}/archive/refs/tags/v{{ version }}.tar.gz + url: https://github.com/Opentrons/opentrons/archive/refs/tags/v{{ version }}.tar.gz sha256: 6dd85756b1c99050926abf6d518fc8179a367a8a0c53d67d170c87312419cf3f build: From fba49f3a2429c9e21c14cf4f4ff0f70096f80593 Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Wed, 21 Jul 2021 01:45:33 -0400 Subject: [PATCH 05/26] Use install commands from Dockerfile --- recipes/opentrons/meta.yaml | 5 ++++- recipes/opentrons_shared_data/meta.yaml | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/recipes/opentrons/meta.yaml b/recipes/opentrons/meta.yaml index 73a83b79b69e8..3b9b9ebc37a82 100644 --- a/recipes/opentrons/meta.yaml +++ b/recipes/opentrons/meta.yaml @@ -15,7 +15,10 @@ build: entry_points: - opentrons_simulate = opentrons.simulate:main - opentrons_execute = opentrons.execute:main - script: cd api/ && {{ PYTHON }} -m pip install . -vv + script: | + export PYTHONPATH=$PYTHONPATH:$PWD/scripts/ && \ + cd api/ && {{ PYTHON }} setup.py bdist_wheel && \ + {{ PYTHON }} -m pip install dist/{{ name }}-{{ version }}-*.whl requirements: host: diff --git a/recipes/opentrons_shared_data/meta.yaml b/recipes/opentrons_shared_data/meta.yaml index 1261b205f401f..5bfb28bd79462 100644 --- a/recipes/opentrons_shared_data/meta.yaml +++ b/recipes/opentrons_shared_data/meta.yaml @@ -12,7 +12,10 @@ source: build: number: 0 noarch: python - script: cd shared-data/python && {{ PYTHON }} -m pip install . -vv + script: | + export PYTHONPATH=$PYTHONPATH:$PWD/scripts/ && \ + cd shared-data/python && {{ PYTHON }} setup.py bdist_wheel && \ + {{ PYTHON }} -m pip install dist/{{ name }}-{{ version }}-*.whl requirements: host: From 72185fc8a85d37a9b0752dd65d627dfb15313bc9 Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Wed, 21 Jul 2021 02:09:57 -0400 Subject: [PATCH 06/26] Arch-dependent opentrons; update install command for Windows --- recipes/opentrons/meta.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes/opentrons/meta.yaml b/recipes/opentrons/meta.yaml index 3b9b9ebc37a82..0cc3ec2f02b3b 100644 --- a/recipes/opentrons/meta.yaml +++ b/recipes/opentrons/meta.yaml @@ -11,22 +11,22 @@ source: build: number: 0 - noarch: python entry_points: - opentrons_simulate = opentrons.simulate:main - opentrons_execute = opentrons.execute:main script: | export PYTHONPATH=$PYTHONPATH:$PWD/scripts/ && \ cd api/ && {{ PYTHON }} setup.py bdist_wheel && \ - {{ PYTHON }} -m pip install dist/{{ name }}-{{ version }}-*.whl + {{ PYTHON }} -m pip install dist/{{ name }}-{{ version }}-*.whl # [not win] + {{ PYTHON }} -m pip install dist\\{{ name }}-{{ version }}-*.whl # [win] requirements: host: - - python >=3.6 + - python - pip run: - - python >=3.6 - - aionotify ==0.2.0 + - python + - aionotify ==0.2.0 # [linux] - jsonschema >=3.0.2,<4 - numpy >=1.15.1 - opentrons_shared_data =={{ version }} From cd0dca01f299fee822ef5225eebbc9a6bff2c162 Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Wed, 21 Jul 2021 02:10:29 -0400 Subject: [PATCH 07/26] Update install command for opentrons_shared_data --- recipes/opentrons_shared_data/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/opentrons_shared_data/meta.yaml b/recipes/opentrons_shared_data/meta.yaml index 5bfb28bd79462..2183d18d52a7c 100644 --- a/recipes/opentrons_shared_data/meta.yaml +++ b/recipes/opentrons_shared_data/meta.yaml @@ -15,7 +15,8 @@ build: script: | export PYTHONPATH=$PYTHONPATH:$PWD/scripts/ && \ cd shared-data/python && {{ PYTHON }} setup.py bdist_wheel && \ - {{ PYTHON }} -m pip install dist/{{ name }}-{{ version }}-*.whl + {{ PYTHON }} -m pip install dist/{{ name }}-{{ version }}-*.whl # [not win] + {{ PYTHON }} -m pip install dist\\{{ name }}-{{ version }}-*.whl # [win] requirements: host: From 5992a5b52ee0622bd3f6fa220f0cdfe6069b7cf8 Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Wed, 21 Jul 2021 13:53:20 -0400 Subject: [PATCH 08/26] Extract building steps in relevant scripts --- recipes/opentrons/bld.bat | 5 +++++ recipes/opentrons/build.sh | 9 +++++++++ recipes/opentrons/meta.yaml | 6 +----- recipes/opentrons_shared_data/bld.bat | 5 +++++ recipes/opentrons_shared_data/build.sh | 9 +++++++++ recipes/opentrons_shared_data/meta.yaml | 9 ++------- 6 files changed, 31 insertions(+), 12 deletions(-) create mode 100644 recipes/opentrons/bld.bat create mode 100644 recipes/opentrons/build.sh create mode 100644 recipes/opentrons_shared_data/bld.bat create mode 100644 recipes/opentrons_shared_data/build.sh diff --git a/recipes/opentrons/bld.bat b/recipes/opentrons/bld.bat new file mode 100644 index 0000000000000..8ee7766a14825 --- /dev/null +++ b/recipes/opentrons/bld.bat @@ -0,0 +1,5 @@ +set PYTHONPATH=%PYTHONPATH%;%CD%\scripts +cd api\ +%PYTHON% setup.py bdist_wheel +%PYTHON% -m pip install dist\{{ name }}-{{ version }}-*.whl + diff --git a/recipes/opentrons/build.sh b/recipes/opentrons/build.sh new file mode 100644 index 0000000000000..2b38a24b77bdd --- /dev/null +++ b/recipes/opentrons/build.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +set -vxeuo pipefail + +export PYTHONPATH=$PYTHONPATH:$PWD/scripts/ +cd api/ +$PYTHON setup.py bdist_wheel +$PYTHON -m pip install dist/{{ name }}-{{ version }}-*.whl + diff --git a/recipes/opentrons/meta.yaml b/recipes/opentrons/meta.yaml index 0cc3ec2f02b3b..9593fc47df606 100644 --- a/recipes/opentrons/meta.yaml +++ b/recipes/opentrons/meta.yaml @@ -14,11 +14,7 @@ build: entry_points: - opentrons_simulate = opentrons.simulate:main - opentrons_execute = opentrons.execute:main - script: | - export PYTHONPATH=$PYTHONPATH:$PWD/scripts/ && \ - cd api/ && {{ PYTHON }} setup.py bdist_wheel && \ - {{ PYTHON }} -m pip install dist/{{ name }}-{{ version }}-*.whl # [not win] - {{ PYTHON }} -m pip install dist\\{{ name }}-{{ version }}-*.whl # [win] + skip: true # [py<37] requirements: host: diff --git a/recipes/opentrons_shared_data/bld.bat b/recipes/opentrons_shared_data/bld.bat new file mode 100644 index 0000000000000..5325c20d53b9e --- /dev/null +++ b/recipes/opentrons_shared_data/bld.bat @@ -0,0 +1,5 @@ +set PYTHONPATH=%PYTHONPATH%;%CD%\scripts +cd shared-data\python\ +%PYTHON% setup.py bdist_wheel +%PYTHON% -m pip install dist\{{ name }}-{{ version }}-*.whl + diff --git a/recipes/opentrons_shared_data/build.sh b/recipes/opentrons_shared_data/build.sh new file mode 100644 index 0000000000000..a46bc75755675 --- /dev/null +++ b/recipes/opentrons_shared_data/build.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +set -vxeuo pipefail + +export PYTHONPATH=$PYTHONPATH:$PWD/scripts/ +cd shared-data/python/ +$PYTHON setup.py bdist_wheel +$PYTHON -m pip install dist/{{ name }}-{{ version }}-*.whl + diff --git a/recipes/opentrons_shared_data/meta.yaml b/recipes/opentrons_shared_data/meta.yaml index 2183d18d52a7c..5473df4a4be23 100644 --- a/recipes/opentrons_shared_data/meta.yaml +++ b/recipes/opentrons_shared_data/meta.yaml @@ -12,18 +12,13 @@ source: build: number: 0 noarch: python - script: | - export PYTHONPATH=$PYTHONPATH:$PWD/scripts/ && \ - cd shared-data/python && {{ PYTHON }} setup.py bdist_wheel && \ - {{ PYTHON }} -m pip install dist/{{ name }}-{{ version }}-*.whl # [not win] - {{ PYTHON }} -m pip install dist\\{{ name }}-{{ version }}-*.whl # [win] requirements: host: - - python >=3.6 + - python >=3.7 - pip run: - - python >=3.6 + - python >=3.7 - jsonschema >=3.0.2,<4 test: From 94fb998bd9d7ee4313f59a98566d86bb12189044 Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Wed, 21 Jul 2021 14:06:27 -0400 Subject: [PATCH 09/26] Simplify PYTHONPATH env var --- recipes/opentrons/bld.bat | 2 +- recipes/opentrons/build.sh | 2 +- recipes/opentrons_shared_data/bld.bat | 2 +- recipes/opentrons_shared_data/build.sh | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/recipes/opentrons/bld.bat b/recipes/opentrons/bld.bat index 8ee7766a14825..e321ad71bd3c1 100644 --- a/recipes/opentrons/bld.bat +++ b/recipes/opentrons/bld.bat @@ -1,4 +1,4 @@ -set PYTHONPATH=%PYTHONPATH%;%CD%\scripts +set PYTHONPATH=%CD%\scripts cd api\ %PYTHON% setup.py bdist_wheel %PYTHON% -m pip install dist\{{ name }}-{{ version }}-*.whl diff --git a/recipes/opentrons/build.sh b/recipes/opentrons/build.sh index 2b38a24b77bdd..2b3876127ccf3 100644 --- a/recipes/opentrons/build.sh +++ b/recipes/opentrons/build.sh @@ -2,7 +2,7 @@ set -vxeuo pipefail -export PYTHONPATH=$PYTHONPATH:$PWD/scripts/ +export PYTHONPATH=$PWD/scripts/ cd api/ $PYTHON setup.py bdist_wheel $PYTHON -m pip install dist/{{ name }}-{{ version }}-*.whl diff --git a/recipes/opentrons_shared_data/bld.bat b/recipes/opentrons_shared_data/bld.bat index 5325c20d53b9e..5e6ff98775395 100644 --- a/recipes/opentrons_shared_data/bld.bat +++ b/recipes/opentrons_shared_data/bld.bat @@ -1,4 +1,4 @@ -set PYTHONPATH=%PYTHONPATH%;%CD%\scripts +set PYTHONPATH=%CD%\scripts cd shared-data\python\ %PYTHON% setup.py bdist_wheel %PYTHON% -m pip install dist\{{ name }}-{{ version }}-*.whl diff --git a/recipes/opentrons_shared_data/build.sh b/recipes/opentrons_shared_data/build.sh index a46bc75755675..6d409549b16a5 100644 --- a/recipes/opentrons_shared_data/build.sh +++ b/recipes/opentrons_shared_data/build.sh @@ -2,7 +2,8 @@ set -vxeuo pipefail -export PYTHONPATH=$PYTHONPATH:$PWD/scripts/ +export PYTHONPATH=$PWD/scripts/ + cd shared-data/python/ $PYTHON setup.py bdist_wheel $PYTHON -m pip install dist/{{ name }}-{{ version }}-*.whl From c68941970dfccd8847d41be48d5d23a9d4201f9b Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Wed, 21 Jul 2021 14:08:06 -0400 Subject: [PATCH 10/26] Debug info in bld.bat --- recipes/opentrons/bld.bat | 4 ++++ recipes/opentrons_shared_data/bld.bat | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/recipes/opentrons/bld.bat b/recipes/opentrons/bld.bat index e321ad71bd3c1..477a2a2519ee8 100644 --- a/recipes/opentrons/bld.bat +++ b/recipes/opentrons/bld.bat @@ -1,5 +1,9 @@ set PYTHONPATH=%CD%\scripts cd api\ %PYTHON% setup.py bdist_wheel + +dir +dir dist + %PYTHON% -m pip install dist\{{ name }}-{{ version }}-*.whl diff --git a/recipes/opentrons_shared_data/bld.bat b/recipes/opentrons_shared_data/bld.bat index 5e6ff98775395..f9e05cfd5b472 100644 --- a/recipes/opentrons_shared_data/bld.bat +++ b/recipes/opentrons_shared_data/bld.bat @@ -1,5 +1,9 @@ set PYTHONPATH=%CD%\scripts cd shared-data\python\ %PYTHON% setup.py bdist_wheel + +dir +dir dist + %PYTHON% -m pip install dist\{{ name }}-{{ version }}-*.whl From 1a805630c6e5f720959c47483bd53225969169fe Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Wed, 21 Jul 2021 14:56:10 -0400 Subject: [PATCH 11/26] Do not use jinja vars in build files --- recipes/opentrons/bld.bat | 2 +- recipes/opentrons/build.sh | 2 +- recipes/opentrons_shared_data/bld.bat | 2 +- recipes/opentrons_shared_data/build.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/opentrons/bld.bat b/recipes/opentrons/bld.bat index 477a2a2519ee8..9e83ce77557f6 100644 --- a/recipes/opentrons/bld.bat +++ b/recipes/opentrons/bld.bat @@ -5,5 +5,5 @@ cd api\ dir dir dist -%PYTHON% -m pip install dist\{{ name }}-{{ version }}-*.whl +%PYTHON% -m pip install dist\*.whl diff --git a/recipes/opentrons/build.sh b/recipes/opentrons/build.sh index 2b3876127ccf3..a94c8a8c6c655 100644 --- a/recipes/opentrons/build.sh +++ b/recipes/opentrons/build.sh @@ -5,5 +5,5 @@ set -vxeuo pipefail export PYTHONPATH=$PWD/scripts/ cd api/ $PYTHON setup.py bdist_wheel -$PYTHON -m pip install dist/{{ name }}-{{ version }}-*.whl +$PYTHON -m pip install dist/*.whl diff --git a/recipes/opentrons_shared_data/bld.bat b/recipes/opentrons_shared_data/bld.bat index f9e05cfd5b472..a6e61e126fe7e 100644 --- a/recipes/opentrons_shared_data/bld.bat +++ b/recipes/opentrons_shared_data/bld.bat @@ -5,5 +5,5 @@ cd shared-data\python\ dir dir dist -%PYTHON% -m pip install dist\{{ name }}-{{ version }}-*.whl +%PYTHON% -m pip install dist\*.whl diff --git a/recipes/opentrons_shared_data/build.sh b/recipes/opentrons_shared_data/build.sh index 6d409549b16a5..0f7f91ad1cda5 100644 --- a/recipes/opentrons_shared_data/build.sh +++ b/recipes/opentrons_shared_data/build.sh @@ -6,5 +6,5 @@ export PYTHONPATH=$PWD/scripts/ cd shared-data/python/ $PYTHON setup.py bdist_wheel -$PYTHON -m pip install dist/{{ name }}-{{ version }}-*.whl +$PYTHON -m pip install dist/*.whl From 2331cff03a73a30d70227b2487ece653f8105321 Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Thu, 22 Jul 2021 10:45:29 -0400 Subject: [PATCH 12/26] Try skipping py39 to see it if passes --- recipes/opentrons/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/opentrons/meta.yaml b/recipes/opentrons/meta.yaml index 9593fc47df606..4aabcd828d543 100644 --- a/recipes/opentrons/meta.yaml +++ b/recipes/opentrons/meta.yaml @@ -14,7 +14,7 @@ build: entry_points: - opentrons_simulate = opentrons.simulate:main - opentrons_execute = opentrons.execute:main - skip: true # [py<37] + skip: true # [py<37 or py>38] requirements: host: From 2f4640e991ae1c218085b88b7bc952a1b5749a5d Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Thu, 22 Jul 2021 10:49:11 -0400 Subject: [PATCH 13/26] Remove upper Python pin; comment-out typing-extensions dep --- recipes/opentrons/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/opentrons/meta.yaml b/recipes/opentrons/meta.yaml index 4aabcd828d543..024654ae37b8a 100644 --- a/recipes/opentrons/meta.yaml +++ b/recipes/opentrons/meta.yaml @@ -14,7 +14,7 @@ build: entry_points: - opentrons_simulate = opentrons.simulate:main - opentrons_execute = opentrons.execute:main - skip: true # [py<37 or py>38] + skip: true # [py<37] requirements: host: @@ -28,7 +28,7 @@ requirements: - opentrons_shared_data =={{ version }} - pydantic ==1.4 - pyserial ==3.5 - - typing-extensions >=3.7.4.3 + # - typing-extensions >=3.7.4.3 test: imports: From 4183713419183268abfc3e88ef71897073bf7f82 Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Thu, 22 Jul 2021 11:23:49 -0400 Subject: [PATCH 14/26] Slightly relax dependencies pins --- recipes/opentrons/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/opentrons/meta.yaml b/recipes/opentrons/meta.yaml index 024654ae37b8a..0863ae5f12a65 100644 --- a/recipes/opentrons/meta.yaml +++ b/recipes/opentrons/meta.yaml @@ -22,12 +22,12 @@ requirements: - pip run: - python - - aionotify ==0.2.0 # [linux] + - aionotify >=0.2.0 # [linux] - jsonschema >=3.0.2,<4 - numpy >=1.15.1 - opentrons_shared_data =={{ version }} - - pydantic ==1.4 - - pyserial ==3.5 + - pydantic >=1.4 + - pyserial >=3.5 # - typing-extensions >=3.7.4.3 test: From 2df9853d6954ffc46378b3dbb828ab74778f98ce Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Thu, 22 Jul 2021 23:49:50 -0400 Subject: [PATCH 15/26] Add a patch & fix pip-checked pin --- ...nore-missing-aionotify-more-properly.patch | 67 +++++++++++++++++++ recipes/opentrons/bld.bat | 2 +- recipes/opentrons/meta.yaml | 4 +- 3 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 recipes/opentrons/0001-FIX-ignore-missing-aionotify-more-properly.patch diff --git a/recipes/opentrons/0001-FIX-ignore-missing-aionotify-more-properly.patch b/recipes/opentrons/0001-FIX-ignore-missing-aionotify-more-properly.patch new file mode 100644 index 0000000000000..ec310e7803f26 --- /dev/null +++ b/recipes/opentrons/0001-FIX-ignore-missing-aionotify-more-properly.patch @@ -0,0 +1,67 @@ +From c6f69700d07f0f672eeefafa2713a57e9255bebd Mon Sep 17 00:00:00 2001 +From: Maksim Rakitin +Date: Thu, 22 Jul 2021 23:37:13 -0400 +Subject: [PATCH] FIX: ignore missing aionotify more properly + +--- + api/src/opentrons/hardware_control/controller.py | 2 +- + api/tests/opentrons/conftest.py | 2 +- + api/tests/opentrons/hardware_control/test_instruments.py | 2 +- + api/tests/opentrons/hardware_control/test_modules.py | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/api/src/opentrons/hardware_control/controller.py b/api/src/opentrons/hardware_control/controller.py +index a28bfa623..20b4aa1c6 100644 +--- a/api/src/opentrons/hardware_control/controller.py ++++ b/api/src/opentrons/hardware_control/controller.py +@@ -7,7 +7,7 @@ from typing import (Any, Dict, List, Optional, Tuple, + from typing_extensions import Final + try: + import aionotify # type: ignore +-except OSError: ++except (OSError, ModuleNotFoundError): + aionotify = None # type: ignore + + from opentrons.drivers.smoothie_drivers import driver_3_0 +diff --git a/api/tests/opentrons/conftest.py b/api/tests/opentrons/conftest.py +index fa1e0d2b3..a85c2ac08 100755 +--- a/api/tests/opentrons/conftest.py ++++ b/api/tests/opentrons/conftest.py +@@ -9,7 +9,7 @@ from opentrons.protocols.context.protocol_api.protocol_context import \ + + try: + import aionotify +-except OSError: ++except (OSError, ModuleNotFoundError): + aionotify = None # type: ignore + import asyncio + import os +diff --git a/api/tests/opentrons/hardware_control/test_instruments.py b/api/tests/opentrons/hardware_control/test_instruments.py +index 2e00e9841..cd358c3ed 100644 +--- a/api/tests/opentrons/hardware_control/test_instruments.py ++++ b/api/tests/opentrons/hardware_control/test_instruments.py +@@ -2,7 +2,7 @@ import asyncio + from unittest import mock + try: + import aionotify +-except OSError: ++except (OSError, ModuleNotFoundError): + aionotify = None # type: ignore + import pytest + import typeguard +diff --git a/api/tests/opentrons/hardware_control/test_modules.py b/api/tests/opentrons/hardware_control/test_modules.py +index 406f373ba..6591ef80d 100644 +--- a/api/tests/opentrons/hardware_control/test_modules.py ++++ b/api/tests/opentrons/hardware_control/test_modules.py +@@ -4,7 +4,7 @@ from unittest import mock + import pytest + try: + import aionotify +-except OSError: ++except (OSError, ModuleNotFoundError): + aionotify = None # type: ignore + from opentrons.hardware_control import ExecutionManager + from opentrons.hardware_control.modules import ModuleAtPort +-- +2.30.2 + diff --git a/recipes/opentrons/bld.bat b/recipes/opentrons/bld.bat index 9e83ce77557f6..40aa0aef1c081 100644 --- a/recipes/opentrons/bld.bat +++ b/recipes/opentrons/bld.bat @@ -5,5 +5,5 @@ cd api\ dir dir dist -%PYTHON% -m pip install dist\*.whl +%PYTHON% -m pip install dist/* diff --git a/recipes/opentrons/meta.yaml b/recipes/opentrons/meta.yaml index 0863ae5f12a65..8fb8a5fa49b00 100644 --- a/recipes/opentrons/meta.yaml +++ b/recipes/opentrons/meta.yaml @@ -8,6 +8,8 @@ package: source: url: https://github.com/Opentrons/opentrons/archive/refs/tags/v{{ version }}.tar.gz sha256: 6dd85756b1c99050926abf6d518fc8179a367a8a0c53d67d170c87312419cf3f + patches: + - 0001-FIX-ignore-missing-aionotify-more-properly.patch build: number: 0 @@ -26,7 +28,7 @@ requirements: - jsonschema >=3.0.2,<4 - numpy >=1.15.1 - opentrons_shared_data =={{ version }} - - pydantic >=1.4 + - pydantic ==1.4 - pyserial >=3.5 # - typing-extensions >=3.7.4.3 From 3365c830a85213268a72a105e00348eff12af821 Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Fri, 23 Jul 2021 00:08:12 -0400 Subject: [PATCH 16/26] Add typing-extensions to the run deps --- recipes/opentrons/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/opentrons/meta.yaml b/recipes/opentrons/meta.yaml index 8fb8a5fa49b00..8f9c27e83444b 100644 --- a/recipes/opentrons/meta.yaml +++ b/recipes/opentrons/meta.yaml @@ -30,7 +30,7 @@ requirements: - opentrons_shared_data =={{ version }} - pydantic ==1.4 - pyserial >=3.5 - # - typing-extensions >=3.7.4.3 + - typing-extensions >=3.7.4.3 test: imports: From e8e16203819bcf7c61bc1359abc3e4c9b41d2832 Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Fri, 23 Jul 2021 00:11:37 -0400 Subject: [PATCH 17/26] Run 'pip check' test command for Linux only The 'pip check' command executed only for Linux as it fails on check due to a missing 'aionotify' on other platforms. --- recipes/opentrons/meta.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/recipes/opentrons/meta.yaml b/recipes/opentrons/meta.yaml index 8f9c27e83444b..aae18f24320ea 100644 --- a/recipes/opentrons/meta.yaml +++ b/recipes/opentrons/meta.yaml @@ -35,8 +35,10 @@ requirements: test: imports: - opentrons - commands: - - pip check + # The 'pip check' command executed only for Linux as it fails on check due to + # a missing 'aionotify' on other platforms. + commands: # [linux] + - pip check # [linux] requires: - pip From 4a509247144922ae380a6a0613886efcfb2ea553 Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Fri, 23 Jul 2021 00:48:41 -0400 Subject: [PATCH 18/26] Remove pip-check & relax pedantic pin --- recipes/opentrons/meta.yaml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/recipes/opentrons/meta.yaml b/recipes/opentrons/meta.yaml index aae18f24320ea..64d943d6b1479 100644 --- a/recipes/opentrons/meta.yaml +++ b/recipes/opentrons/meta.yaml @@ -28,19 +28,13 @@ requirements: - jsonschema >=3.0.2,<4 - numpy >=1.15.1 - opentrons_shared_data =={{ version }} - - pydantic ==1.4 + - pydantic >=1.4 - pyserial >=3.5 - typing-extensions >=3.7.4.3 test: imports: - opentrons - # The 'pip check' command executed only for Linux as it fails on check due to - # a missing 'aionotify' on other platforms. - commands: # [linux] - - pip check # [linux] - requires: - - pip about: home: https://www.opentrons.com From 008e934141273ef32c7f96a06a8af307d54af077 Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Fri, 23 Jul 2021 01:21:59 -0400 Subject: [PATCH 19/26] More consistent bld.bat for Win builds --- recipes/opentrons_shared_data/bld.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/opentrons_shared_data/bld.bat b/recipes/opentrons_shared_data/bld.bat index a6e61e126fe7e..b2d5936e23106 100644 --- a/recipes/opentrons_shared_data/bld.bat +++ b/recipes/opentrons_shared_data/bld.bat @@ -5,5 +5,5 @@ cd shared-data\python\ dir dir dist -%PYTHON% -m pip install dist\*.whl +%PYTHON% -m pip install dist/* From 10143497d45572245b7654a06efd82c0da48a4ef Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Fri, 23 Jul 2021 01:39:11 -0400 Subject: [PATCH 20/26] Update pip install command for Win --- recipes/opentrons/bld.bat | 3 ++- recipes/opentrons_shared_data/bld.bat | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/recipes/opentrons/bld.bat b/recipes/opentrons/bld.bat index 40aa0aef1c081..a90cb15411fb4 100644 --- a/recipes/opentrons/bld.bat +++ b/recipes/opentrons/bld.bat @@ -4,6 +4,7 @@ cd api\ dir dir dist +dir dist\*.whl -%PYTHON% -m pip install dist/* +%PYTHON% -m pip install "%CD%\dist\*.whl" diff --git a/recipes/opentrons_shared_data/bld.bat b/recipes/opentrons_shared_data/bld.bat index b2d5936e23106..ba5ed7c67b6ae 100644 --- a/recipes/opentrons_shared_data/bld.bat +++ b/recipes/opentrons_shared_data/bld.bat @@ -4,6 +4,7 @@ cd shared-data\python\ dir dir dist +dir dist\*.whl -%PYTHON% -m pip install dist/* +%PYTHON% -m pip install "%CD%\dist\*.whl" From 9c5b7d6713aff0cc2e36de59a28dacafb965e78a Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Fri, 23 Jul 2021 02:29:17 -0400 Subject: [PATCH 21/26] Update bld.bat with tested instructions https://stackoverflow.com/a/56091878 --- recipes/opentrons/bld.bat | 5 +++-- recipes/opentrons_shared_data/bld.bat | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/recipes/opentrons/bld.bat b/recipes/opentrons/bld.bat index a90cb15411fb4..517291f33cd36 100644 --- a/recipes/opentrons/bld.bat +++ b/recipes/opentrons/bld.bat @@ -4,7 +4,8 @@ cd api\ dir dir dist -dir dist\*.whl -%PYTHON% -m pip install "%CD%\dist\*.whl" +for /f "tokens=* USEBACKQ" %%g in (`dir /b dist\*.whl`) do (set "whl=%%g") + +%PYTHON% -m pip install dist\%whl% -vv diff --git a/recipes/opentrons_shared_data/bld.bat b/recipes/opentrons_shared_data/bld.bat index ba5ed7c67b6ae..a1d9fec32ed16 100644 --- a/recipes/opentrons_shared_data/bld.bat +++ b/recipes/opentrons_shared_data/bld.bat @@ -4,7 +4,8 @@ cd shared-data\python\ dir dir dist -dir dist\*.whl -%PYTHON% -m pip install "%CD%\dist\*.whl" +for /f "tokens=* USEBACKQ" %%g in (`dir /b dist\*.whl`) do (set "whl=%%g") + +%PYTHON% -m pip install dist\%whl% -vv From fa9e1c6e95670a2585dd0d513f31b32ae5366028 Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Thu, 29 Jul 2021 00:33:56 -0400 Subject: [PATCH 22/26] Combine 2 opentrons recipes into one with outputs --- .../{bld.bat => install-opentrons.bat} | 0 .../{build.sh => install-opentrons.sh} | 0 .../install-shared-data.bat} | 0 .../install-shared-data.sh} | 0 recipes/opentrons/meta.yaml | 69 ++++++++++++------- recipes/opentrons_shared_data/meta.yaml | 42 ----------- 6 files changed, 46 insertions(+), 65 deletions(-) rename recipes/opentrons/{bld.bat => install-opentrons.bat} (100%) rename recipes/opentrons/{build.sh => install-opentrons.sh} (100%) rename recipes/{opentrons_shared_data/bld.bat => opentrons/install-shared-data.bat} (100%) rename recipes/{opentrons_shared_data/build.sh => opentrons/install-shared-data.sh} (100%) delete mode 100644 recipes/opentrons_shared_data/meta.yaml diff --git a/recipes/opentrons/bld.bat b/recipes/opentrons/install-opentrons.bat similarity index 100% rename from recipes/opentrons/bld.bat rename to recipes/opentrons/install-opentrons.bat diff --git a/recipes/opentrons/build.sh b/recipes/opentrons/install-opentrons.sh similarity index 100% rename from recipes/opentrons/build.sh rename to recipes/opentrons/install-opentrons.sh diff --git a/recipes/opentrons_shared_data/bld.bat b/recipes/opentrons/install-shared-data.bat similarity index 100% rename from recipes/opentrons_shared_data/bld.bat rename to recipes/opentrons/install-shared-data.bat diff --git a/recipes/opentrons_shared_data/build.sh b/recipes/opentrons/install-shared-data.sh similarity index 100% rename from recipes/opentrons_shared_data/build.sh rename to recipes/opentrons/install-shared-data.sh diff --git a/recipes/opentrons/meta.yaml b/recipes/opentrons/meta.yaml index 64d943d6b1479..facfac45a4b78 100644 --- a/recipes/opentrons/meta.yaml +++ b/recipes/opentrons/meta.yaml @@ -1,8 +1,7 @@ -{% set name = "opentrons" %} {% set version = "4.4.0" %} package: - name: {{ name|lower }} + name: opentrons version: {{ version }} source: @@ -13,28 +12,52 @@ source: build: number: 0 - entry_points: - - opentrons_simulate = opentrons.simulate:main - - opentrons_execute = opentrons.execute:main - skip: true # [py<37] -requirements: - host: - - python - - pip - run: - - python - - aionotify >=0.2.0 # [linux] - - jsonschema >=3.0.2,<4 - - numpy >=1.15.1 - - opentrons_shared_data =={{ version }} - - pydantic >=1.4 - - pyserial >=3.5 - - typing-extensions >=3.7.4.3 +outputs: + - name: opentrons_shared_data + script: install-shared-data.bat # [win] + script: install-shared-data.sh # [not win] + build: + noarch: python + requirements: + host: + - python >=3.7 + - pip + run: + - python >=3.7 + - jsonschema >=3.0.2,<4 + test: + imports: + - opentrons_shared_data + commands: + - pip check + requires: + - pip -test: - imports: - - opentrons + - name: opentrons + script: install-opentrons.bat # [win] + script: install-opentrons.sh # [not win] + build: + entry_points: + - opentrons_simulate = opentrons.simulate:main + - opentrons_execute = opentrons.execute:main + skip: true # [py<37] + requirements: + host: + - python + - pip + run: + - python + - aionotify >=0.2.0 # [linux] + - jsonschema >=3.0.2,<4 + - numpy >=1.15.1 + - pydantic >=1.4 + - pyserial >=3.5 + - typing-extensions >=3.7.4.3 + - {{ pin_subpackage('opentrons_shared_data', max_pin="x.x.x") }} + test: + imports: + - opentrons about: home: https://www.opentrons.com @@ -43,7 +66,7 @@ about: summary: | The Opentrons API is a simple framework designed to make writing automated biology lab protocols easy - dev_url: https://github.com/Opentrons/opentrons/tree/edge/api + dev_url: https://github.com/Opentrons/opentrons doc_url: https://docs.opentrons.com extra: diff --git a/recipes/opentrons_shared_data/meta.yaml b/recipes/opentrons_shared_data/meta.yaml deleted file mode 100644 index 5473df4a4be23..0000000000000 --- a/recipes/opentrons_shared_data/meta.yaml +++ /dev/null @@ -1,42 +0,0 @@ -{% set name = "opentrons_shared_data" %} -{% set version = "4.4.0" %} - -package: - name: {{ name|lower }} - version: {{ version }} - -source: - url: https://github.com/Opentrons/opentrons/archive/refs/tags/v{{ version }}.tar.gz - sha256: 6dd85756b1c99050926abf6d518fc8179a367a8a0c53d67d170c87312419cf3f - -build: - number: 0 - noarch: python - -requirements: - host: - - python >=3.7 - - pip - run: - - python >=3.7 - - jsonschema >=3.0.2,<4 - -test: - imports: - - opentrons_shared_data - commands: - - pip check - requires: - - pip - -about: - home: https://www.opentrons.com - license: Apache-2.0 - license_file: LICENSE - summary: A bundle of data and python binding that supports the Opentrons API - dev_url: https://github.com/Opentrons/opentrons/tree/edge/shared-data - doc_url: https://docs.opentrons.com - -extra: - recipe-maintainers: - - mrakitin From 4c46e340ce29f1c3cba3ed432a5f7a12b62493ba Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Thu, 29 Jul 2021 00:43:29 -0400 Subject: [PATCH 23/26] Change the suite name --- recipes/opentrons/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/opentrons/meta.yaml b/recipes/opentrons/meta.yaml index facfac45a4b78..828699b3cbf45 100644 --- a/recipes/opentrons/meta.yaml +++ b/recipes/opentrons/meta.yaml @@ -1,7 +1,7 @@ {% set version = "4.4.0" %} package: - name: opentrons + name: opentrons-suite version: {{ version }} source: From 56712dfa1e799f722cd369fad254f8d369ee6aea Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Thu, 29 Jul 2021 00:55:18 -0400 Subject: [PATCH 24/26] Do not use pin_subpackage --- recipes/opentrons/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/opentrons/meta.yaml b/recipes/opentrons/meta.yaml index 828699b3cbf45..98e3ea4f947ad 100644 --- a/recipes/opentrons/meta.yaml +++ b/recipes/opentrons/meta.yaml @@ -51,10 +51,10 @@ outputs: - aionotify >=0.2.0 # [linux] - jsonschema >=3.0.2,<4 - numpy >=1.15.1 + - opentrons_shared_data =={{ version }} - pydantic >=1.4 - pyserial >=3.5 - typing-extensions >=3.7.4.3 - - {{ pin_subpackage('opentrons_shared_data', max_pin="x.x.x") }} test: imports: - opentrons From 52219b0ac3eac86b106c2fb1d059fe0293703196 Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Thu, 29 Jul 2021 01:04:30 -0400 Subject: [PATCH 25/26] Do not install PyPI dependencies --- recipes/opentrons/install-opentrons.bat | 2 +- recipes/opentrons/install-opentrons.sh | 2 +- recipes/opentrons/install-shared-data.bat | 2 +- recipes/opentrons/install-shared-data.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/opentrons/install-opentrons.bat b/recipes/opentrons/install-opentrons.bat index 517291f33cd36..35ef652f7e1d1 100644 --- a/recipes/opentrons/install-opentrons.bat +++ b/recipes/opentrons/install-opentrons.bat @@ -7,5 +7,5 @@ dir dist for /f "tokens=* USEBACKQ" %%g in (`dir /b dist\*.whl`) do (set "whl=%%g") -%PYTHON% -m pip install dist\%whl% -vv +%PYTHON% -m pip install dist\%whl% -vv --no-deps diff --git a/recipes/opentrons/install-opentrons.sh b/recipes/opentrons/install-opentrons.sh index a94c8a8c6c655..a9f8679b4b773 100644 --- a/recipes/opentrons/install-opentrons.sh +++ b/recipes/opentrons/install-opentrons.sh @@ -5,5 +5,5 @@ set -vxeuo pipefail export PYTHONPATH=$PWD/scripts/ cd api/ $PYTHON setup.py bdist_wheel -$PYTHON -m pip install dist/*.whl +$PYTHON -m pip install dist/*.whl -vv --no-deps diff --git a/recipes/opentrons/install-shared-data.bat b/recipes/opentrons/install-shared-data.bat index a1d9fec32ed16..d959d62fea5a3 100644 --- a/recipes/opentrons/install-shared-data.bat +++ b/recipes/opentrons/install-shared-data.bat @@ -7,5 +7,5 @@ dir dist for /f "tokens=* USEBACKQ" %%g in (`dir /b dist\*.whl`) do (set "whl=%%g") -%PYTHON% -m pip install dist\%whl% -vv +%PYTHON% -m pip install dist\%whl% -vv --no-deps diff --git a/recipes/opentrons/install-shared-data.sh b/recipes/opentrons/install-shared-data.sh index 0f7f91ad1cda5..85c6bdd3f5e68 100644 --- a/recipes/opentrons/install-shared-data.sh +++ b/recipes/opentrons/install-shared-data.sh @@ -6,5 +6,5 @@ export PYTHONPATH=$PWD/scripts/ cd shared-data/python/ $PYTHON setup.py bdist_wheel -$PYTHON -m pip install dist/*.whl +$PYTHON -m pip install dist/*.whl -vv --no-deps From a55d5a3efcc1357fd5ce63c9055141aa6cf5b477 Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Thu, 29 Jul 2021 01:26:11 -0400 Subject: [PATCH 26/26] Revert usage of pin_subpackage --- recipes/opentrons/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/opentrons/meta.yaml b/recipes/opentrons/meta.yaml index 98e3ea4f947ad..828699b3cbf45 100644 --- a/recipes/opentrons/meta.yaml +++ b/recipes/opentrons/meta.yaml @@ -51,10 +51,10 @@ outputs: - aionotify >=0.2.0 # [linux] - jsonschema >=3.0.2,<4 - numpy >=1.15.1 - - opentrons_shared_data =={{ version }} - pydantic >=1.4 - pyserial >=3.5 - typing-extensions >=3.7.4.3 + - {{ pin_subpackage('opentrons_shared_data', max_pin="x.x.x") }} test: imports: - opentrons