From 69646725563b60850c1a94c98ef6589c6ae8b9be Mon Sep 17 00:00:00 2001
From: Gyeongjae Choi <def6488@gmail.com>
Date: Tue, 30 Aug 2022 16:25:13 +0900
Subject: [PATCH] Fix incorrect package name of ruamel.yaml (#3036)

---
 conftest.py                                | 4 ++--
 docs/project/changelog.md                  | 3 +++
 packages/demes/meta.yaml                   | 2 +-
 packages/{ruamel => ruamel.yaml}/meta.yaml | 3 ++-
 pyodide-build/pyodide_build/buildall.py    | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)
 rename packages/{ruamel => ruamel.yaml}/meta.yaml (93%)

diff --git a/conftest.py b/conftest.py
index 33f200eab..2dc321320 100644
--- a/conftest.py
+++ b/conftest.py
@@ -67,13 +67,13 @@ def maybe_skip_test(item, delayed=False):
     if match and not is_common_test:
         package_name = match.group("name")
         if not package_is_built(package_name) and re.match(
-            rf"test_[\w\-]+\[({browsers})[^\]]*\]", item.name
+            rf"test_[\w\-\.]+\[({browsers})[^\]]*\]", item.name
         ):
             skip_msg = f"package '{package_name}' is not built."
 
     # Common package import test. Skip it if the package is not built.
     if skip_msg is None and is_common_test and item.name.startswith("test_import"):
-        match = re.match(rf"test_import\[({browsers})-(?P<name>[\w-]+)\]", item.name)
+        match = re.match(rf"test_import\[({browsers})-(?P<name>[\w\-\.]+)\]", item.name)
         if match:
             package_name = match.group("name")
             if not package_is_built(package_name):
diff --git a/docs/project/changelog.md b/docs/project/changelog.md
index d27368811..cb2107e89 100644
--- a/docs/project/changelog.md
+++ b/docs/project/changelog.md
@@ -41,6 +41,9 @@ substitutions:
   used by Pyodide's event loop.
   {pr}`2997`
 
+- {{ Fix }} Fix the incorrect package name `ruamel` to `ruamel.yaml`.
+  {pr}`3036`
+
 ### Build System
 
 - {{ Enhancement }} Added `requirements/host` key to the `meta.yaml` spec to allow
diff --git a/packages/demes/meta.yaml b/packages/demes/meta.yaml
index 55a8907ae..3f9336cc9 100644
--- a/packages/demes/meta.yaml
+++ b/packages/demes/meta.yaml
@@ -7,7 +7,7 @@ source:
 requirements:
   run:
     - attrs
-    - ruamel
+    - ruamel.yaml
 test:
   imports:
     - demes
diff --git a/packages/ruamel/meta.yaml b/packages/ruamel.yaml/meta.yaml
similarity index 93%
rename from packages/ruamel/meta.yaml
rename to packages/ruamel.yaml/meta.yaml
index a7b9fb0b3..6abdc002e 100644
--- a/packages/ruamel/meta.yaml
+++ b/packages/ruamel.yaml/meta.yaml
@@ -1,5 +1,5 @@
 package:
-  name: ruamel
+  name: ruamel.yaml
   version: 0.17.21
 source:
   url: https://files.pythonhosted.org/packages/9e/cb/938214ac358fbef7058343b3765c79a1b7ed0c366f7f992ce7ff38335652/ruamel.yaml-0.17.21-py3-none-any.whl
@@ -7,6 +7,7 @@ source:
 test:
   imports:
     - ruamel
+    - ruamel.yaml
 about:
   home: https://sourceforge.net/p/ruamel-yaml/code/ci/default/tree
   PyPI: https://pypi.org/project/ruamel.yaml
diff --git a/pyodide-build/pyodide_build/buildall.py b/pyodide-build/pyodide_build/buildall.py
index ba38e84be..915e02a3e 100755
--- a/pyodide-build/pyodide_build/buildall.py
+++ b/pyodide-build/pyodide_build/buildall.py
@@ -100,7 +100,7 @@ class Package(BasePackage):
         self.library = self.meta["build"].get("library", False)
         self.shared_library = self.meta["build"].get("sharedlibrary", False)
 
-        assert self.name == pkgdir.stem
+        assert self.name == pkgdir.name, f"{self.name} != {pkgdir.name}"
 
         self.run_dependencies = self.meta["requirements"].get("run", [])
         self.host_dependencies = self.meta["requirements"].get("host", [])