* [PATCH 2/3] python: mark the tests modules as special when updating the manifest
2018-09-28 16:06 [PATCH 1/3] python3: move sqlite files into python-sqlite Ross Burton
@ 2018-09-28 16:06 ` Ross Burton
2018-09-28 16:06 ` [PATCH 3/3] python: move sqlite module into python-sqlite Ross Burton
2018-09-28 19:30 ` [PATCH 1/3] python3: move sqlite files " Jeroen Hofstee
2 siblings, 0 replies; 4+ messages in thread
From: Ross Burton @ 2018-09-28 16:06 UTC (permalink / raw)
To: openembedded-core
We manually maintain the tests package's content and dependencies, so mark is as
special (matching create_manifest3.py).
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-devtools/python/python/create_manifest2.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/python/python/create_manifest2.py b/meta/recipes-devtools/python/python/create_manifest2.py
index 1af1443f476..87999991d73 100644
--- a/meta/recipes-devtools/python/python/create_manifest2.py
+++ b/meta/recipes-devtools/python/python/create_manifest2.py
@@ -137,7 +137,7 @@ for key in old_manifest:
# Handle special cases, we assume that when they were manually added
# to the manifest we knew what we were doing.
print ('Handling package %s' % key)
- special_packages=['misc', 'modules', 'dev']
+ special_packages=['misc', 'modules', 'tests', 'dev']
if key in special_packages or 'staticdev' in key:
print('Passing %s package directly' % key)
new_manifest[key]=old_manifest[key]
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 3/3] python: move sqlite module into python-sqlite
2018-09-28 16:06 [PATCH 1/3] python3: move sqlite files into python-sqlite Ross Burton
2018-09-28 16:06 ` [PATCH 2/3] python: mark the tests modules as special when updating the manifest Ross Burton
@ 2018-09-28 16:06 ` Ross Burton
2018-09-28 19:30 ` [PATCH 1/3] python3: move sqlite files " Jeroen Hofstee
2 siblings, 0 replies; 4+ messages in thread
From: Ross Burton @ 2018-09-28 16:06 UTC (permalink / raw)
To: openembedded-core
The module was accidentally included in python-misc.
Also re-run create_manifest to update the dependencies of python-sqlite3,
causing some whitespace changes.
[ YOCTO #12933 ]
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
.../python/python/python2-manifest.json | 24 ++++++++++++----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/meta/recipes-devtools/python/python/python2-manifest.json b/meta/recipes-devtools/python/python/python2-manifest.json
index 1e7004e05ea..260fa6f80d2 100644
--- a/meta/recipes-devtools/python/python/python2-manifest.json
+++ b/meta/recipes-devtools/python/python/python2-manifest.json
@@ -1,18 +1,18 @@
{
"tests": {
- "summary": "Python test suite",
+ "summary": "Python test suite",
"rdepends": [
- "core",
+ "core",
"modules"
- ],
+ ],
"files": [
- "${libdir}/python2.7/*/test",
- "${libdir}/python2.7/*/tests",
- "${libdir}/python2.7/idlelib/idle_test/",
+ "${libdir}/python2.7/*/test",
+ "${libdir}/python2.7/*/tests",
+ "${libdir}/python2.7/idlelib/idle_test/",
"${libdir}/python2.7/test"
- ],
+ ],
"cached": []
- },
+ },
"2to3": {
"summary": "Python automated Python 2 to 3 code translator",
"rdepends": [
@@ -881,10 +881,12 @@
"sqlite3": {
"summary": "Python Sqlite3 database support",
"rdepends": [
- "core"
+ "core",
+ "datetime"
],
"files": [
- "${libdir}/python2.7/lib-dynload/_sqlite3.so"
+ "${libdir}/python2.7/lib-dynload/_sqlite3.so",
+ "${libdir}/python2.7/sqlite3"
]
},
"stringold": {
@@ -1041,4 +1043,4 @@
"${libdir}/python2.7/lib-dynload/zlib.so"
]
}
-}
+}
\ No newline at end of file
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 1/3] python3: move sqlite files into python-sqlite
2018-09-28 16:06 [PATCH 1/3] python3: move sqlite files into python-sqlite Ross Burton
2018-09-28 16:06 ` [PATCH 2/3] python: mark the tests modules as special when updating the manifest Ross Burton
2018-09-28 16:06 ` [PATCH 3/3] python: move sqlite module into python-sqlite Ross Burton
@ 2018-09-28 19:30 ` Jeroen Hofstee
2 siblings, 0 replies; 4+ messages in thread
From: Jeroen Hofstee @ 2018-09-28 19:30 UTC (permalink / raw)
To: Ross Burton, openembedded-core@lists.openembedded.org
Thanks Ross,
build tested this and:
packages-split/python-sqlite3/usr/lib/python2.7/sqlite3/ now contains
__init__.py
test end up here:
packages-split/python-tests/usr/lib/python2.7/sqlite3/test/
So solved afaiac,
Regards,
Jeroen
On 09/28/2018 06:06 PM, Ross Burton wrote:
> sqlite3/__init__.py was accidentally included in python3-misc.
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
> meta/recipes-devtools/python/python3/python3-manifest.json | 9 ++-------
> 1 file changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/meta/recipes-devtools/python/python3/python3-manifest.json b/meta/recipes-devtools/python/python3/python3-manifest.json
> index 539b7967b59..f922561368d 100644
> --- a/meta/recipes-devtools/python/python3/python3-manifest.json
> +++ b/meta/recipes-devtools/python/python3/python3-manifest.json
> @@ -994,14 +994,9 @@
> ],
> "files": [
> "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_sqlite3.*.so",
> - "${libdir}/python${PYTHON_MAJMIN}/sqlite3/dbapi2.py",
> - "${libdir}/python${PYTHON_MAJMIN}/sqlite3/dump.py"
> + "${libdir}/python${PYTHON_MAJMIN}/sqlite3"
> ],
> - "cached": [
> - "${libdir}/python${PYTHON_MAJMIN}/sqlite3/__pycache__",
> - "${libdir}/python${PYTHON_MAJMIN}/sqlite3/__pycache__/dbapi2.*.pyc",
> - "${libdir}/python${PYTHON_MAJMIN}/sqlite3/__pycache__/dump.*.pyc"
> - ]
> + "cached": []
> },
> "stringold": {
> "summary": "Python string APIs [deprecated]",
^ permalink raw reply [flat|nested] 4+ messages in thread