Merge branch 'master' of github.com:fastai/nbdev

Author: deven-gqc

nbdev/migrate.py

@@ -17,7 +17,7 @@
 # %% ../nbs/api/migrate.ipynb 5
 def _cat_slug(fmdict):
     "Get the partial slug from the category front matter."
-    slug = '/'.join(sorted(fmdict.get('categories', '')))
+    slug = '/'.join(fmdict.get('categories', ''))
     return '/' + slug if slug else '' 
 
 # %% ../nbs/api/migrate.ipynb 7

nbdev/release.py

@@ -198,6 +198,9 @@ def _get_conda_meta():
     name,ver = cfg.lib_name,cfg.version
     url = cfg.doc_host or cfg.git_url
 
+    doc_url = (cfg.doc_host + cfg.doc_baseurl) if (cfg.doc_host and cfg.doc_baseurl) else url
+    dev_url = cfg.git_url if cfg.git_url else url
+
     reqs = ['pip', 'python', 'packaging']
     if cfg.get('requirements'): reqs += cfg.requirements.split()
     if cfg.get('conda_requirements'): reqs += cfg.conda_requirements.split()
@@ -222,7 +225,7 @@ def _get_conda_meta():
         'about': {
             'license': 'Apache Software',
             'license_family': 'APACHE',
-            'home': url, 'doc_url': url, 'dev_url': url,
+            'home': dev_url, 'doc_url': doc_url, 'dev_url': dev_url,
             'summary': cfg.get('description'),
             'description': descr
         },

nbs/api/migrate.ipynb

@@ -80,7 +80,7 @@
     "#|export\n",
     "def _cat_slug(fmdict):\n",
     "    \"Get the partial slug from the category front matter.\"\n",
-    "    slug = '/'.join(sorted(fmdict.get('categories', '')))\n",
+    "    slug = '/'.join(fmdict.get('categories', ''))\n",
     "    return '/' + slug if slug else '' "
    ]
   },
@@ -93,7 +93,7 @@
    "source": [
     "#|hide\n",
     "_fm1 = _get_fm('../../tests/2020-09-01-fastcore.ipynb')\n",
-    "test_eq(_cat_slug(_fm1), '/fastai/fastcore')\n",
+    "test_eq(_cat_slug(_fm1), '/fastcore/fastai')\n",
     "\n",
     "_fm2 = _get_fm('../../tests/2020-02-20-test.ipynb')\n",
     "test_eq(_cat_slug(_fm2), '/jupyter')"

nbs/api/release.ipynb

@@ -544,6 +544,9 @@
     "    name,ver = cfg.lib_name,cfg.version\n",
     "    url = cfg.doc_host or cfg.git_url\n",
     "\n",
+    "    doc_url = (cfg.doc_host + cfg.doc_baseurl) if (cfg.doc_host and cfg.doc_baseurl) else url\n",
+    "    dev_url = cfg.git_url if cfg.git_url else url\n",
+    "\n",
     "    reqs = ['pip', 'python', 'packaging']\n",
     "    if cfg.get('requirements'): reqs += cfg.requirements.split()\n",
     "    if cfg.get('conda_requirements'): reqs += cfg.conda_requirements.split()\n",
@@ -568,7 +571,7 @@
     "        'about': {\n",
     "            'license': 'Apache Software',\n",
     "            'license_family': 'APACHE',\n",
-    "            'home': url, 'doc_url': url, 'dev_url': url,\n",
+    "            'home': dev_url, 'doc_url': doc_url, 'dev_url': dev_url,\n",
     "            'summary': cfg.get('description'),\n",
     "            'description': descr\n",
     "        },\n",

nbs/migrating.ipynb

@@ -96,7 +96,7 @@
     "\n",
     "cat >>.gitignore <<EOF\n",
     "_docs/\n",
-    "sidebar.yml\n",
+    "_proc/\n",
     "EOF\n",
     "```\n",
     "\n",
@@ -164,6 +164,17 @@
     "---\n",
     "```\n",
     "\n",
+    "Or you can also add these flags in a markdown cell,\n",
+    "```md\n",
+    "# title\n",
+    "> description\n",
+    "\n",
+    "- skip_showdoc: true\n",
+    "- skip_exec: true\n",
+    "\n",
+    "```\n",
+    "\n",
+    "\n",
     "## Edit Workflow Permissions\n",
     "\n",
     "Make sure your workflow permissions are set to \"Read and write permissions\", which you can find in Settings &rarr; Actions &rarr; General &rarr; Workflow permissions:\n",

nbs/tutorials/tutorial.ipynb

@@ -1371,13 +1371,36 @@
     "To upload your project to pypi, just type `nbdev_pypi` in your project root directory. Once it's complete, a link to your project on pypi is displayed."
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "### Upload to conda\n",
+    "\n",
+    "Similar to `pip install` support, we have provided an anaconda compliant installer to upload your project to [anaconda](https://anaconda.org). Once uploaded, your package can be installed by typing `conda install -c your_anaconda_username your-project`.\n",
+    "\n",
+    "You need to register at anaconda (fill out the form to `Sign Up`) which will create a username and password. You will then need to install the following packages\n",
+    "\n",
+    "```\n",
+    "pip install anaconda-client conda-build conda-verify\n",
+    "```\n",
+    "\n",
+    "Before running the anaconda uploader, you need to login to conda using the CLI command (you will be prompted to enter your username and password)\n",
+    "\n",
+    "```\n",
+    "anaconda login\n",
+    "```\n",
+    "\n",
+    "To upload to anaconda, just type `nbdev_conda` in your project root directory."
+   ]
+  },
   {
    "cell_type": "markdown",
    "metadata": {},
    "source": [
     "### Upload to pypi and conda\n",
     "\n",
-    "The command `nbdev_release` from the root of your nbdev repo will bump the version of your module and upload your project to both conda and pypi."
+    "The command `nbdev_release_both` from the root of your nbdev repo will upload your project to both conda and pypi."
    ]
   },
   {