Skip to contentSkip to conversation

python/python3: Remove trailing white spaces

PATCH In review Andrew Geissler 2 participants 5 messages Sep 12, 2018 – Sep 13, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 python/python3: Remove trailing white spaces

Noticed these in my diff when adding some new changes to these files.

---
 meta/recipes-devtools/python/python3_3.5.5.bb | 2 +-
 meta/recipes-devtools/python/python_2.7.15.bb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-devtools/python/python3_3.5.5.bb +1 -1
index 40896db..c919a97 100644
@@ -137,7 +137,7 @@ do_compile() {
 		-e 's,^INCLUDEDIR=.*,INCLUDE=${STAGING_INCDIR},g' \
 		-e 's,^CONFINCLUDEDIR=.*,CONFINCLUDE=${STAGING_INCDIR},g' \
 		Makefile
-	# save copy of it now, because if we do it in do_install and 
+	# save copy of it now, because if we do it in do_install and
 	# then call do_install twice we get Makefile.orig == Makefile.sysroot
 	install -m 0644 Makefile Makefile.sysroot
 
meta/recipes-devtools/python/python_2.7.15.bb +2 -2
index 43d9ff5..82b65d2 100644
@@ -75,7 +75,7 @@ do_compile() {
 		-e 's,^INCLUDEDIR=.*,INCLUDE=${STAGING_INCDIR},g' \
 		-e 's,^CONFINCLUDEDIR=.*,CONFINCLUDE=${STAGING_INCDIR},g' \
 		Makefile
-	# save copy of it now, because if we do it in do_install and 
+	# save copy of it now, because if we do it in do_install and
 	# then call do_install twice we get Makefile.orig == Makefile.sysroot
 	install -m 0644 Makefile Makefile.sysroot
 
@@ -107,7 +107,7 @@ do_install() {
 		STAGING_INCDIR=${STAGING_INCDIR} \
 		STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \
 		DESTDIR=${D} LIBDIR=${libdir}
-	
+
 	oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python-native/pgen \
 		HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python-native/python \
 		CROSSPYTHONPATH=${STAGING_LIBDIR_NATIVE}/python${PYTHON_MAJMIN}/lib-dynload/ \
Signature · 1 line
2.7.4
#1 lore raw

PATCH 2/2 python/python3: Add option to remove test files

A quick search in the python package shows the following test directories being included in the python image:
./Python-2.7.14/Lib/bsddb/test ./Python-2.7.14/Lib/sqlite3/test ./Python-2.7.14/Lib/ctypes/test ./Python-2.7.14/Lib/unittest/test ./Python-2.7.14/Lib/lib-tk/test ./Python-2.7.14/Lib/email/test

In some distributions, the extra space taken up by these test files is very valuable.

The default is to still include the test files.

---
 meta/recipes-devtools/python/python3_3.5.5.bb | 9 +++++++++
 meta/recipes-devtools/python/python_2.7.15.bb | 9 +++++++++
 2 files changed, 18 insertions(+)
meta/recipes-devtools/python/python3_3.5.5.bb +9 -0
index c919a97..5d1397a 100644
@@ -160,6 +160,11 @@ EOF
 	fi
 }
 
+# Some packages include test/ directories and files. Provide option
+# to not include them.
+
+INCLUDE_TESTS ?= "1"
+
 do_install() {
 	# make install needs the original Makefile, or otherwise the inclues would
 	# go to ${D}${STAGING...}/...
@@ -189,6 +194,10 @@ do_install() {
 	fi
 
 	oe_multilib_header python${PYTHON_BINABI}/pyconfig.h
+
+    if [ "${INCLUDE_TESTS}" -ne "1" ]; then
+        find ${D}${libdir}/python${PYTHON_MAJMIN} -name test -exec rm -rf {} +;
+    fi
 }
 
 do_install_append_class-nativesdk () {
meta/recipes-devtools/python/python_2.7.15.bb +9 -0
index 82b65d2..1839624 100644
@@ -90,6 +90,11 @@ do_compile() {
 		OPT="${CFLAGS}"
 }
 
+# Some packages include test/ directories and files. Provide option
+# to not include them.
+
+INCLUDE_TESTS ?= "1"
+
 do_install() {
 	# make install needs the original Makefile, or otherwise the inclues would
 	# go to ${D}${STAGING...}/...
@@ -127,6 +132,10 @@ do_install() {
     if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'bdb', d)}" ]; then
         rm -rf ${D}/${libdir}/python${PYTHON_MAJMIN}/bsddb
     fi
+
+    if [ "${INCLUDE_TESTS}" -ne "1" ]; then
+        find ${D}${libdir}/python${PYTHON_MAJMIN} -name test -exec rm -rf {} +;
+    fi
 }
 
 do_install_append_class-nativesdk () {
Signature · 1 line
2.7.4
#2 lore raw

Re: [PATCH 2/2] python/python3: Add option to remove test files

What are these files? Are they needed by the test suite? If so, lets just put them into python-tests along with the test suite.

Ross

Quoted 82 lines · Andrew Geissler

A quick search in the python package shows the following test directories being included in the python image:
./Python-2.7.14/Lib/bsddb/test ./Python-2.7.14/Lib/sqlite3/test ./Python-2.7.14/Lib/ctypes/test ./Python-2.7.14/Lib/unittest/test ./Python-2.7.14/Lib/lib-tk/test ./Python-2.7.14/Lib/email/test

In some distributions, the extra space taken up by these test files is very valuable.

The default is to still include the test files.

---
 meta/recipes-devtools/python/python3_3.5.5.bb | 9 +++++++++
 meta/recipes-devtools/python/python_2.7.15.bb | 9 +++++++++
 2 files changed, 18 insertions(+)
meta/recipes-devtools/python/python3_3.5.5.bb +9 -0
index c919a97..5d1397a 100644
@@ -160,6 +160,11 @@ EOF
        fi
 }
 
+# Some packages include test/ directories and files. Provide option
+# to not include them.
+
+INCLUDE_TESTS ?= "1"
+
 do_install() {
        # make install needs the original Makefile, or otherwise the inclues would
        # go to ${D}${STAGING...}/...
@@ -189,6 +194,10 @@ do_install() {
        fi
 
        oe_multilib_header python${PYTHON_BINABI}/pyconfig.h
+
+    if [ "${INCLUDE_TESTS}" -ne "1" ]; then
+        find ${D}${libdir}/python${PYTHON_MAJMIN} -name test -exec rm -rf {} +;
+    fi
 }
 
 do_install_append_class-nativesdk () {
meta/recipes-devtools/python/python_2.7.15.bb +9 -1
index 82b65d2..1839624 100644
@@ -90,6 +90,11 @@ do_compile() {
                OPT="${CFLAGS}"
 }
 
+# Some packages include test/ directories and files. Provide option
+# to not include them.
+
+INCLUDE_TESTS ?= "1"
+
 do_install() {
        # make install needs the original Makefile, or otherwise the inclues would
        # go to ${D}${STAGING...}/...
@@ -127,6 +132,10 @@ do_install() {
     if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'bdb', d)}" ]; then
         rm -rf ${D}/${libdir}/python${PYTHON_MAJMIN}/bsddb
     fi
+
+    if [ "${INCLUDE_TESTS}" -ne "1" ]; then
+        find ${D}${libdir}/python${PYTHON_MAJMIN} -name test -exec rm -rf {} +;
+    fi
 }
 
 do_install_append_class-nativesdk () {
--

2.7.4

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#3 lore raw

Re: [PATCH 2/2] python/python3: Add option to remove test files

Quoted 3 lines · Ross

What are these files? Are they needed by the test suite? If so, lets just put them into python-tests along with the test suite.

I did have a brief email exchange with Alejandro in
http://lists.openembedded.org/pipermail/openembedded-core/2018-September/155471.html
where we talked about how certain packages require the test files
during build, so they'd need to be removed during install. I figured
it was easiest to just do them all during install.

I see that python2-manifest.json does have a sqlite3 and sqlite3-tests entry. Is that the type of thing I should try with the other packages or were you thinking something else?

I'm definitely very new to the python recipe, but willing to try out whatever you guys think best.

Thanks!
Andrew

Quoted 86 lines

Ross

Quoted 82 lines · Andrew Geissler

A quick search in the python package shows the following test directories being included in the python image:
./Python-2.7.14/Lib/bsddb/test ./Python-2.7.14/Lib/sqlite3/test ./Python-2.7.14/Lib/ctypes/test ./Python-2.7.14/Lib/unittest/test ./Python-2.7.14/Lib/lib-tk/test ./Python-2.7.14/Lib/email/test

In some distributions, the extra space taken up by these test files is very valuable.

The default is to still include the test files.

---
 meta/recipes-devtools/python/python3_3.5.5.bb | 9 +++++++++
 meta/recipes-devtools/python/python_2.7.15.bb | 9 +++++++++
 2 files changed, 18 insertions(+)
meta/recipes-devtools/python/python3_3.5.5.bb +9 -0
index c919a97..5d1397a 100644
@@ -160,6 +160,11 @@ EOF
        fi
 }
 
+# Some packages include test/ directories and files. Provide option
+# to not include them.
+
+INCLUDE_TESTS ?= "1"
+
 do_install() {
        # make install needs the original Makefile, or otherwise the inclues would
        # go to ${D}${STAGING...}/...
@@ -189,6 +194,10 @@ do_install() {
        fi
 
        oe_multilib_header python${PYTHON_BINABI}/pyconfig.h
+
+    if [ "${INCLUDE_TESTS}" -ne "1" ]; then
+        find ${D}${libdir}/python${PYTHON_MAJMIN} -name test -exec rm -rf {} +;
+    fi
 }
 
 do_install_append_class-nativesdk () {
meta/recipes-devtools/python/python_2.7.15.bb +9 -1
index 82b65d2..1839624 100644
@@ -90,6 +90,11 @@ do_compile() {
                OPT="${CFLAGS}"
 }
 
+# Some packages include test/ directories and files. Provide option
+# to not include them.
+
+INCLUDE_TESTS ?= "1"
+
 do_install() {
        # make install needs the original Makefile, or otherwise the inclues would
        # go to ${D}${STAGING...}/...
@@ -127,6 +132,10 @@ do_install() {
     if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'bdb', d)}" ]; then
         rm -rf ${D}/${libdir}/python${PYTHON_MAJMIN}/bsddb
     fi
+
+    if [ "${INCLUDE_TESTS}" -ne "1" ]; then
+        find ${D}${libdir}/python${PYTHON_MAJMIN} -name test -exec rm -rf {} +;
+    fi
 }
 
 do_install_append_class-nativesdk () {
--

2.7.4

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#4 lore raw

Re: [PATCH 2/2] python/python3: Add option to remove test files

I'd just say that if those files are only needed by the test suite (python3 -mtest), it's easy to move them into the python-tests package
by editing the manifest. If they're not part of the test suite then
what are they?

I can't recall why there's a python3-sqlite3-tests package instead of just putting those tests into python3-tests and don't want to see more python3-[module]-tests packages.

Ross

Quoted 106 lines · Andrew Geissler
Quoted 3 lines · Ross

What are these files? Are they needed by the test suite? If so, lets just put them into python-tests along with the test suite.

I did have a brief email exchange with Alejandro in
http://lists.openembedded.org/pipermail/openembedded-core/2018-September/155471.html
where we talked about how certain packages require the test files
during build, so they'd need to be removed during install. I figured
it was easiest to just do them all during install.

I see that python2-manifest.json does have a sqlite3 and sqlite3-tests entry. Is that the type of thing I should try with the other packages or were you thinking something else?

I'm definitely very new to the python recipe, but willing to try out whatever you guys think best.

Thanks!
Andrew

Quoted 86 lines

Ross

Quoted 82 lines · Andrew Geissler

A quick search in the python package shows the following test directories being included in the python image:
./Python-2.7.14/Lib/bsddb/test ./Python-2.7.14/Lib/sqlite3/test ./Python-2.7.14/Lib/ctypes/test ./Python-2.7.14/Lib/unittest/test ./Python-2.7.14/Lib/lib-tk/test ./Python-2.7.14/Lib/email/test

In some distributions, the extra space taken up by these test files is very valuable.

The default is to still include the test files.

---
 meta/recipes-devtools/python/python3_3.5.5.bb | 9 +++++++++
 meta/recipes-devtools/python/python_2.7.15.bb | 9 +++++++++
 2 files changed, 18 insertions(+)
meta/recipes-devtools/python/python3_3.5.5.bb +9 -0
index c919a97..5d1397a 100644
@@ -160,6 +160,11 @@ EOF
        fi
 }
 
+# Some packages include test/ directories and files. Provide option
+# to not include them.
+
+INCLUDE_TESTS ?= "1"
+
 do_install() {
        # make install needs the original Makefile, or otherwise the inclues would
        # go to ${D}${STAGING...}/...
@@ -189,6 +194,10 @@ do_install() {
        fi
 
        oe_multilib_header python${PYTHON_BINABI}/pyconfig.h
+
+    if [ "${INCLUDE_TESTS}" -ne "1" ]; then
+        find ${D}${libdir}/python${PYTHON_MAJMIN} -name test -exec rm -rf {} +;
+    fi
 }
 
 do_install_append_class-nativesdk () {
meta/recipes-devtools/python/python_2.7.15.bb +9 -1
index 82b65d2..1839624 100644
@@ -90,6 +90,11 @@ do_compile() {
                OPT="${CFLAGS}"
 }
 
+# Some packages include test/ directories and files. Provide option
+# to not include them.
+
+INCLUDE_TESTS ?= "1"
+
 do_install() {
        # make install needs the original Makefile, or otherwise the inclues would
        # go to ${D}${STAGING...}/...
@@ -127,6 +132,10 @@ do_install() {
     if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'bdb', d)}" ]; then
         rm -rf ${D}/${libdir}/python${PYTHON_MAJMIN}/bsddb
     fi
+
+    if [ "${INCLUDE_TESTS}" -ne "1" ]; then
+        find ${D}${libdir}/python${PYTHON_MAJMIN} -name test -exec rm -rf {} +;
+    fi
 }
 
 do_install_append_class-nativesdk () {
--

2.7.4

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core