Merge pull request #29 from sparks-baird/grayskull-patch

replace underscores with hyphens in naming scheme and correct meta.yaml section order

scripts/run_grayskull.py

@@ -1,11 +1,13 @@
 """Touch up the conda recipe from grayskull using conda-souschef."""
 import os
+from copy import copy
 from os import getcwd
 from os.path import basename, dirname, join, normpath
 from pathlib import Path
 from shutil import copyfile
 from warnings import warn
 
+import numpy as np
 from souschef.recipe import Recipe
 
 import mp_time_split as module
@@ -15,6 +17,11 @@
 
 name, version = module.__name__, module.__version__
 
+replace_underscores_with_hyphens = True
+
+if replace_underscores_with_hyphens:
+    name = name.replace("_", "-")
+
 src_dirname = "src"
 if basename(normpath(getcwd())) != src_dirname:
     warn(
@@ -44,8 +51,31 @@
 
 my_recipe = Recipe(load_file=fpath)
 
-bld = my_recipe["build"]
-bld.add_section({"noarch": "python"})
+# ensure proper order for conda-forge
+keys = list(my_recipe.keys())
+
+# https://docs.conda.io/projects/conda-build/en/latest/resources/define-metadata.html
+key_order = [
+    "package",
+    "source",
+    "build",
+    "requirements",
+    "test",
+    "outputs",
+    "about",
+    "app",
+    "extra",
+]
+unshared_keys = np.setdiff1d(key_order, keys)
+
+ordered_keys = copy(key_order)
+for key in unshared_keys:
+    ordered_keys.remove(key)
+
+for key in ordered_keys:
+    my_recipe.yaml.move_to_end(key)
+
+my_recipe["build"].add_section({"noarch": "python"})
 
 try:
     del my_recipe["build"]["skip"]
@@ -75,7 +105,8 @@
 
 my_recipe["about"]["doc_url"] = "mp-time-split.readthedocs.io"
 
-# # sometimes package names differ between PyPI and Anaconda but haven't been registered yet (e.g. `kaleido`) # noqa: E501
+# # sometimes package names differ between PyPI and Anaconda but haven't been registered
+# # yet on grayskull (e.g. `kaleido`)
 # my_recipe["requirements"]["run"].replace("kaleido", "python-kaleido")
 
 # # It's better to install some packages either exclusively via Anaconda or
@@ -89,8 +120,3 @@
 if personal_conda_channel:
     my_recipe.save(fpath2)
     copyfile("LICENSE.txt", join(dirname(fpath2), "LICENSE.txt"))
-
-# %% Code Graveyard
-# blank_id = bld.value.index("")
-# last_id = len(bld.value) - 1
-# bld.value[blank_id], bld.value[last_id] = bld.value[last_id], bld.value[blank_id]

setup.cfg

@@ -83,7 +83,7 @@ testing =
 # pyscaffold.cli =
 #     awesome = pyscaffoldext.awesome.extension:AwesomeExtension
 console_scripts =
-    mp_time_split = mp_time_split.core:run
+    mp-time-split = mp_time_split.core:run
 
 [tool:pytest]
 # Specify command line options as you would do when invoking pytest directly.