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

[build] Use pip to install setup.py dependency instead of python setup.py install #8997

Merged
merged 4 commits into from
Oct 27, 2021
Merged

[build] Use pip to install setup.py dependency instead of python setup.py install #8997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6486ed2
Use pip to install setup.py dependency instead of `python setup.py in…
qiluo-msft Oct 18, 2021
3c76d8c
Add sudo
qiluo-msft Oct 20, 2021
99fbb6d
Revert "redis-dump-load: Pin the redis package to use 3.5.3 (#9001)"
qiluo-msft Oct 20, 2021
29dfeea
no sudo, remove non-existing file from sonic-yang-models setup.py
qiluo-msft Oct 20, 2021
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: 2 additions & 0 deletions slave.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,6 +643,8 @@ $(addprefix $(PYTHON_WHEELS_PATH)/, $(SONIC_PYTHON_WHEELS)) : $(PYTHON_WHEELS_PA
pushd $($*_SRC_PATH) $(LOG_SIMPLE)
# apply series of patches if exist
if [ -f ../$(notdir $($*_SRC_PATH)).patch/series ]; then QUILT_PATCHES=../$(notdir $($*_SRC_PATH)).patch quilt push -a; fi
# Use pip instead of later setup.py to install dependencies into user home, but uninstall self
pip$($*_PYTHON_VERSION) install . && pip$($*_PYTHON_VERSION) uninstall --yes `python setup.py --name`
Copy link
Contributor

Choose a reason for hiding this comment

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

Does pip read the requirements.txt file by default for getting the list of packages to install?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

What you mentioned is pip -r requirements.txt. And pip install . is checking the setup.py for dependencies, install them and also the package itself.

if [ ! "$($*_TEST)" = "n" ]; then python$($*_PYTHON_VERSION) setup.py test $(LOG); fi
python$($*_PYTHON_VERSION) setup.py bdist_wheel $(LOG)
# clean up
Expand Down
25 changes: 0 additions & 25 deletions src/redis-dump-load.patch/0003-use-redis-3.5.3.patch
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/redis-dump-load.patch/series
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
0001-Use-pipelines-when-dumping-52.patch
0002-Fix-setup.py-for-test-and-bdist_wheel.patch
0003-use-redis-3.5.3.patch
3 changes: 1 addition & 2 deletions src/sonic-yang-models/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,7 @@
'./yang-models/sonic-tc-queue-map.yang',
'./yang-models/sonic-pfc-priority-queue-map.yang',
'./yang-models/sonic-pfc-priority-priority-group-map.yang',
'./yang-models/sonic-port-qos-map.yang',
'./yang-models/sonic_yang_tree']),
'./yang-models/sonic-port-qos-map.yang']),
],
zip_safe=False,
)