From 4bda0a921f12a1fe662b7f7c2fe61d9e3afa4f5b Mon Sep 17 00:00:00 2001 From: Qi Luo Date: Tue, 26 Oct 2021 21:12:45 -0700 Subject: [PATCH] [build] Use pip to install setup.py dependency instead of `python setup.py install` (#8997) #### Why I did it Fix a recent build error introduced by a pre-release redis-py. This is a general issue because `python setup.py install` (ie `easy_instal`) does not ignore pre-release versions. The fix is suggested by https://github.com/pypa/setuptools/issues/855#issuecomment-583803959 --- slave.mk | 2 ++ .../0003-use-redis-3.5.3.patch | 25 ------------------- src/redis-dump-load.patch/series | 1 - src/sonic-yang-models/setup.py | 3 +-- 4 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 src/redis-dump-load.patch/0003-use-redis-3.5.3.patch diff --git a/slave.mk b/slave.mk index 093a319105..c64237d625 100644 --- a/slave.mk +++ b/slave.mk @@ -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` if [ ! "$($*_TEST)" = "n" ]; then python$($*_PYTHON_VERSION) setup.py test $(LOG); fi python$($*_PYTHON_VERSION) setup.py bdist_wheel $(LOG) # clean up diff --git a/src/redis-dump-load.patch/0003-use-redis-3.5.3.patch b/src/redis-dump-load.patch/0003-use-redis-3.5.3.patch deleted file mode 100644 index a58c2059e8..0000000000 --- a/src/redis-dump-load.patch/0003-use-redis-3.5.3.patch +++ /dev/null @@ -1,25 +0,0 @@ -Pin the redis package to version 3.5.3 (the last version that supports both -Python 2 and 3). - -Signed-off-by: Saikrishna Arcot - -diff --git a/requirements.txt b/requirements.txt -index 7800f0f..3fc0632 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -1 +1 @@ --redis -+redis==3.5.3 -diff --git a/setup.py b/setup.py -index 8ccf31f..6db9ec4 100644 ---- a/setup.py -+++ b/setup.py -@@ -17,7 +17,7 @@ setup(name=package_name, - author_email='oleg@bsdpower.com', - url='http://github.com/p/redis-dump-load', - py_modules=['redisdl'], -- install_requires=['redis'], -+ install_requires=['redis==3.5.3'], - data_files=[ - (doc_dir, data_files), - ], diff --git a/src/redis-dump-load.patch/series b/src/redis-dump-load.patch/series index 50beb71a67..c73c3b5caa 100644 --- a/src/redis-dump-load.patch/series +++ b/src/redis-dump-load.patch/series @@ -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 diff --git a/src/sonic-yang-models/setup.py b/src/sonic-yang-models/setup.py index a5a74f1b4c..7ef362c008 100644 --- a/src/sonic-yang-models/setup.py +++ b/src/sonic-yang-models/setup.py @@ -85,8 +85,7 @@ setup( './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, )