Merge branch 'master' into vault-pillar-templating

saltstack · Nov 17, 2022 · 5e7e253 · 5e7e253
2 parents ee09aed + 7d0c774
commit 5e7e253
Show file tree

Hide file tree

Showing 61 changed files with 1,736 additions and 1,125 deletions.
diff --git a/changelog/49310.fixed b/changelog/49310.fixed
@@ -0,0 +1 @@
+Issue #49310: Allow users to touch a file with Unix date of birth
diff --git a/changelog/61153.added b/changelog/61153.added
@@ -0,0 +1 @@
+Initial work to allow parallel startup of proxy minions when used as sub proxies with Deltaproxy.
diff --git a/changelog/62019.fixed b/changelog/62019.fixed
@@ -0,0 +1 @@
+Make Salt to return an error on "pkg" modules and states when targeting duplicated package names
diff --git a/changelog/62139.fixed b/changelog/62139.fixed
@@ -0,0 +1 @@
+Fixed extra period in filename output in tls module. Instead of "server.crt." it will now be "server.crt".
diff --git a/changelog/62152.fixed b/changelog/62152.fixed
@@ -0,0 +1 @@
+Make sure lingering PAexec-*.exe files in the Windows directory are cleaned up
diff --git a/noxfile.py b/noxfile.py
@@ -309,11 +309,7 @@ def _run_with_coverage(session, *test_cmd, env=None):
     if SKIP_REQUIREMENTS_INSTALL is False:
         coverage_requirement = COVERAGE_REQUIREMENT
         if coverage_requirement is None:
-            version_info = _get_session_python_version_info(session)
-            if version_info < (3, 7):
-                coverage_requirement = "coverage==6.2"
-            else:
-                coverage_requirement = "coverage==6.5.0"
+            coverage_requirement = "coverage==5.2"
         session.install(
             "--progress-bar=off", coverage_requirement, silent=PIP_INSTALL_SILENT
         )

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -5,5 +5,7 @@ PyYAML
 MarkupSafe
 requests>=1.0.0
 distro>=1.0.1
-contextvars
 psutil>=5.0.0
+
+# We need contextvars for salt-ssh
+contextvars