fix wheel_file_dep

deathbeds · Dec 11, 2023 · 249271b · 249271b
1 parent f9cfc37
commit 249271b
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 4 deletions.
diff --git a/docs/_static/jupyak-v0.schema.json b/docs/_static/jupyak-v0.schema.json
@@ -1082,7 +1082,11 @@
         "pypi_to_conda": {
           "type": "object",
           "title": "pypi_to_conda",
-          "description": "names of PyPI distributions to replace with their conda-forge counterparts"
+          "description": "names of PyPI distributions to replace with their conda-forge counterparts",
+          "additionalProperties": {
+            "type": "string",
+            "description": "a normalized conda-forge name"
+          }
         },
         "python_version": {
           "type": "string",
@@ -1372,7 +1376,14 @@
         "wheel_file_dep": {
           "type": "object",
           "title": "wheel_file_dep",
-          "description": "extra files needed to build a given wheel"
+          "description": "extra files needed to build a given wheel",
+          "additionalProperties": {
+            "type": "array",
+            "description": "globs to files that need to be built before the wheel can be built",
+            "items": {
+              "type": "string"
+            }
+          }
         }
       }
     },

diff --git a/docs/_static/jupyak-v0.schema.toml b/docs/_static/jupyak-v0.schema.toml
@@ -1067,6 +1067,10 @@ type = "object"
 title = "pypi_to_conda"
 description = "names of PyPI distributions to replace with their conda-forge counterparts"
 
+["$defs".CondaEnv.properties.pypi_to_conda.additionalProperties]
+type = "string"
+description = "a normalized conda-forge name"
+
 ["$defs".CondaEnv.properties.python_version]
 type = "string"
 title = "python_version"
@@ -1335,6 +1339,13 @@ type = "object"
 title = "wheel_file_dep"
 description = "extra files needed to build a given wheel"
 
+["$defs".RepoLiteOptions.properties.wheel_file_dep.additionalProperties]
+type = "array"
+description = "globs to files that need to be built before the wheel can be built"
+
+["$defs".RepoLiteOptions.properties.wheel_file_dep.additionalProperties.items]
+type = "string"
+
 ["$defs".Task]
 title = "Task"
 description = "a subset of the doit task definition"

diff --git a/docs/_static/jupyak-v0.schema.yaml b/docs/_static/jupyak-v0.schema.yaml
@@ -804,6 +804,9 @@ $defs:
         title: pypi_to_conda
         description:
           names of PyPI distributions to replace with their conda-forge counterparts
+        additionalProperties:
+          type: string
+          description: a normalized conda-forge name
       python_version:
         type: string
         title: python_version
@@ -1032,6 +1035,12 @@ $defs:
         type: object
         title: wheel_file_dep
         description: extra files needed to build a given wheel
+        additionalProperties:
+          type: array
+          description:
+            globs to files that need to be built before the wheel can be built
+          items:
+            type: string
   Task:
     title: Task
     description: a subset of the doit task definition

diff --git a/src/jupyak/tasks/_yak.ipynb b/src/jupyak/tasks/_yak.ipynb
@@ -437,7 +437,9 @@
     "        help=\"the pypi-compatible specs for additional packages to install\",\n",
     "    )\n",
     "    pypi_to_conda = T.Dict(\n",
-    "        help=\"names of PyPI distributions to replace with their conda-forge counterparts\"\n",
+    "        key_trait=T.Unicode(help=\"a normalized PyPI dependency name\"),\n",
+    "        value_trait=T.Unicode(help=\"a normalized conda-forge name\"),\n",
+    "        help=\"names of PyPI distributions to replace with their conda-forge counterparts\",\n",
     "    )\n",
     "\n",
     "    @T.default(\"pypi_to_conda\")\n",
@@ -843,7 +845,14 @@
     "class RepoLiteOptions(HasSchema):\n",
     "    parent = T.Instance(\"jupyak.tasks._yak.Repo\").tag(schema=False)\n",
     "    wheel = T.Bool(False, help=\"whether to build and ship a noarch wheel for pyodide\")\n",
-    "    wheel_file_dep = T.Dict(help=\"extra files needed to build a given wheel\")\n",
+    "    wheel_file_dep = T.Dict(\n",
+    "        key_trait=T.Unicode(help=\"the importable name of the package\"),\n",
+    "        value_trait=TypedTuple(\n",
+    "            T.Unicode(),\n",
+    "            help=\"globs to files that need to be built before the wheel can be built\",\n",
+    "        ),\n",
+    "        help=\"extra files needed to build a given wheel\",\n",
+    "    )\n",
     "    needs_pth = TypedTuple(\n",
     "        T.Unicode(),\n",
     "        help=\"names of packages this repo provides that need to be installed before a lite site build\",\n",