feat: add config option for line length warning #1574

Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,6 +4,7 @@ on:
		push:
		branches:
		- master
	workflow_dispatch:

		jobs:
		update-cli-screenshots:
Expand Down Expand Up		@@ -58,21 +59,19 @@ jobs:
		python -m pip install -U pip poetry poethepoet
		poetry --version
		poetry install --no-root --only documentation
	- name: Build docs
	env:
	GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
	run: \|
	poetry doc:build
		- name: Generate Sponsors 💖
		uses: JamesIves/github-sponsors-readme-action@v1
		with:
		token: ${{ secrets.PERSONAL_ACCESS_TOKEN_FOR_ORG }}
		file: "docs/README.md"
	- name: Push doc to Github Page
	uses: peaceiris/actions-gh-pages@v4
	organization: true
	- name: Build docs
	env:
	GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
	run: \|
	poetry doc:build
	- name: Deploy 🚀
	uses: JamesIves/github-pages-deploy-action@v4
		with:
	personal_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
	publish_branch: gh-pages
	publish_dir: ./site
	user_name: "github-actions[bot]"
	user_email: "github-actions[bot]@users.noreply.github.com"
	folder: ./site # The folder the action should deploy.
	branch: gh-pages

2 changes: 1 addition & 1 deletion .github/workflows/homebrewpublish.yml

Show comments View file Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,7 +24,7 @@ jobs:
		run: \|
		echo "project_version=$(cz version --project)" >> $GITHUB_ENV
		- name: Update Homebrew formula
	uses: dawidd6/action-homebrew-bump-formula@v4
	uses: dawidd6/action-homebrew-bump-formula@v5
		with:
		token: ${{secrets.PERSONAL_ACCESS_TOKEN}}
		formula: commitizen
Expand Down

11 changes: 8 additions & 3 deletions .pre-commit-config.yaml

Show comments View file Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,7 +24,7 @@ repos:
		- id: debug-statements
		- id: no-commit-to-branch
		- id: check-merge-conflict
	- id: check-toml
	- id: check-toml # TOML linter (syntax checker)
		- id: check-yaml
		args: [ '--unsafe' ] # for mkdocs.yml
		- id: detect-private-key
Expand Down Expand Up		@@ -55,17 +55,22 @@ repos:
		stages:
		- post-commit

	- repo: https://github.com/ComPWA/taplo-pre-commit
	rev: v0.9.3
	hooks:
	- id: taplo-format

		- repo: local
		hooks:
		- id: format
	name: Format
	name: Format Python code via Poetry
		language: system
		pass_filenames: false
		entry: poetry format
		types: [ python ]

		- id: linter and test
	name: Linters
	name: Linters via Poetry
		language: system
		pass_filenames: false
		entry: poetry lint
Expand Down

4 changes: 4 additions & 0 deletions .taplo.toml

Show comments View file Open in desktop

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@
	include = ["pyproject.toml", ".taplo.toml"]

	[formatting]
	indent_string = " "

42 changes: 23 additions & 19 deletions commitizen/changelog.py

Show comments View file Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -29,7 +29,7 @@

		import re
		from collections import OrderedDict, defaultdict
	from collections.abc import Generator, Iterable, Mapping, Sequence
	from collections.abc import Generator, Iterable, Mapping, MutableMapping, Sequence
		from dataclasses import dataclass
		from datetime import date
		from typing import TYPE_CHECKING, Any
Expand Down Expand Up		@@ -167,8 +167,8 @@ def process_commit_message(
		hook: MessageBuilderHook \| None,
		parsed: re.Match[str],
		commit: GitCommit,
	changes: dict[str \| None, list],
	change_type_map: dict[str, str] \| None = None,
	ref_changes: MutableMapping[str \| None, list],
	change_type_map: Mapping[str, str] \| None = None,
		) -> None:
		message: dict[str, Any] = {
		"sha1": commit.rev,
Expand All		@@ -178,13 +178,16 @@ def process_commit_message(
		**parsed.groupdict(),
		}

	if processed := hook(message, commit) if hook else message:
	messages = [processed] if isinstance(processed, dict) else processed
	for msg in messages:
	change_type = msg.pop("change_type", None)
	if change_type_map:
	change_type = change_type_map.get(change_type, change_type)
	changes[change_type].append(msg)
	processed_msg = hook(message, commit) if hook else message
	if not processed_msg:
	return

	messages = [processed_msg] if isinstance(processed_msg, dict) else processed_msg
	for msg in messages:
	change_type = msg.pop("change_type", None)
	if change_type_map:
	change_type = change_type_map.get(change_type, change_type)
	ref_changes[change_type].append(msg)


		def generate_ordered_changelog_tree(
Expand Down Expand Up		@@ -251,6 +254,7 @@ def incremental_build(
		unreleased_start = metadata.unreleased_start
		unreleased_end = metadata.unreleased_end
		latest_version_position = metadata.latest_version_position

		skip = False
		output_lines: list[str] = []
		for index, line in enumerate(lines):
Expand All		@@ -260,9 +264,7 @@ def incremental_build(
		skip = False
		if (
		latest_version_position is None
	or isinstance(latest_version_position, int)
	and isinstance(unreleased_end, int)
	and latest_version_position > unreleased_end
	or latest_version_position > unreleased_end
		):
		continue

Expand All		@@ -271,13 +273,15 @@ def incremental_build(

		if index == latest_version_position:
		output_lines.extend([new_content, "\n"])

		output_lines.append(line)
	if not isinstance(latest_version_position, int):
	if output_lines and output_lines[-1].strip():
	# Ensure at least one blank line between existing and new content.
	output_lines.append("\n")
	output_lines.append(new_content)

	if latest_version_position is not None:
	return output_lines

	if output_lines and output_lines[-1].strip():
	# Ensure at least one blank line between existing and new content.
	output_lines.append("\n")
	output_lines.append(new_content)
		return output_lines


Expand Down

11 changes: 3 additions & 8 deletions commitizen/cli.py

Show comments View file Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -52,16 +52,13 @@ def __call__(
		) -> None:
		if not isinstance(values, str):
		return
	if "=" not in values:

	key, sep, value = values.partition("=")
	if not key or not sep:
		raise InvalidCommandArgumentError(
		f"Option {option_string} expect a key=value format"
		)
		kwargs = getattr(namespace, self.dest, None) or {}
	key, value = values.split("=", 1)
	if not key:
	raise InvalidCommandArgumentError(
	f"Option {option_string} expect a key=value format"
	)
		kwargs[key] = value.strip("'\"")
		setattr(namespace, self.dest, kwargs)

Expand Down Expand Up		@@ -163,7 +160,6 @@ def __call__(
		{
		"name": ["-l", "--message-length-limit"],
		"type": int,
	"default": 0,
		"help": "length limit of the commit message; 0 for no limit",
		},
		{
Expand Down Expand Up		@@ -495,7 +491,6 @@ def __call__(
		{
		"name": ["-l", "--message-length-limit"],
		"type": int,
	"default": 0,
		"help": "length limit of the commit message; 0 for no limit",
		},
		],
Expand Down

61 changes: 22 additions & 39 deletions commitizen/commands/bump.py

Show comments View file Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -23,7 +23,6 @@
		NoPatternMapError,
		NotAGitProjectError,
		NotAllowed,
	NoVersionSpecifiedError,
		)
		from commitizen.providers import get_provider
		from commitizen.tags import TagRules
Expand Down Expand Up		@@ -163,11 +162,7 @@ def _find_increment(self, commits: list[git.GitCommit]) -> Increment \| None:
		def __call__(self) -> None:
		"""Steps executed to bump."""
		provider = get_provider(self.config)

	try:
	current_version = self.scheme(provider.get_version())
	except TypeError:
	raise NoVersionSpecifiedError()
	current_version = self.scheme(provider.get_version())

		increment = self.arguments["increment"]
		prerelease = self.arguments["prerelease"]
Expand All		@@ -177,36 +172,22 @@ def __call__(self) -> None:
		build_metadata = self.arguments["build_metadata"]
		get_next = self.arguments["get_next"]
		allow_no_commit = self.arguments["allow_no_commit"]
	major_version_zero = self.arguments["major_version_zero"]

		if manual_version:
	if increment:
	raise NotAllowed("--increment cannot be combined with MANUAL_VERSION")

	if prerelease:
	raise NotAllowed("--prerelease cannot be combined with MANUAL_VERSION")

	if devrelease is not None:
	raise NotAllowed("--devrelease cannot be combined with MANUAL_VERSION")

	if is_local_version:
	raise NotAllowed(
	"--local-version cannot be combined with MANUAL_VERSION"
	)

	if build_metadata:
	raise NotAllowed(
	"--build-metadata cannot be combined with MANUAL_VERSION"
	)

	if self.bump_settings["major_version_zero"]:
	raise NotAllowed(
	"--major-version-zero cannot be combined with MANUAL_VERSION"
	)

	if get_next:
	raise NotAllowed("--get-next cannot be combined with MANUAL_VERSION")

	if self.bump_settings["major_version_zero"] and current_version.release[0]:
	for val, option in (
	(increment, "--increment"),
	(prerelease, "--prerelease"),
	(devrelease is not None, "--devrelease"),
	(is_local_version, "--local-version"),
	(build_metadata, "--build-metadata"),
	(major_version_zero, "--major-version-zero"),
	(get_next, "--get-next"),
	):
	if val:
	raise NotAllowed(f"{option} cannot be combined with MANUAL_VERSION")

	if major_version_zero and current_version.release[0]:
		raise NotAllowed(
		f"--major-version-zero is meaningless for current version {current_version}"
		)
Expand All		@@ -215,11 +196,13 @@ def __call__(self) -> None:
		raise NotAllowed("--local-version cannot be combined with --build-metadata")

		if get_next:
	# if trying to use --get-next, we should not allow --changelog or --changelog-to-stdout
	if self.changelog_flag or self.changelog_to_stdout:
	raise NotAllowed(
	"--changelog or --changelog-to-stdout is not allowed with --get-next"
	)
	for value, option in (
	(self.changelog_flag, "--changelog"),
	(self.changelog_to_stdout, "--changelog-to-stdout"),
	):
	if value:
	raise NotAllowed(f"{option} cannot be combined with --get-next")

		# --get-next is a special case, taking precedence over config for 'update_changelog_on_bump'
		self.changelog_config = False
		# Setting dry_run to prevent any unwanted changes to the repo or files
Expand Down

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

feat: add config option for line length warning #1574

Are you sure you want to change the base?

Uh oh!

feat: add config option for line length warning #1574

Filter by extension

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!