Skip to contentSkip to conversation

python3: move sqlite files into python-sqlite

PATCH In review Ross Burton 2 participants 2 messages Sep 26, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 python3: move sqlite files into python-sqlite

sqlite3/__init__.py was accidentally included in python3-misc.

---
 meta/recipes-devtools/python/python3/python3-manifest.json | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
meta/recipes-devtools/python/python3/python3-manifest.json +2 -4
index 539b7967b59..fe8bb992928 100644
@@ -994,13 +994,11 @@
         ],
         "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/*.py"
         ],
         "cached": [
             "${libdir}/python${PYTHON_MAJMIN}/sqlite3/__pycache__",
-            "${libdir}/python${PYTHON_MAJMIN}/sqlite3/__pycache__/dbapi2.*.pyc",
-            "${libdir}/python${PYTHON_MAJMIN}/sqlite3/__pycache__/dump.*.pyc"
+            "${libdir}/python${PYTHON_MAJMIN}/sqlite3/__pycache__/*.pyc"
         ]
     },
     "stringold": {
Signature · 1 line
2.11.0
#1 lore raw

Hey Ross,

Quoted 12 lines · Ross Burton

sqlite3/__init__.py was accidentally included in python3-misc.

---
  meta/recipes-devtools/python/python3/python3-manifest.json | 6 ++----
  1 file changed, 2 insertions(+), 4 deletions(-)
meta/recipes-devtools/python/python3/python3-manifest.json +0 -0
index 539b7967b59..fe8bb992928 100644

meta/recipes-devtools/python/python3/python3-manifest.json line 998

Quoted 7 lines
meta/recipes-devtools/python/python3/python3-manifest.json +1 -2
@@ -994,13 +994,11 @@
          ],
          "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/*.py"
          ],

For python modules that use an __init__.py file, they need to include the directory instead of the wildcard *.py, that way when the manifest is created it passes the whole directory to the new manifest, and it does check for dependencies with the directory name, otherwise the wildcard is just ignored and cant check for rdepends.

Cheers,

Alejandro

Quoted 8 lines
meta/recipes-devtools/python/python3/python3-manifest.json +1 -2
          "cached": [
              "${libdir}/python${PYTHON_MAJMIN}/sqlite3/__pycache__",
-            "${libdir}/python${PYTHON_MAJMIN}/sqlite3/__pycache__/dbapi2.*.pyc",
-            "${libdir}/python${PYTHON_MAJMIN}/sqlite3/__pycache__/dump.*.pyc"
+            "${libdir}/python${PYTHON_MAJMIN}/sqlite3/__pycache__/*.pyc"
          ]
      },
      "stringold": {