diff --git a/cloudinit/distros/netbsd.py b/cloudinit/distros/netbsd.py index 157aba06924..f458c3edf65 100644 --- a/cloudinit/distros/netbsd.py +++ b/cloudinit/distros/netbsd.py @@ -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( diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py index 06872659300..44c1ae28d4e 100644 --- a/cloudinit/sources/DataSourceAzure.py +++ b/cloudinit/sources/DataSourceAzure.py @@ -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)}" diff --git a/tools/read-version b/tools/read-version index f47edd1523a..a79b2faf3c2 100755 --- a/tools/read-version +++ b/tools/read-version @@ -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) diff --git a/tox.ini b/tox.ini index 4e801689577..48e92b552de 100644 --- a/tox.ini +++ b/tox.ini @@ -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/}