Merge pull request #230 from blink1073/fix-docs-header

jupyter-server · Dec 15, 2021 · 233f676 · 233f676
2 parents f827a42 + 4d730dd
commit 233f676
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/jupyter_releaser/changelog.py b/jupyter_releaser/changelog.py
@@ -125,15 +125,12 @@ def get_version_entry(
     entry = "\n".join(entry).strip()
 
     # Remove empty documentation entry if only automated changelogs were there
-    if "# Documentation improvements\n\n" in entry:
+    if (
+        "# Documentation improvements" in entry
+        and not "# Documentation improvements\n\n-" in entry
+    ):
         entry = re.sub(r"#+ Documentation improvements\n\n", "", entry)
 
-    # Replace "*" unordered list marker with "-" since this is what
-    # Prettier uses
-    # TODO: remove after github_activity 0.1.4+ is available
-    entry = re.sub(r"^\* ", "- ", entry)
-    entry = re.sub(r"\n\* ", "\n- ", entry)
-
     output = f"""
 ## {version}
 

diff --git a/jupyter_releaser/tests/util.py b/jupyter_releaser/tests/util.py
@@ -29,14 +29,14 @@
 
 ### Merged PRs
 
-* defining contributions [#14](https://github.com/executablebooks/github-activity/pull/14) ([@choldgraf](https://github.com/choldgraf))
-* updating CLI for new tags [#12](https://github.com/executablebooks/github-activity/pull/12) ([@choldgraf](https://github.com/choldgraf))
-* fixing link to changelog with refs [#11](https://github.com/executablebooks/github-activity/pull/11) ([@choldgraf](https://github.com/choldgraf))
-* adding contributors list [#10](https://github.com/executablebooks/github-activity/pull/10) ([@choldgraf](https://github.com/choldgraf))
-* some improvements to `since` and opened issues list [#8](https://github.com/executablebooks/github-activity/pull/8) ([@choldgraf](https://github.com/choldgraf))
-* Support git references etc. [#6](https://github.com/executablebooks/github-activity/pull/6) ([@consideRatio](https://github.com/consideRatio))
-* adding authentication information [#2](https://github.com/executablebooks/github-activity/pull/2) ([@choldgraf](https://github.com/choldgraf))
-* {PR_ENTRY}
+- defining contributions [#14](https://github.com/executablebooks/github-activity/pull/14) ([@choldgraf](https://github.com/choldgraf))
+- updating CLI for new tags [#12](https://github.com/executablebooks/github-activity/pull/12) ([@choldgraf](https://github.com/choldgraf))
+- fixing link to changelog with refs [#11](https://github.com/executablebooks/github-activity/pull/11) ([@choldgraf](https://github.com/choldgraf))
+- adding contributors list [#10](https://github.com/executablebooks/github-activity/pull/10) ([@choldgraf](https://github.com/choldgraf))
+- some improvements to `since` and opened issues list [#8](https://github.com/executablebooks/github-activity/pull/8) ([@choldgraf](https://github.com/choldgraf))
+- Support git references etc. [#6](https://github.com/executablebooks/github-activity/pull/6) ([@consideRatio](https://github.com/consideRatio))
+- adding authentication information [#2](https://github.com/executablebooks/github-activity/pull/2) ([@choldgraf](https://github.com/choldgraf))
+- {PR_ENTRY}
 
 ### Contributors to this release
 

diff --git a/setup.cfg b/setup.cfg
@@ -31,7 +31,7 @@ install_requires =
     check-manifest
     click
     ghapi
-    github-activity~=0.1
+    github-activity~=0.2
     importlib_resources
     jsonschema>=3.0.1
     pre-commit