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(performance-metrics): fix dependency issues for performance metrics #15766

Closed
wants to merge 8 commits into from
Closed

fix(performance-metrics): fix dependency issues for performance metrics #15766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a8d4e04
Auto stash before checking out "origin/edge"
DerekMaggio Jul 22, 2024
9b857a1
update pipfiles
DerekMaggio Jul 22, 2024
038a7c2
do I maybe add it to setup.py?
DerekMaggio Jul 23, 2024
a68a053
face palm, need to update the lock file
DerekMaggio Jul 23, 2024
f1a364a
relock after rebase
DerekMaggio Jul 24, 2024
5b7caf9
Change file to path
DerekMaggio Jul 25, 2024
317acc6
formatting
DerekMaggio Jul 25, 2024
bf68b98
service is specified in oe-core
DerekMaggio Jul 25, 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 performance-metrics/Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ verify_ssl = true
name = "pypi"

[packages]
performance-metrics = {file = ".", editable = true}
performance-metrics = {path = ".", editable = true}
psutil = "==6.0.0"
systemd-python = "234"

Expand Down
16 changes: 8 additions & 8 deletions performance-metrics/Pipfile.lock
View file
Open in desktop

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

5 changes: 4 additions & 1 deletion performance-metrics/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,10 @@ def get_version():
KEYWORDS = ["robots", "protocols", "synbio", "pcr", "automation", "lab"]
DESCRIPTION = "Library for working with performance metrics on the Opentrons robots"
PACKAGES = find_packages(where="src", exclude=["tests.*", "tests"])
INSTALL_REQUIRES = []
INSTALL_REQUIRES = [
"psutil==6.0.0; sys_platform=='linux'",
"systemd-python==234; sys_platform=='linux'",
]


def read(*parts):
Expand Down
19 changes: 0 additions & 19 deletions performance-metrics/system-resource-tracker-dev.service
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions performance-metrics/system-resource-tracker.service
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion robot-server/Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ sqlalchemy2-stubs = "==0.0.2a21"
python-box = "==6.1.0"
types-paho-mqtt = "==1.6.0.20240106"
pyusb = "==1.2.1"
performance-metrics = {file = "../performance-metrics", editable = true}


[packages]
anyio = "==3.7.1"
Expand All @@ -64,3 +64,4 @@ opentrons = { editable = true, path = "../api"}
opentrons-shared-data = { editable = true, path = "../shared-data/python" }
server-utils = {editable = true, path = "./../server-utils"}
robot-server = { editable = true, path = "."}
performance-metrics = {path = "../performance-metrics", editable = true}
374 changes: 201 additions & 173 deletions robot-server/Pipfile.lock
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions robot-server/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ def get_version():
f"opentrons=={VERSION}",
f"opentrons-shared-data=={VERSION}",
f"server-utils=={VERSION}",
f"performance-metrics=={VERSION}",
"anyio==3.7.1",
"fastapi==0.99.1",
"python-dotenv==1.0.1",
Expand Down
Loading