From bce573ef3cb448536456f807666d71cd69ae7ae2 Mon Sep 17 00:00:00 2001 From: Ivan Habunek Date: Wed, 10 Apr 2024 08:25:11 +0200 Subject: [PATCH] Update changelog --- CHANGELOG.md | 15 +++++++++++---- changelog.yaml | 9 +++++---- docs/changelog.md | 15 +++++++++++---- docs/commands/clips.md | 7 ++++++- docs/commands/download.md | 2 +- scripts/tag_version | 15 ++------------- 6 files changed, 36 insertions(+), 27 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fb6d4da..b101712 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,11 +3,18 @@ twitch-dl changelog -### [2.2.0 (TBA)](https://github.com/ihabunek/twitch-dl/releases/tag/2.2.0) +### [2.2.0 (2024-04-10)](https://github.com/ihabunek/twitch-dl/releases/tag/2.2.0) -* **Requires python 3.8 or later** -* Migrated to click lib for cli parsing -* Add shell auto completion +* **Requires Python 3.8+** +* Migrated to Click library for generating the commandline interface +* Add shell auto completion, see 'Shell completion' in docs. +* Add setting defaults via environment variables, see 'Environment variables' in + docs +* Add `download --concat` option to avoid using ffmeg for joinig vods and concat + them instead. This will produce a `.ts` file by default. +* Add `download --dry-run` option to skip actual download (thanks @metacoma) +* Add video description to metadata (#129) +* Add `clips --compact` option for listing clips in one-per-line mode ### [2.1.4 (2024-01-06)](https://github.com/ihabunek/twitch-dl/releases/tag/2.1.4) diff --git a/changelog.yaml b/changelog.yaml index 558957e..3eed87d 100644 --- a/changelog.yaml +++ b/changelog.yaml @@ -1,11 +1,12 @@ 2.2.0: - date: TBA + date: 2024-04-10 changes: - - "**Requires python 3.8 or later**" + - "**Requires Python 3.8+**" - "Migrated to Click library for generating the commandline interface" - - "Add shell auto completion, see: https://twitch-dl.bezdomni.net/shell_completion.html" - - "Add setting defaults via environment variables, see: https://twitch-dl.bezdomni.net/environment_variables.html" + - "Add shell auto completion, see 'Shell completion' in docs." + - "Add setting defaults via environment variables, see 'Environment variables' in docs" - "Add `download --concat` option to avoid using ffmeg for joinig vods and concat them instead. This will produce a `.ts` file by default." + - "Add `download --dry-run` option to skip actual download (thanks @metacoma)" - "Add video description to metadata (#129)" - "Add `clips --compact` option for listing clips in one-per-line mode" diff --git a/docs/changelog.md b/docs/changelog.md index fb6d4da..b101712 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -3,11 +3,18 @@ twitch-dl changelog -### [2.2.0 (TBA)](https://github.com/ihabunek/twitch-dl/releases/tag/2.2.0) +### [2.2.0 (2024-04-10)](https://github.com/ihabunek/twitch-dl/releases/tag/2.2.0) -* **Requires python 3.8 or later** -* Migrated to click lib for cli parsing -* Add shell auto completion +* **Requires Python 3.8+** +* Migrated to Click library for generating the commandline interface +* Add shell auto completion, see 'Shell completion' in docs. +* Add setting defaults via environment variables, see 'Environment variables' in + docs +* Add `download --concat` option to avoid using ffmeg for joinig vods and concat + them instead. This will produce a `.ts` file by default. +* Add `download --dry-run` option to skip actual download (thanks @metacoma) +* Add video description to metadata (#129) +* Add `clips --compact` option for listing clips in one-per-line mode ### [2.1.4 (2024-01-06)](https://github.com/ihabunek/twitch-dl/releases/tag/2.1.4) diff --git a/docs/commands/clips.md b/docs/commands/clips.md index 10e8f4d..f3d719b 100644 --- a/docs/commands/clips.md +++ b/docs/commands/clips.md @@ -18,6 +18,11 @@ twitch-dl clips [OPTIONS] CHANNEL_NAME Fetch all clips, overrides --limit + + -c, --compact + Show clips in compact mode, one line per video + + -d, --download Download clips in given period (in source quality) @@ -25,7 +30,7 @@ twitch-dl clips [OPTIONS] CHANNEL_NAME -l, --limit INTEGER - Number of clips to fetch [max: 100] [default: 10] + Number of clips to fetch. Defaults to 40 in compact mode, 10 otherwise. diff --git a/docs/commands/download.md b/docs/commands/download.md index e58e709..6428cfb 100644 --- a/docs/commands/download.md +++ b/docs/commands/download.md @@ -28,7 +28,7 @@ twitch-dl download [OPTIONS] [IDS]... --concat - Do not use ffmpeg to join files, concat them instead + Do not use ffmpeg to join files, concat them instead. This will produce a .ts file by default. diff --git a/scripts/tag_version b/scripts/tag_version index b1aacbd..c0bb38c 100755 --- a/scripts/tag_version +++ b/scripts/tag_version @@ -11,12 +11,10 @@ Usage: tag_version [version] import subprocess import sys import textwrap -import yaml -import twitchdl - from datetime import date from os import path -from pkg_resources import get_distribution + +import yaml path = path.join(path.dirname(path.dirname(path.abspath(__file__))), "changelog.yaml") with open(path, "r") as f: @@ -33,15 +31,6 @@ if not changelog_item: print(f"Version `{version}` not found in changelog.", file=sys.stderr) sys.exit(1) -if twitchdl.__version__ != version: - print(f"twitchdl.__version__ is `{twitchdl.__version__}`, expected {version}.", file=sys.stderr) - sys.exit(1) - -dist_version = get_distribution('twitch-dl').version -if dist_version != version: - print(f"Version in setup.py is `{dist_version}`, expected {version}.", file=sys.stderr) - sys.exit(1) - release_date = changelog_item["date"] changes = changelog_item["changes"] description = changelog_item["description"] if "description" in changelog_item else None