minor fixes to release scripts (open-telemetry#1561)

alrex · web-flow · commit 06bbb8efaa1c · 2021-02-11T15:32:35.000-08:00
diff --git a/scripts/eachdist.py b/scripts/eachdist.py
@@ -533,13 +533,13 @@ def update_changelog(path, version, new_entry):
     try:
         with open(path) as changelog:
             text = changelog.read()
-            if "## Version {}".format(version) in text:
+            if "## [{}]".format(version) in text:
                 raise AttributeError(
                     "{} already contans version {}".format(path, version)
                 )
         with open(path) as changelog:
             for line in changelog:
-                if line.startswith("## Unreleased"):
+                if line.startswith("## [Unreleased]"):
                     unreleased_changes = False
                 elif line.startswith("## "):
                     break
@@ -552,26 +552,26 @@ def update_changelog(path, version, new_entry):
 
     if unreleased_changes:
         print("updating: {}".format(path))
-        text = re.sub("## Unreleased", new_entry, text)
+        text = re.sub(r"## \[Unreleased\].*", new_entry, text)
         with open(path, "w") as changelog:
             changelog.write(text)
 
 
-def update_changelogs(targets, version):
-    print("updating CHANGELOG")
+def update_changelogs(version):
     today = datetime.now().strftime("%Y-%m-%d")
-    new_entry = "## Unreleased\n\n## Version {}\n\nReleased {}".format(
-        version, today
+    new_entry = """## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v{version}...HEAD)
+
+## [{version}](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v{version}) - {today}
+
+""".format(
+        version=version, today=today
     )
     errors = False
-    for target in targets:
-        try:
-            update_changelog(
-                "{}/CHANGELOG.md".format(target), version, new_entry
-            )
-        except Exception as err:  # pylint: disable=broad-except
-            print(str(err))
-            errors = True
+    try:
+        update_changelog("./CHANGELOG.md", version, new_entry)
+    except Exception as err:  # pylint: disable=broad-except
+        print(str(err))
+        errors = True
 
     if errors:
         sys.exit(1)
@@ -637,7 +637,7 @@ def release_args(args):
     version = args.version
     update_dependencies(targets, version)
     update_version_files(targets, version)
-    update_changelogs(targets, version)
+    update_changelogs(version)
 
 
 def test_args(args):
diff --git a/scripts/prepare_release.sh b/scripts/prepare_release.sh
@@ -28,16 +28,14 @@ git reset --hard origin/main
 git checkout -b release/${VERSION}
 git push origin release/${VERSION}
 
-# create a temporary branch to create a PR for updated version and changelogs
-git checkout -b release/${VERSION}-auto
 ./scripts/eachdist.py release --version ${VERSION}
 rc=$?
 if [ $rc != 0 ]; then
     echo "::set-output name=version_updated::0"
     exit 0
 fi
 
-git add **/version.py **/setup.cfg **/CHANGELOG.md
+git add .
 
 git commit -m "updating changelogs and version to ${VERSION}"
 
