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

[sonic-psud] Depend on sonic-platform-common #7182

Merged
merged 1 commit into from
Mar 30, 2021
Merged

[sonic-psud] Depend on sonic-platform-common #7182

merged 1 commit into from
Mar 30, 2021

Conversation

jleveque
Copy link
Contributor

Why I did it

Unit tests for psud depend on sonic-platform-common as of sonic-net/sonic-platform-daemons#154

How I did it

Add dependency in sonic-thermalctld.mk makefile.

How to verify it

Ensure build passes once sonic-net/sonic-platform-daemons#154 is included in a submodule update.

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012

@jleveque jleveque self-assigned this Mar 30, 2021
@jleveque jleveque requested a review from xumia as a code owner March 30, 2021 01:01
@jleveque jleveque added the dependencies Pull requests that update a dependency file label Mar 30, 2021
@liat-grozovik
Copy link
Collaborator

@jleveque is the submodule PR marked to be for 202012?

@lguohan lguohan merged commit 9dd45da into sonic-net:master Mar 30, 2021
@jleveque jleveque deleted the psud_dep_sonic_plat_common branch March 30, 2021 16:44
@jleveque
Copy link
Contributor Author

@jleveque is the submodule PR marked to be for 202012?

Yes: #7143

@@ -13,7 +13,7 @@ SONIC_PYTHON_WHEELS += $(SONIC_PSUD_PY2)

SONIC_PSUD_PY3 = sonic_psud-1.0-py3-none-any.whl
$(SONIC_PSUD_PY3)_SRC_PATH = $(SRC_PATH)/sonic-platform-daemons/sonic-psud
$(SONIC_PSUD_PY3)_DEPENDS = $(SONIC_PY_COMMON_PY3) $(SONIC_PSUD_PY2)
$(SONIC_PSUD_PY3)_DEPENDS = $(SONIC_PY_COMMON_PY3) $(SONIC_PLATFORM_COMMON_PY3) $(SONIC_PSUD_PY2)
Copy link
Collaborator

@qiluo-msft qiluo-msft Mar 30, 2021

Choose a reason for hiding this comment

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

Why a PY3 depends on PY2? #Closed

Copy link
Contributor Author

Choose a reason for hiding this comment

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

To prevent building the Python 2 and Python 3 packages simultaneously, which can cause build issues.

@@ -4,7 +4,7 @@

SONIC_PSUD_PY2 = sonic_psud-1.0-py2-none-any.whl
$(SONIC_PSUD_PY2)_SRC_PATH = $(SRC_PATH)/sonic-platform-daemons/sonic-psud
$(SONIC_PSUD_PY2)_DEPENDS = $(SONIC_PY_COMMON_PY2)
$(SONIC_PSUD_PY2)_DEPENDS = $(SONIC_PY_COMMON_PY2) $(SONIC_PLATFORM_COMMON_PY2)
Copy link
Collaborator

@qiluo-msft qiluo-msft Mar 30, 2021

Choose a reason for hiding this comment

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

Why we still have PY2? #Closed

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Because some vendors have not yet ported their platform APIs to Python 3. :( We are allowing them until the next release to do so.

Copy link
Collaborator

@qiluo-msft qiluo-msft left a comment

Choose a reason for hiding this comment

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

Thanks! LGTM

daall pushed a commit that referenced this pull request Mar 31, 2021
raphaelt-nvidia pushed a commit to raphaelt-nvidia/sonic-buildimage that referenced this pull request May 23, 2021
carl-nokia pushed a commit to carl-nokia/sonic-buildimage that referenced this pull request Aug 7, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants