python*-manifest.json: add dependencies, runpy

* runpy allows running modules/scripts with 'python -m foo'
  - create explicit python2 and 3 packages rather than the
    misc catchall
* python3-setuptools and html.parser RDEPENDS on _markupbase
  - add to python3-core rather than misc catchall
* pip3 RDEPENDS on plistlib, http.client
  - already packaged in python2, add to python3
  - add http/ to -netclient
* "pip3 install" RDEPENDS on encodingds.idna
  - encodings.idna packaged in -core, but missing:
    - stringprep (move from -codecs to -core)
    - unicodedata (move from -codecs to -core)

(From OE-Core rev: 65a85c7db3de8d16ff91a5208a59cc2202d34e5b)

Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 49 insertions, 5 deletions

diff --git a/meta/recipes-devtools/python/python/python2-manifest.json b/meta/recipes-devtools/python/python/python2-manifest.json
index 8ebc715fc1..03d4bbde6a 100644
--- a/meta/recipes-devtools/python/python/python2-manifest.json
+++ b/meta/recipes-devtools/python/python/python2-manifest.json
@@ -597,6 +597,7 @@
             "re",
             "resource",
             "robotparser",
+            "runpy",
             "shell",
             "smtpd",
             "sqlite3",
@@ -815,6 +816,16 @@
         ],
         "summary": "Python robots.txt parser"
     },
+    "runpy": {
+        "files": [
+            "${libdir}/python2.7/runpy.py"
+        ],
+        "rdepends": [
+            "core",
+            "pkgutil"
+        ],
+        "summary": "Python helper for locating/executing scripts in module namespace"
+    },
     "shell": {
         "files": [
             "${libdir}/python2.7/cmd.py",
@@ -1029,4 +1040,4 @@
         ],
         "summary": "Python zlib compression support"
     }
-}
\ No newline at end of file
+}
diff --git a/meta/recipes-devtools/python/python3/python3-manifest.json b/meta/recipes-devtools/python/python3/python3-manifest.json
index 2d4c2ceb9f..92d0d00945 100644
--- a/meta/recipes-devtools/python/python3/python3-manifest.json
+++ b/meta/recipes-devtools/python/python3/python3-manifest.json
@@ -56,13 +56,10 @@
     },
     "codecs": {
         "cached": [
-            "${libdir}/python3.5/__pycache__/stringprep.*.pyc",
             "${libdir}/python3.5/__pycache__/xdrlib.*.pyc"
         ],
         "files": [
             "${libdir}/python3.5/lib-dynload/_multibytecodec.*.so",
-            "${libdir}/python3.5/lib-dynload/unicodedata.*.so",
-            "${libdir}/python3.5/stringprep.py",
             "${libdir}/python3.5/xdrlib.py"
         ],
         "rdepends": [
@@ -128,6 +125,7 @@
             "${libdir}/python3.5/__pycache__/__future__.*.pyc",
             "${libdir}/python3.5/__pycache__/_bootlocale.*.pyc",
             "${libdir}/python3.5/__pycache__/_collections_abc.*.pyc",
+            "${libdir}/python3.5/__pycache__/_markupbase.*.pyc",
             "${libdir}/python3.5/__pycache__/_sitebuiltins.*.pyc",
             "${libdir}/python3.5/__pycache__/_sysconfigdata.*.pyc",
             "${libdir}/python3.5/__pycache__/_weakrefset.*.pyc",
@@ -172,6 +170,7 @@
             "${libdir}/python3.5/__pycache__/sre_constants.*.pyc",
             "${libdir}/python3.5/__pycache__/sre_parse.*.pyc",
             "${libdir}/python3.5/__pycache__/stat.*.pyc",
+            "${libdir}/python3.5/__pycache__/stringprep.*.pyc",
             "${libdir}/python3.5/__pycache__/struct.*.pyc",
             "${libdir}/python3.5/__pycache__/subprocess.*.pyc",
             "${libdir}/python3.5/__pycache__/symbol.*.pyc",
@@ -209,6 +208,7 @@
             "${libdir}/python3.5/_abcoll.py",
             "${libdir}/python3.5/_bootlocale.py",
             "${libdir}/python3.5/_collections_abc.py",
+            "${libdir}/python3.5/_markupbase.py",
             "${libdir}/python3.5/_sitebuiltins.py",
             "${libdir}/python3.5/_sysconfigdata.py",
             "${libdir}/python3.5/_weakrefset.py",
@@ -264,6 +264,7 @@
             "${libdir}/python3.5/lib-dynload/readline.*.so",
             "${libdir}/python3.5/lib-dynload/select.*.so",
             "${libdir}/python3.5/lib-dynload/time.*.so",
+            "${libdir}/python3.5/lib-dynload/unicodedata.*.so",
             "${libdir}/python3.5/lib-dynload/xreadlines.*.so",
             "${libdir}/python3.5/linecache.py",
             "${libdir}/python3.5/locale.py",
@@ -284,6 +285,7 @@
             "${libdir}/python3.5/sre_constants.py",
             "${libdir}/python3.5/sre_parse.py",
             "${libdir}/python3.5/stat.py",
+            "${libdir}/python3.5/stringprep.py",
             "${libdir}/python3.5/struct.py",
             "${libdir}/python3.5/subprocess.py",
             "${libdir}/python3.5/symbol.py",
@@ -680,10 +682,12 @@
             "numbers",
             "pickle",
             "pkgutil",
+            "plistlib",
             "pprint",
             "profile",
             "pydoc",
             "resource",
+            "runpy",
             "shell",
             "smtpd",
             "sqlite3",
@@ -727,6 +731,8 @@
             "${libdir}/python3.5/base64.py",
             "${libdir}/python3.5/ftplib.py",
             "${libdir}/python3.5/hmac.py",
+            "${libdir}/python3.5/http",
+            "${libdir}/python3.5/http/__pycache__",
             "${libdir}/python3.5/mimetypes.py",
             "${libdir}/python3.5/nntplib.py",
             "${libdir}/python3.5/poplib.py",
@@ -826,6 +832,20 @@
         ],
         "summary": "Python package extension utility support"
     },
+    "plistlib": {
+        "cached": [
+            "${libdir}/python3.5/__pycache__/plistlib.*.pyc"
+        ],
+        "files": [
+            "${libdir}/python3.5/plistlib.py"
+        ],
+        "rdepends": [
+            "core",
+            "datetime",
+            "xml"
+        ],
+        "summary": "Generate and parse Mac OS X .plist files"
+    },
     "pprint": {
         "cached": [
             "${libdir}/python3.5/__pycache__/pprint.*.pyc"
@@ -835,7 +855,7 @@
         ],
         "rdepends": [
             "core"
-       ], 
+        ],
         "summary": "Python pretty-print support"
     },
     "profile": {
@@ -881,6 +901,19 @@
         ],
         "summary": "Python resource control interface"
     },
+    "runpy": {
+        "cached": [
+            "${libdir}/python3.5/__pycache__/runpy.*.pyc"
+        ],
+        "files": [
+            "${libdir}/python3.5/runpy.py"
+        ],
+        "rdepends": [
+            "core",
+            "pkgutil"
+        ],
+        "summary": "Python helper for locating/executing scripts in module namespace"
+    },
     "shell": {
         "cached": [
             "${libdir}/python3.5/__pycache__/cmd.*.pyc",