mirror of
https://github.com/bellingcat/vk-url-scraper.git
synced 2026-06-08 03:18:37 +03:00
cleanup
This commit is contained in:
@@ -1,39 +0,0 @@
|
||||
from datetime import datetime
|
||||
from pathlib import Path
|
||||
|
||||
from vk_url_scraper.version import VERSION
|
||||
|
||||
|
||||
def main():
|
||||
changelog = Path("CHANGELOG.md")
|
||||
|
||||
with changelog.open() as f:
|
||||
lines = f.readlines()
|
||||
|
||||
insert_index: int = -1
|
||||
for i in range(len(lines)):
|
||||
line = lines[i]
|
||||
if line.startswith("## Unreleased"):
|
||||
insert_index = i + 1
|
||||
elif line.startswith(f"## [v{VERSION}]"):
|
||||
print("CHANGELOG already up-to-date")
|
||||
return
|
||||
elif line.startswith("## [v"):
|
||||
break
|
||||
|
||||
if insert_index < 0:
|
||||
raise RuntimeError("Couldn't find 'Unreleased' section")
|
||||
|
||||
lines.insert(insert_index, "\n")
|
||||
lines.insert(
|
||||
insert_index + 1,
|
||||
f"## [v{VERSION}](https://github.com/bellingcat/vk-url-scraper/releases/tag/v{VERSION}) - "
|
||||
f"{datetime.now().strftime('%Y-%m-%d')}\n",
|
||||
)
|
||||
|
||||
with changelog.open("w") as f:
|
||||
f.writelines(lines)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@@ -7,7 +7,6 @@ TAG=$(python -c 'from vk_url_scraper.version import VERSION; print("v" + VERSION
|
||||
read -p "Creating new release for $TAG. Do you want to continue? [Y/n] " prompt
|
||||
|
||||
if [[ $prompt == "y" || $prompt == "Y" || $prompt == "yes" || $prompt == "Yes" ]]; then
|
||||
python scripts/prepare_changelog.py
|
||||
git add -A
|
||||
git commit -m "Bump version to $TAG for release" || true && git push
|
||||
echo "Creating new git tag $TAG"
|
||||
|
||||
@@ -1,78 +0,0 @@
|
||||
# encoding: utf-8
|
||||
|
||||
"""
|
||||
Prepares markdown release notes for GitHub releases.
|
||||
"""
|
||||
|
||||
import os
|
||||
from typing import List, Optional
|
||||
|
||||
import packaging.version
|
||||
|
||||
TAG = os.environ["TAG"]
|
||||
|
||||
ADDED_HEADER = "### Added 🎉"
|
||||
CHANGED_HEADER = "### Changed ⚠️"
|
||||
FIXED_HEADER = "### Fixed ✅"
|
||||
REMOVED_HEADER = "### Removed 👋"
|
||||
|
||||
|
||||
def get_change_log_notes() -> str:
|
||||
in_current_section = False
|
||||
current_section_notes: List[str] = []
|
||||
with open("CHANGELOG.md") as changelog:
|
||||
for line in changelog:
|
||||
if line.startswith("## "):
|
||||
if line.startswith("## Unreleased"):
|
||||
continue
|
||||
if line.startswith(f"## [{TAG}]"):
|
||||
in_current_section = True
|
||||
continue
|
||||
break
|
||||
if in_current_section:
|
||||
if line.startswith("### Added"):
|
||||
line = ADDED_HEADER + "\n"
|
||||
elif line.startswith("### Changed"):
|
||||
line = CHANGED_HEADER + "\n"
|
||||
elif line.startswith("### Fixed"):
|
||||
line = FIXED_HEADER + "\n"
|
||||
elif line.startswith("### Removed"):
|
||||
line = REMOVED_HEADER + "\n"
|
||||
current_section_notes.append(line)
|
||||
assert current_section_notes
|
||||
return "## What's new\n\n" + "".join(current_section_notes).strip() + "\n"
|
||||
|
||||
|
||||
def get_commit_history() -> str:
|
||||
new_version = packaging.version.parse(TAG)
|
||||
|
||||
# Get all tags sorted by version, latest first.
|
||||
all_tags = os.popen("git tag -l --sort=-version:refname 'v*'").read().split("\n")
|
||||
|
||||
# Out of `all_tags`, find the latest previous version so that we can collect all
|
||||
# commits between that version and the new version we're about to publish.
|
||||
# Note that we ignore pre-releases unless the new version is also a pre-release.
|
||||
last_tag: Optional[str] = None
|
||||
for tag in all_tags:
|
||||
if not tag.strip(): # could be blank line
|
||||
continue
|
||||
version = packaging.version.parse(tag)
|
||||
if new_version.pre is None and version.pre is not None:
|
||||
continue
|
||||
if version < new_version:
|
||||
last_tag = tag
|
||||
break
|
||||
if last_tag is not None:
|
||||
commits = os.popen(f"git log {last_tag}..{TAG}^ --oneline --first-parent").read()
|
||||
else:
|
||||
commits = os.popen("git log --oneline --first-parent").read()
|
||||
return "## Commits\n\n" + commits
|
||||
|
||||
|
||||
def main():
|
||||
print(get_change_log_notes())
|
||||
print(get_commit_history())
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
Reference in New Issue
Block a user