packaging

Author: jph00

nbdev/release.py

@@ -201,8 +201,9 @@ def _get_conda_meta():
     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
 
-    hostreqs = ['pip', 'packaging', f'python >={cfg.min_python}']
-    if cfg.get('requirements'): reqs = hostreqs[-1:] + cfg.requirements.split()
+    hostreqs = ['packaging', f'python >={cfg.min_python}']
+    reqs = hostreqs+[]
+    if cfg.get('requirements'): reqs += cfg.requirements.split()
     if cfg.get('conda_requirements'): reqs += cfg.conda_requirements.split()
 
     pypi = pypi_json(f'{name}/{ver}')

nbs/api/18_release.ipynb

@@ -547,8 +547,9 @@
     "    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",
-    "    hostreqs = ['pip', 'packaging', f'python >={cfg.min_python}']\n",
-    "    if cfg.get('requirements'): reqs = hostreqs[-1:] + cfg.requirements.split()\n",
+    "    hostreqs = ['packaging', f'python >={cfg.min_python}']\n",
+    "    reqs = hostreqs+[]\n",
+    "    if cfg.get('requirements'): reqs += cfg.requirements.split()\n",
     "    if cfg.get('conda_requirements'): reqs += cfg.conda_requirements.split()\n",
     "\n",
     "    pypi = pypi_json(f'{name}/{ver}')\n",

setup.py

@@ -28,7 +28,8 @@
     '4 - Beta', '5 - Production/Stable', '6 - Mature', '7 - Inactive' ]
 py_versions = '3.7 3.8 3.9 3.10 3.11'.split()
 
-requirements = shlex.split(cfg.get('requirements', ''))
+requirements = ['packaging']
+requirements += shlex.split(cfg.get('requirements', ''))
 if cfg.get('pip_requirements'): requirements += shlex.split(cfg.get('pip_requirements', ''))
 min_python = cfg['min_python']
 lic = licenses.get(cfg['license'].lower(), (cfg['license'], None))