nbdev 3.2.1__tar.gz → 3.2.2__tar.gz

{nbdev-3.2.1/nbdev.egg-info → nbdev-3.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nbdev
-Version: 3.2.1
+Version: 3.2.2
 Summary: Create delightful software with Jupyter Notebooks
 Author-email: "Jeremy Howard and the fast.ai community" <j@fast.ai>
 License: Apache-2.0
@@ -24,7 +24,7 @@ Requires-Dist: watchdog
 Requires-Dist: asttokens
 Requires-Dist: setuptools
 Requires-Dist: build
-Requires-Dist: fastgit
+Requires-Dist: fastgit>=0.0.7
 Requires-Dist: pyyaml
 Requires-Dist: tomli; python_version < "3.11"
 Provides-Extra: dev

{nbdev-3.2.1 → nbdev-3.2.2}/nbdev/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "3.2.1"
+__version__ = "3.2.2"
 
 from .doclinks import nbdev_export
 from .showdoc import show_doc

{nbdev-3.2.1 → nbdev-3.2.2}/nbdev/_modidx.py

@@ -313,11 +313,17 @@ d = { 'settings': { 'branch': 'main',
                                'nbdev.release.Release.changelog': ('api/release.html#release.changelog', 'nbdev/release.py'),
                                'nbdev.release.Release.latest_notes': ('api/release.html#release.latest_notes', 'nbdev/release.py'),
                                'nbdev.release.Release.release': ('api/release.html#release.release', 'nbdev/release.py'),
+                               'nbdev.release._check_changelog_base': ('api/release.html#_check_changelog_base', 'nbdev/release.py'),
                                'nbdev.release._find_config': ('api/release.html#_find_config', 'nbdev/release.py'),
                                'nbdev.release._get_conda_meta': ('api/release.html#_get_conda_meta', 'nbdev/release.py'),
+                               'nbdev.release._is_ancestor': ('api/release.html#_is_ancestor', 'nbdev/release.py'),
                                'nbdev.release._issue_txt': ('api/release.html#_issue_txt', 'nbdev/release.py'),
                                'nbdev.release._issues_txt': ('api/release.html#_issues_txt', 'nbdev/release.py'),
                                'nbdev.release._load_json': ('api/release.html#_load_json', 'nbdev/release.py'),
+                               'nbdev.release._release_branch': ('api/release.html#_release_branch', 'nbdev/release.py'),
+                               'nbdev.release._release_head': ('api/release.html#_release_head', 'nbdev/release.py'),
+                               'nbdev.release._remote_shas': ('api/release.html#_remote_shas', 'nbdev/release.py'),
+                               'nbdev.release._require_release_branch': ('api/release.html#_require_release_branch', 'nbdev/release.py'),
                                'nbdev.release._run': ('api/release.html#_run', 'nbdev/release.py'),
                                'nbdev.release._write_yaml': ('api/release.html#_write_yaml', 'nbdev/release.py'),
                                'nbdev.release.anaconda_upload': ('api/release.html#anaconda_upload', 'nbdev/release.py'),

{nbdev-3.2.1 → nbdev-3.2.2}/nbdev/diff.py

@@ -25,7 +25,7 @@ def read_nb_from_git(
     path = Path(path)
     if path.is_absolute(): path = path.relative_to(g.top())
     if ref is None: return read_nb(g.top()/path)
-    raw = g.show(f'{ref}:{path}', split=False)
+    raw = g.show(f'{ref}:{path}')
     return dict2nb(json.loads(raw))
 
 # %% ../nbs/api/19_diff.ipynb #3ac25702

{nbdev-3.2.1 → nbdev-3.2.2}/nbdev/release.py

@@ -40,6 +40,25 @@ def _load_json(cfg, k):
     try: return json.loads(cfg[k])
     except json.JSONDecodeError as e: raise Exception(f"Key: `{k}` in .ini file is not a valid JSON string: {e}")
 
+# %% ../nbs/api/18_release.ipynb #e5861010
+def _require_release_branch(branch):
+    if not branch: raise SystemExit('Cannot release from detached HEAD; create a maintenance branch first')
+    return branch
+
+def _release_branch(): return _require_release_branch(run('git branch --show-current').strip())
+def _is_ancestor(ref): return subprocess.run(['git', 'merge-base', '--is-ancestor', ref, 'HEAD'], capture_output=True).returncode == 0
+def _remote_shas(s): return {o.split()[0] for o in s.splitlines()}
+
+def _check_changelog_base(tag):
+    if _is_ancestor(tag): return
+    raise SystemExit(f'HEAD does not contain the latest release ({tag}). Write CHANGELOG.md manually, then run with --no_changelog.')
+
+def _release_head():
+    _release_branch()
+    head = run('git rev-parse HEAD').strip()
+    if head not in _remote_shas(run('git ls-remote --heads origin')): raise SystemExit(f'Release commit {head[:7]} is not on origin; push the current branch first')
+    return head
+
 # %% ../nbs/api/18_release.ipynb #dcaba486
 def update_changelog(txt, ver, notes, marker='<!-- do not remove -->\n'):
     "Insert `notes` into changelog `txt` after `marker`, replacing any existing section for `ver`"
@@ -80,12 +99,16 @@ async def changelog(self:Release,
     except APIError as e:
         if e.status_code != 404: raise
         lr,self.commit_date = None,'2000-01-01T00:00:004Z'
-    if lr and (Version(self.cfg.version) <= Version(lr.tag_name)): 
-        print(f'Error: Version bump required: expected: >{lr.tag_name}, got: {self.cfg.version}.')
-        raise SystemExit(1)
-    res = f"\n## {self.cfg.version}\n"
+    if lr:
+        run('git fetch --tags --quiet')
+        _check_changelog_base(lr.tag_name)
+        if Version(self.cfg.version) <= Version(lr.tag_name):
+            print(f'Error: Version bump required: expected: >{lr.tag_name}, got: {self.cfg.version}.')
+            raise SystemExit(1)
+    res = f"\n## {self.cfg.version}\n\n"
     issues = await self._issue_groups()
-    res += '\n'.join(_issues_txt(*o) for o in zip(issues, self.groups.values()))
+    sections = (_issues_txt(*o) for o in zip(issues, self.groups.values()))
+    res += '\n\n'.join(filter(None, sections))
     if debug: return res
     res = update_changelog(self.changefile.read_text(), self.cfg.version, res, marker)
     shutil.copy(self.changefile, self.changefile.with_suffix(".bak"))
@@ -98,7 +121,7 @@ async def release(self:Release):
     "Tag and create a release in GitHub for the current version"
     ver = self.cfg.version
     notes = self.latest_notes()
-    await self.gh.create_release(ver, branch=self.cfg.branch, body=notes)
+    await self.gh.create_release(ver, branch=_release_head(), body=notes)
     return ver
 
 # %% ../nbs/api/18_release.ipynb #22101171
@@ -143,11 +166,12 @@ async def release_gh(
 ):
     "Create the changelog, optionally edit it, then push and create the GitHub release"
     cfg = _find_config()
+    _release_branch()
     if not no_changelog: await Release(repo=repo).changelog()
     if not no_editor: subprocess.run([os.environ.get('EDITOR','nano'), cfg.config_path/'CHANGELOG.md'])
     if not yes and not input("Make release now? (y/n) ").lower().startswith('y'): sys.exit(1)
     run('git commit -am release')
-    run('git push')
+    run('git push --set-upstream origin HEAD')
     print(f"Released {await push_release(token, repo=repo)}")
 
 # %% ../nbs/api/18_release.ipynb #5b4d4aa2

{nbdev-3.2.1 → nbdev-3.2.2/nbdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nbdev
-Version: 3.2.1
+Version: 3.2.2
 Summary: Create delightful software with Jupyter Notebooks
 Author-email: "Jeremy Howard and the fast.ai community" <j@fast.ai>
 License: Apache-2.0
@@ -24,7 +24,7 @@ Requires-Dist: watchdog
 Requires-Dist: asttokens
 Requires-Dist: setuptools
 Requires-Dist: build
-Requires-Dist: fastgit
+Requires-Dist: fastgit>=0.0.7
 Requires-Dist: pyyaml
 Requires-Dist: tomli; python_version < "3.11"
 Provides-Extra: dev

{nbdev-3.2.1 → nbdev-3.2.2}/nbdev.egg-info/requires.txt

@@ -6,7 +6,7 @@ watchdog
 asttokens
 setuptools
 build
-fastgit
+fastgit>=0.0.7
 pyyaml
 
 [:python_version < "3.11"]

{nbdev-3.2.1 → nbdev-3.2.2}/pyproject.toml

@@ -20,7 +20,7 @@ classifiers = [
 ]
 dynamic = ["version"]
 dependencies = [ "fastcore>=1.14.6", "execnb>=0.2.4", "astunparse", "ghapi>=2.0.0", "watchdog", "asttokens",
-    "setuptools", "build", "fastgit", "pyyaml", "tomli; python_version < '3.11'", ]
+    "setuptools", "build", "fastgit>=0.0.7", "pyyaml", "tomli; python_version < '3.11'", ]
 
 [project.optional-dependencies]
 dev = [ "ipywidgets", "nbdev-numpy", "nbdev-stdlib", "pandas", "matplotlib", "black", "svg.py", "nbclassic",