[oe-commits] [openembedded-core] 17/58: python3-pip: clean up obsolete

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit a2d69b859a3d08546db766995bd541956cb36ecb
Author: Hongxu Jia <hongxu.jia at windriver.com>
AuthorDate: Thu Jul 19 22:59:06 2018 +0800

    python3-pip: clean up obsolete
    
    Since unify var-DISTUTILS_INSTALL_ARGS in distutils and setuptools,
    - The local DISTUTILS_INSTALL_ARGS assignment is obsolete;
    - The site.py is not be generated any more;
    - The layout is in a standard pip dir (such as /usr/lib/python3.5/site-
      packages/pip rather than /lib/python3.5/site-packages/pip-10.0.1-
      py3.5.egg/pip), the pth file is not required;
    
    `#!/usr/bin/env python3' is already used, do not manually sed.
    
    [YOCTO #8446]
    
    Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/recipes-devtools/python/python3-pip_10.0.1.bb | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/meta/recipes-devtools/python/python3-pip_10.0.1.bb b/meta/recipes-devtools/python/python3-pip_10.0.1.bb
index 100d4d0..8deec2b 100644
--- a/meta/recipes-devtools/python/python3-pip_10.0.1.bb
+++ b/meta/recipes-devtools/python/python3-pip_10.0.1.bb
@@ -11,27 +11,9 @@ SRC_URI[sha256sum] = "f2bd08e0cd1b06e10218feaf6fef299f473ba706582eb3bd9d52203fdb
 
 inherit pypi distutils3
 
-DISTUTILS_INSTALL_ARGS += "--install-lib=${D}${PYTHON_SITEPACKAGES_DIR}"
-
-do_install_prepend() {
-    install -d ${D}${PYTHON_SITEPACKAGES_DIR}
-}
-
-# Use setuptools site.py instead, avoid shared state issue
 do_install_append() {
-    rm ${D}${PYTHON_SITEPACKAGES_DIR}/site.py
-    rm ${D}${PYTHON_SITEPACKAGES_DIR}/__pycache__/site.cpython-*.pyc
-
     # Install as pip3 and leave pip2 as default
     rm ${D}/${bindir}/pip
-
-    # Installed eggs need to be passed directly to the interpreter via a pth file
-    echo "./${PYPI_PACKAGE}-${PV}-py${PYTHON_BASEVERSION}.egg" > ${D}${PYTHON_SITEPACKAGES_DIR}/${PYPI_PACKAGE}-${PV}.pth
-
-    # Make sure we use /usr/bin/env python3
-    for PYTHSCRIPT in `grep -rIl ${bindir} ${D}${bindir}/pip3*`; do
-        sed -i -e '1s|^#!.*|#!/usr/bin/env python3|' $PYTHSCRIPT
-    done
 }
 
 RDEPENDS_${PN} = "\

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.