[wip] python 3.13 by dwoz · Pull Request #68927 · saltstack/salt

dwoz · 2026-04-13T08:03:38Z

What does this PR do?

What issues does this PR fix or reference?

Fixes

Previous Behavior

Remove this section if not relevant

New Behavior

Remove this section if not relevant

Merge requirements satisfied?

[NOTICE] Bug fixes or features added to Salt require tests.

Docs
Changelog - https://docs.saltproject.io/en/master/topics/development/changelog.html
Tests written/updated

Commits signed with GPG?

Yes/No

The setuptools-scm 10.0.2 sdist contains a pyproject.toml with a backend-path entry (../vcs-versioning/src) that points outside its own source tree — a developer's local monorepo path that was accidentally shipped in the release. pip 25.2 now validates that backend-path entries stay inside the source tree and rejects it. The wheel is fine since it bypasses pyproject.toml processing entirely.

`lxml` → requirements/base.txt: added lxml>=5.0.0; sys_platform != 'win32' (no cp312 wheels before 5.0.0) `ncclient` → requirements/static/ci/common.in: added ncclient>=0.6.16; sys_platform != 'win32' (SafeConfigParser removed in Python 3.12) `pygit2` → requirements/static/ci/{linux,darwin,windows}.in: bumped >=1.10.1 → >=1.14.0 (no cp312 wheels before 1.14.0)

…distutils, utcnow Agent-Logs-Url: https://github.com/saltstack/salt/sessions/8d432548-1f18-44b2-9fea-496226ca1f79 Co-authored-by: dwoz <1527763+dwoz@users.noreply.github.com>

…Subset, distutils, and utcnow Agent-Logs-Url: https://github.com/saltstack/salt/sessions/8d432548-1f18-44b2-9fea-496226ca1f79 Co-authored-by: dwoz <1527763+dwoz@users.noreply.github.com>

…ls, utcnow Agent-Logs-Url: https://github.com/saltstack/salt/sessions/2589ab85-0b14-4b58-a74b-0e3c226cb53d Co-authored-by: dwoz <1527763+dwoz@users.noreply.github.com>

…ypp_plugins.py, test_pip.py) Co-authored-by: dwoz <1527763+dwoz@users.noreply.github.com>

…d-pip test cases Agent-Logs-Url: https://github.com/saltstack/salt/sessions/ac7d00ce-330f-49d8-83c6-e7fcd6f5ed69 Co-authored-by: dwoz <1527763+dwoz@users.noreply.github.com>

Agent-Logs-Url: https://github.com/saltstack/salt/sessions/186b30f6-8024-4036-af58-06e11835d7bb Co-authored-by: dwoz <1527763+dwoz@users.noreply.github.com>

- tests/unit/test_zypp_plugins.py: replace `import imp` (removed in Python 3.12) with `importlib.util`, and replace `imp.load_source()` with `spec_from_file_location` + `module_from_spec` + `exec_module` - salt/modules/virtualenv_mod.py: fix `get_distribution_path` to use `importlib.metadata` instead of `pkg_resources`; old setuptools references `pkgutil.ImpImporter` which was removed in Python 3.12 - salt/utils/versions.py: replace `datetime.utcnow()` (deprecated in Python 3.12) with `datetime.now(datetime.timezone.utc)` to eliminate the DeprecationWarning that breaks test_deprecation_warnings[env0-False] Agent-Logs-Url: https://github.com/saltstack/salt/sessions/80a13379-dae2-4c51-bff3-d9e06c170f4b Co-authored-by: dwoz <1527763+dwoz@users.noreply.github.com>

Replace deprecated datetime.utcnow() calls with a compatibility function that uses datetime.now(timezone.utc) for Python 3.12+ and falls back to datetime.utcnow() for older versions. Also fix zeromq test that failed due to accessing uninitialized socket object by calling _init_socket() before socket access. Changes: - Add salt.utils.timeutil.utcnow() compatibility function - Replace all datetime.utcnow() calls across salt modules - Fix test_request_client_send_recv_loop_closed socket initialization

Use named argument format to avoid duplicate 'distribution' parameter in string formatting.

Replace datetime.datetime.utcnow() calls in transport_ssl.py test fixtures with salt.utils.timeutil.utcnow() to avoid deprecation warnings in Python 3.12+.

Replace remaining datetime.utcnow() calls in test files with salt.utils.timeutil.utcnow() to avoid deprecation errors when RAISE_DEPRECATIONS_RUNTIME_ERRORS=1 in Python 3.12+. Fixed files: - tests/pytests/functional/modules/test_system.py (8 occurrences) - tests/pytests/unit/test_fileserver.py (1 occurrence) - tests/pytests/unit/utils/test_aws.py (7 occurrences) - tests/unit/modules/test_x509.py (3 occurrences)

In Python 3.12, importlib.util.spec_from_file_location() returns None for files without .py extension when it cannot infer the loader. The zyppnotify file lacks a .py extension, causing the spec to be None and resulting in AttributeError when trying to access spec.loader. Fix by explicitly using importlib.machinery.SourceFileLoader to create the spec, which works regardless of file extension.

1. Fix datetime.utcnow() to return naive datetime - pytz.localize() requires naive datetime objects - Updated utcnow() wrapper to strip timezone info for compatibility 2. Add datetime.utcfromtimestamp() wrapper - Deprecated in Python 3.12 - Created utcfromtimestamp() in salt.utils.timeutil - Replaced all usages in salt/modules/: status, rpm_lowpkg, dpkg_lowpkg, aptpkg - Fixed test file: tests/pytests/unit/states/file/test_tidied.py - Removed unused datetime imports 3. Fix boto3 test collection error on Windows - tests/unit/utils/test_boto3mod.py was accessing boto3.__version__ even when boto3 not installed, causing NameError - Added HAS_BOTO3 check to version comparison skipif decorator

Use grains.get() with default value of 0 instead of direct dictionary access to handle cases where osmajorrelease grain is not available. Fixes test_owner and test_which failures on systems without osmajorrelease.

Ensure VirtualEnv test helper uses pip>=23.2 on Python 3.12+ to avoid distutils import errors. Old pip versions try to import the distutils module which was removed in Python 3.12. This fixes test_pip_installed_pkgs_test_mode and other virtualenv-based tests that were failing with "ModuleNotFoundError: No module named 'distutils'".

The legacy git code path in winrepo.update_git_repos() was storing result["result"] (a boolean) instead of the target directory path. This caused tests to fail with AttributeError when calling .endswith() on the boolean value. Changed to store gittarget (the actual path) to match the behavior of the non-legacy gitfs code and what tests expect. Fixes test_update_git_repos when GitPython/Pygit2 are not installed.

The backports module is not available in Python 3.12+ environments, even though sys.version_info < (3, 13) evaluates to True. The test was expecting backports to be included in thin.get_tops() output based solely on Python version, but salt/utils/thin.py correctly sets backports=None when the import fails. Fixed by checking salt.utils.thin.backports is not None instead of sys.version_info < (3, 13), matching the pattern used for has_immutables. Fixes test_get_tops, test_get_tops_extra_mods, and test_get_tops_so_mods on Python 3.12.

- Update noxfile and requirements for Python 3.12 (multidict, timelib) - Patch TestAccount and sshd_server to skip when privileges/binaries are missing - Fix masterapi KeyError in minion_publish - Resolve test environment crashes in test_config.py and test_saltcheck.py - Align multidict version across all static requirement files

- Update test_pip.py to handle dynamic extras paths (extras-3.12) - Fix path-list handling in extras_pypath fixture - Add skipif for setproctitle check when C-extension is non-functional

bdrx312 · 2026-04-13T15:30:09Z

tests/unit/modules/test_x509.py

+        not_after = salt.utils.timeutil.utcnow()
        # And set the UTC timezone to the naive datetime resulting from parsing
        not_after = not_after.replace(tzinfo=M2Crypto.ASN1.UTC)


I think these 2 lines should be update to be just

not_after = datetime.now(tzinfo=M2Crypto.ASN1.UTC)

and appears to be the case in other 2 places in this file.

bdrx312 · 2026-04-13T15:35:00Z

tests/support/pytest/transport_ssl.py

+        .not_valid_before(salt.utils.timeutil.utcnow())
+        .not_valid_after(salt.utils.timeutil.utcnow() + datetime.timedelta(days=365))


The utcnow calls in this file look like they have no need to use a zoneless datetime and can be replaced with datetime.now(timezone.utc)

bdrx312 · 2026-04-13T15:36:04Z

tests/pytests/unit/test_fileserver.py

+    now = salt.utils.timeutil.utcnow()
    future = now + datetime.timedelta(days=365)


This looks safe to use datetime.now(timezone.utc)

bdrx312 · 2026-04-13T15:37:02Z

tests/pytests/unit/utils/test_aws.py

    secret_access_key = "mock_SecretAccessKey"
    token = "mock_Token"
-    expiration = (datetime.utcnow() + timedelta(seconds=900)).strftime(
+    expiration = (salt.utils.timeutil.utcnow() + timedelta(seconds=900)).strftime(


All the changed usages in this class look safe to use datetime.now(timezone.utc).

bdrx312 · 2026-04-13T15:47:13Z

salt/utils/aws.py

+        if not __Expiration__ or __Expiration__ < salt.utils.timeutil.utcnow().strftime(
            "%Y-%m-%dT%H:%M:%SZ"
        ):


All utcnow changes in this file look like they can safely use datetime.now(timezone.utc)

bdrx312 · 2026-04-13T15:49:53Z

salt/spm/pkgdb/sqlite3.py

            formula_def["version"],
            formula_def["release"],
-            datetime.datetime.utcnow().strftime("%a, %d %b %Y %H:%M:%S GMT"),
+            salt.utils.timeutil.utcnow().strftime("%a, %d %b %Y %H:%M:%S GMT"),


Can safely use datetime.now(timezone.utc)

bdrx312 · 2026-04-13T15:53:03Z

salt/utils/timeutil.py

+        time_now = utcnow()
        time_at = time_now + dt


This can safely use datetime.now(timezone.utc)

… pip output for Windows debugging

dwoz and others added 30 commits April 11, 2026 21:55

Bump python version to 3.12

4be3ad2

Use wheel for attrs to avoid building setuptools-scm

1a7bdf7

Add pluggy to only-binary to avoid setuptools-scm

c0c2b05

Revert only binary changes

ec03b88

Fix multidict build on macos

6c49fdd

Fix ci deps

18c1dfa

more ci fixes

94602b1

Fix Python 3.12 test failures: imp module, assertDictContainsSubset, …

3b6005c

…distutils, utcnow Agent-Logs-Url: https://github.com/saltstack/salt/sessions/8d432548-1f18-44b2-9fea-496226ca1f79 Co-authored-by: dwoz <1527763+dwoz@users.noreply.github.com>

Fix Python 3.12 compatibility: remove uses of imp, assertDictContains…

20e2abe

…Subset, distutils, and utcnow Agent-Logs-Url: https://github.com/saltstack/salt/sessions/8d432548-1f18-44b2-9fea-496226ca1f79 Co-authored-by: dwoz <1527763+dwoz@users.noreply.github.com>

Fix Python 3.12 compatibility: imp, assertDictContainsSubset, distuti…

e8c4dfb

…ls, utcnow Agent-Logs-Url: https://github.com/saltstack/salt/sessions/2589ab85-0b14-4b58-a74b-0e3c226cb53d Co-authored-by: dwoz <1527763+dwoz@users.noreply.github.com>

Remove changes already fixed in pyversion branch (versions.py, test_z…

4de0f3d

…ypp_plugins.py, test_pip.py) Co-authored-by: dwoz <1527763+dwoz@users.noreply.github.com>

Fix Python 3.12 pip compatibility: update pip requirement and skip ol…

0e462fc

…d-pip test cases Agent-Logs-Url: https://github.com/saltstack/salt/sessions/ac7d00ce-330f-49d8-83c6-e7fcd6f5ed69 Co-authored-by: dwoz <1527763+dwoz@users.noreply.github.com>

Fix black formatting in tests/support/unit.py

af81c85

Agent-Logs-Url: https://github.com/saltstack/salt/sessions/186b30f6-8024-4036-af58-06e11835d7bb Co-authored-by: dwoz <1527763+dwoz@users.noreply.github.com>

Fix pylint duplicate string formatting argument warning

583b4c3

Use named argument format to avoid duplicate 'distribution' parameter in string formatting.

Fix Python 3.12 datetime deprecation in test SSL fixtures

601443b

Replace datetime.datetime.utcnow() calls in transport_ssl.py test fixtures with salt.utils.timeutil.utcnow() to avoid deprecation warnings in Python 3.12+.

Fix KeyError in test_pkg.py when osmajorrelease grain is missing

5f79464

Use grains.get() with default value of 0 instead of direct dictionary access to handle cases where osmajorrelease grain is not available. Fixes test_owner and test_which failures on systems without osmajorrelease.

Fix Python 3.12 regressions in package tests

73b3650

- Update test_pip.py to handle dynamic extras paths (extras-3.12) - Fix path-list handling in extras_pypath fixture - Add skipif for setproctitle check when C-extension is non-functional

Upgrade pyzmq to 27.1.0 for Python 3.13+

5ad91ce

Add Python 3.13 support to CI and Nox configuration

f197a29

dwoz had a problem deploying to ci April 13, 2026 11:23 — with GitHub Actions Failure

dwoz temporarily deployed to ci April 13, 2026 11:23 — with GitHub Actions Inactive

dwoz had a problem deploying to ci April 13, 2026 11:23 — with GitHub Actions Failure

dwoz temporarily deployed to ci April 13, 2026 11:23 — with GitHub Actions Inactive

dwoz had a problem deploying to ci April 13, 2026 12:23 — with GitHub Actions Failure

dwoz had a problem deploying to ci April 13, 2026 12:26 — with GitHub Actions Failure

dwoz temporarily deployed to ci April 13, 2026 12:26 — with GitHub Actions Inactive

dwoz had a problem deploying to ci April 13, 2026 12:26 — with GitHub Actions Failure

dwoz had a problem deploying to ci April 13, 2026 13:24 — with GitHub Actions Failure

dwoz temporarily deployed to ci April 13, 2026 13:26 — with GitHub Actions Inactive

dwoz had a problem deploying to ci April 13, 2026 13:26 — with GitHub Actions Failure

dwoz temporarily deployed to ci April 13, 2026 13:26 — with GitHub Actions Inactive

dwoz had a problem deploying to ci April 13, 2026 13:26 — with GitHub Actions Failure

bdrx312 reviewed Apr 13, 2026

View reviewed changes

Fix CI build failures: add missing build tools for DEB/RPM and enable…

351980e

… pip output for Windows debugging

dwoz temporarily deployed to ci April 14, 2026 00:48 — with GitHub Actions Inactive

dwoz had a problem deploying to ci April 14, 2026 01:00 — with GitHub Actions Failure

Add extensive debugging to Windows build scripts

2dd67cc

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[wip] python 3.13#68927

[wip] python 3.13#68927
dwoz wants to merge 34 commits intosaltstack:masterfrom
dwoz:pyversion313

dwoz commented Apr 13, 2026

Uh oh!

bdrx312 Apr 13, 2026

Uh oh!

bdrx312 Apr 13, 2026

Uh oh!

bdrx312 Apr 13, 2026

Uh oh!

bdrx312 Apr 13, 2026

Uh oh!

bdrx312 Apr 13, 2026

Uh oh!

bdrx312 Apr 13, 2026

Uh oh!

bdrx312 Apr 13, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		.not_valid_before(salt.utils.timeutil.utcnow())
		.not_valid_after(salt.utils.timeutil.utcnow() + datetime.timedelta(days=365))

		now = salt.utils.timeutil.utcnow()
		future = now + datetime.timedelta(days=365)

Conversation

dwoz commented Apr 13, 2026

What does this PR do?

What issues does this PR fix or reference?

Previous Behavior

New Behavior

Merge requirements satisfied?

Commits signed with GPG?

Uh oh!

bdrx312 Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

bdrx312 Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

bdrx312 Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

bdrx312 Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

bdrx312 Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

bdrx312 Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

bdrx312 Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants