Skip to content

Misc fixes to allow make, make fmt and make fmt-tip to pass #6507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ottok wants to merge 3 commits into from
Closed

Misc fixes to allow make, make fmt and make fmt-tip to pass #6507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ffef25e
fix: Make `make fmt` pass by fixing mypy errors in 'crypt' module stu…
ottok Oct 12, 2025
bb02287
fix: Fix `make fmt-tip` by limiting Pylint scope (#6507)
ottok Oct 12, 2025
ee9319a
fix: Allow running `make` on development versions (#6507)
ottok Oct 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cloudinit/distros/netbsd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from cloudinit import subp, util

try:
import crypt # pylint: disable=W4901
import crypt # type: ignore # pylint: disable=W4901

salt = crypt.METHOD_BLOWFISH # pylint: disable=E1101
blowfish_hash: Any = functools.partial(
Expand Down
2 changes: 1 addition & 1 deletion cloudinit/sources/DataSourceAzure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
from cloudinit.url_helper import UrlError

try:
import crypt # pylint: disable=W4901
import crypt # type: ignore # pylint: disable=W4901

blowfish_hash: Any = functools.partial(
crypt.crypt, salt=f"$6${util.rand_str(strlen=16)}"
Expand Down
22 changes: 16 additions & 6 deletions tools/read-version
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,22 @@ def main(use_tags: bool = False, output_json: bool = False):
)
is_release_branch_ci = github_ci_release_br or travis_ci_release_br

version, version_long = get_version_from_git(
src_version=src_version,
major_minor_version=major_minor_version,
use_tags=use_tags,
is_release_branch_ci=is_release_branch_ci,
)
if not os.environ.get("CI"):
# For local development runs (not CI), bypass git version to avoid
# mismatches with the code version during 'make' checks.
print(
"Bypassing git version check for local development",
file=sys.stderr,
)
version = src_version
version_long = ""
else:
version, version_long = get_version_from_git(
src_version=src_version,
major_minor_version=major_minor_version,
use_tags=use_tags,
is_release_branch_ci=is_release_branch_ci,
)

details = get_version_details(version, version_long, is_release_branch_ci)

Expand Down
2 changes: 1 addition & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ deps =
{[latest_versions]deps}
commands =
{envpython} -m ruff check {posargs:.}
{envpython} -m pylint {posargs:.}
{envpython} -m pylint {posargs:cloudinit/ tests/ tools/}
{envpython} -m black --check {posargs:.}
{envpython} -m isort --check-only --diff {posargs:.}
{envpython} -m mypy {posargs:cloudinit/ tests/ tools/}
Expand Down
Loading