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

Removed python2 dependency for sonic-pcied in sonic-platform-daemons #10421

Merged
merged 3 commits into from
Apr 9, 2022

Conversation

assrinivasan
Copy link
Contributor

@assrinivasan assrinivasan commented Mar 31, 2022

Removed python2 dependency for sonic-pcied in sonic-platform-daemons that was causing unit test errors in sonic_pcied.

Why I did it

The current unit test for the PCIE daemon contains test code that is only compatible with Python3. This was causing build issues on account of the python3 wheel being dependent on the Python2 wheel.

How I did it

Removed all rules relating to building the Python2 wheel and the PCIE daemon's Python 3 wheel's dependencies on it.

How to verify it

Clone and build sonic-buildimage. This should, among other things, build target/python-wheels/buster/sonic_pcied-1.0-py3-none-any.whl without building target/python-wheels/buster/sonic_pcied-1.0-py2-none-any.whl

Description for the changelog

A picture of a cute animal (not mandatory but encouraged)

This is my dog Disco. She's pretty cute.

IMG_2177

Removed python2 support for sonic-platform-daemons that was causing unit
test errors in sonic_pcied.
@liuh-80
Copy link
Contributor

liuh-80 commented Apr 1, 2022

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@vdahiya12
Copy link
Contributor

Please also remove the corresponding configuration from Docker supervisord jinja templates.

@assrinivasan assrinivasan self-assigned this Apr 1, 2022
@@ -171,7 +171,7 @@ dependent_startup_wait_for=rsyslogd:running

{% if not skip_pcied %}
[program:pcied]
command={% if API_VERSION == 3 and 'pcied' not in python2_daemons %}python3 {% else %} python2 {% endif %}/usr/local/bin/pcied
command= python3 /usr/local/bin/pcied
Copy link
Collaborator

@qiluo-msft qiluo-msft Apr 7, 2022

Choose a reason for hiding this comment

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

python3

You can just remove python3 because there is correct shebang line inside the script.

And remove the blank before after =. #Closed

@assrinivasan
Copy link
Contributor Author

Can I merge this?

@judyjoseph judyjoseph merged commit b4f8f1d into sonic-net:master Apr 9, 2022
liushilongbuaa pushed a commit to liushilongbuaa/sonic-buildimage that referenced this pull request Jun 20, 2022
Related work items: #49, #58, #107, sonic-net#247, sonic-net#249, sonic-net#277, sonic-net#593, sonic-net#597, sonic-net#1035, sonic-net#2130, sonic-net#2150, sonic-net#2165, sonic-net#2169, sonic-net#2178, sonic-net#2179, sonic-net#2187, sonic-net#2188, sonic-net#2191, sonic-net#2195, sonic-net#2197, sonic-net#2198, sonic-net#2200, sonic-net#2202, sonic-net#2206, sonic-net#2209, sonic-net#2211, sonic-net#2216, sonic-net#7909, sonic-net#8927, sonic-net#9681, sonic-net#9733, sonic-net#9746, sonic-net#9850, sonic-net#9967, sonic-net#10104, sonic-net#10152, sonic-net#10168, sonic-net#10228, sonic-net#10266, sonic-net#10288, sonic-net#10294, sonic-net#10313, sonic-net#10394, sonic-net#10403, sonic-net#10404, sonic-net#10421, sonic-net#10431, sonic-net#10437, sonic-net#10445, sonic-net#10457, sonic-net#10458, sonic-net#10465, sonic-net#10467, sonic-net#10469, sonic-net#10470, sonic-net#10474, sonic-net#10477, sonic-net#10478, sonic-net#10482, sonic-net#10485, sonic-net#10488, sonic-net#10489, sonic-net#10492, sonic-net#10494, sonic-net#10498, sonic-net#10501, sonic-net#10509, sonic-net#10512, sonic-net#10514, sonic-net#10516, sonic-net#10517, sonic-net#10523, sonic-net#10525, sonic-net#10531, sonic-net#10532, sonic-net#10538, sonic-net#10555, sonic-net#10557, sonic-net#10559, sonic-net#10561, sonic-net#10565, sonic-net#10572, sonic-net#10574, sonic-net#10576, sonic-net#10578, sonic-net#10581, sonic-net#10585, sonic-net#10587, sonic-net#10599, sonic-net#10607, sonic-net#10611, sonic-net#10616, sonic-net#10618, sonic-net#10619, sonic-net#10623, sonic-net#10624, sonic-net#10633, sonic-net#10646, sonic-net#10655, sonic-net#10660, sonic-net#10664, sonic-net#10680, sonic-net#10683
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants