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

fix(cli): try to fix packaging import #15715

Closed
wants to merge 6 commits into from
Closed

fix(cli): try to fix packaging import #15715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b5f84b6
fix(cli): try to fix packaging imoprt
aaron-kulkarni Jul 19, 2024
306de68
version import change
aaron-kulkarni Jul 19, 2024
28c4010
resolving dependency conflicts! very fun
aaron-kulkarni Jul 19, 2024
f628474
don't know if this makes any sense
aaron-kulkarni Jul 19, 2024
33b0d05
added pipfile. maybe works?
aaron-kulkarni Jul 19, 2024
b032b6f
i'm getting jankier
aaron-kulkarni Jul 19, 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
3 changes: 2 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ DISCOVERY_CLIENT_DIR := discovery-client
G_CODE_TESTING_DIR := g-code-testing
LABWARE_LIBRARY_DIR := labware-library
PROTOCOL_DESIGNER_DIR := protocol-designer
SCRIPTS_DIR := scripts
SHARED_DATA_DIR := shared-data
UPDATE_SERVER_DIR := update-server
REACT_API_CLIENT_DIR := react-api-client
Expand All @@ -25,7 +26,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 := $(SCRIPTS_DIR) $(API_DIR) $(UPDATE_SERVER_DIR) $(ROBOT_SERVER_DIR) $(SERVER_UTILS_DIR) $(SHARED_DATA_DIR)/python $(G_CODE_TESTING_DIR) $(HARDWARE_DIR) $(USB_BRIDGE_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
Expand Down
1 change: 1 addition & 0 deletions abr-testing/Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ flake8-noqa = "~=1.2.1"
requests = "==2.27.1"
types-requests = "==2.25.6"
google-api-python-client-stubs = "*"
packaging = "==24.1"

[requires]
python_version = "3.10"
357 changes: 158 additions & 199 deletions abr-testing/Pipfile.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion api/Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ 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"
packaging = "==21.3"
pyusb = "==1.2.1"

[dev-packages]
Expand Down Expand Up @@ -44,6 +43,7 @@ decoy = "==2.1.1"
black = "==22.3.0"
types-mock = "~=5.1.0"
types-setuptools = "==57.0.2"
packaging = "==24.1"
# 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
437 changes: 172 additions & 265 deletions api/Pipfile.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion api/src/opentrons/hardware_control/modules/mod_abc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def parse_fw_version(version: str) -> Version:
raise InvalidVersion()
except InvalidVersion:
device_version = parse("v0.0.0")
return cast(Version, device_version)
return Version(device_version)


class AbstractModule(abc.ABC):
Expand Down
1 change: 1 addition & 0 deletions g-code-testing/Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ flake8-noqa = "~=1.4.0"
black = "==22.3.0"
decoy = "~=2.1.1"
pyusb = "==1.2.1"
packaging = "==24.1"

[requires]
python_version = "3.10"
219 changes: 146 additions & 73 deletions g-code-testing/Pipfile.lock
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions hardware-testing/Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ flake8-noqa = "~=1.2.1"
requests = "==2.27.1"
types-requests = "==2.25.6"
pyusb = "==1.2.1"
packaging = "==24.1"

[requires]
python_version = "3.10"
107 changes: 71 additions & 36 deletions hardware-testing/Pipfile.lock
View file
Open in desktop

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

3 changes: 2 additions & 1 deletion hardware/Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ python-can = "==4.2.2"
pyserial = "==3.5"
typing-extensions = ">=4.0.0,<5"
numpy = "==1.22.3"
pydantic = "==1.9.2"
pydantic = "==1.10.12"

[dev-packages]
pytest = "==7.4.4"
Expand All @@ -25,6 +25,7 @@ types-mock = "~=5.1.0"
hypothesis = "~=6.96.1"
pytest-asyncio = "~=0.23.0"
matplotlib = "*"
packaging = "==24.1"
opentrons-shared-data = { editable = true, path = "../shared-data/python" }

[requires]
Expand Down
Loading
Loading