Support macOS defaulting to spawn as the default multiprocessing method

.pre-commit-config.yaml

@@ -139,34 +139,6 @@ repos:
           - --include=requirements/zeromq.txt
           - requirements/static/pkg/freebsd.in
 
-      - id: pip-tools-compile
-        alias: compile-pkg-darwin-3.7-zmq-requirements
-        name: Darwin Packaging Py3.7 ZeroMQ Requirements
-        files: ^(requirements/((base|zeromq|crypto|darwin|pyobjc)\.txt|static/pkg/(darwin\.in|py3\.7/darwin\.txt)))$
-        pass_filenames: false
-        args:
-          - -v
-          - --py-version=3.7
-          - --platform=darwin
-          - --include=requirements/darwin.txt
-          - --include=requirements/pyobjc.txt
-          - --passthrough-line-from-input=^pyobjc(.*)$
-          - requirements/static/pkg/darwin.in
-
-      - id: pip-tools-compile
-        alias: compile-pkg-darwin-3.8-zmq-requirements
-        name: Darwin Packaging Py3.8 ZeroMQ Requirements
-        files: ^(requirements/((base|zeromq|crypto|darwin|pyobjc)\.txt|static/pkg/(darwin\.in|py3\.8/darwin\.txt)))$
-        pass_filenames: false
-        args:
-          - -v
-          - --py-version=3.8
-          - --platform=darwin
-          - --include=requirements/darwin.txt
-          - --include=requirements/pyobjc.txt
-          - --passthrough-line-from-input=^pyobjc(.*)$
-          - requirements/static/pkg/darwin.in
-
       - id: pip-tools-compile
         alias: compile-pkg-darwin-3.9-zmq-requirements
         name: Darwin Packaging Py3.9 ZeroMQ Requirements
@@ -550,43 +522,6 @@ repos:
           - --pip-args=--constraint=requirements/static/ci/py{py_version}/freebsd.txt
           - requirements/static/ci/crypto.in
 
-
-      - id: pip-tools-compile
-        alias: compile-ci-darwin-py3.7-zmq-requirements
-        name: Darwin CI Py3.7 ZeroMQ Requirements
-        files: ^(pkg/osx/(req|req_pyobjc)\.txt|requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(darwin|common)\.in|pkg/py3\.7/darwin\.txt)))$
-        pass_filenames: false
-        args:
-          - -v
-          - --py-version=3.7
-          - --platform=darwin
-          - --include=requirements/darwin.txt
-          - --include=requirements/pyobjc.txt
-          - --include=requirements/pytest.txt
-          - --include=requirements/static/pkg/darwin.in
-          - --include=requirements/static/ci/common.in
-          - --passthrough-line-from-input=^pyobjc(.*)$
-          - --pip-args=--constraint=requirements/static/pkg/py{py_version}/darwin.txt
-          - requirements/static/ci/darwin.in
-
-      - id: pip-tools-compile
-        alias: compile-ci-darwin-py3.8-zmq-requirements
-        name: Darwin CI Py3.8 ZeroMQ Requirements
-        files: ^(pkg/osx/(req|req_pyobjc)\.txt|requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(darwin|common)\.in|pkg/py3\.8/darwin\.txt)))$
-        pass_filenames: false
-        args:
-          - -v
-          - --py-version=3.8
-          - --platform=darwin
-          - --include=requirements/darwin.txt
-          - --include=requirements/pyobjc.txt
-          - --include=requirements/pytest.txt
-          - --include=requirements/static/pkg/darwin.in
-          - --include=requirements/static/ci/common.in
-          - --passthrough-line-from-input=^pyobjc(.*)$
-          - --pip-args=--constraint=requirements/static/pkg/py{py_version}/darwin.txt
-          - requirements/static/ci/darwin.in
-
       - id: pip-tools-compile
         alias: compile-ci-darwin-py3.9-zmq-requirements
         name: Darwin CI Py3.9 ZeroMQ Requirements
@@ -623,32 +558,6 @@ repos:
           - --pip-args=--constraint=requirements/static/pkg/py{py_version}/darwin.txt
           - requirements/static/ci/darwin.in
 
-      - id: pip-tools-compile
-        alias: compile-ci-darwin-crypto-py3.7-requirements
-        name: Darwin CI Py3.7 Crypto Requirements
-        files: ^requirements/(crypto\.txt|static/ci/(crypto\.in|py3\.7/darwin-crypto\.txt))$
-        pass_filenames: false
-        args:
-          - -v
-          - --py-version=3.7
-          - --platform=darwin
-          - --out-prefix=darwin
-          - --pip-args=--constraint=requirements/static/ci/py{py_version}/darwin.txt
-          - requirements/static/ci/crypto.in
-
-      - id: pip-tools-compile
-        alias: compile-ci-darwin-crypto-py3.8-requirements
-        name: Darwin CI Py3.8 Crypto Requirements
-        files: ^requirements/(crypto\.txt|static/ci/(crypto\.in|py3\.8/darwin-crypto\.txt))$
-        pass_filenames: false
-        args:
-          - -v
-          - --py-version=3.8
-          - --platform=darwin
-          - --out-prefix=darwin
-          - --pip-args=--constraint=requirements/static/ci/py{py_version}/darwin.txt
-          - requirements/static/ci/crypto.in
-
       - id: pip-tools-compile
         alias: compile-ci-darwin-crypto-py3.9-requirements
         name: Darwin CI Py3.9 Crypto Requirements

changelog/55847.fixed

@@ -0,0 +1 @@
+Salt now correctly handles macOS after Py3.8 where python defaults to spawn instead of fork.

changelog/57742.fixed

@@ -0,0 +1 @@
+Improved the multiprocessing classes to better handle spawning platforms

changelog/60819.fixed

@@ -0,0 +1 @@
+The mac assistive execution module no longer shells out to change the database.

changelog/62005.fixed

@@ -0,0 +1 @@
+Temporary logging is now shutdown when logging has been configured.

cicd/jenkins/pr-macosx-catalina-x86_64-py3-pytest

@@ -8,12 +8,13 @@ runTestSuite(
     distro_arch: 'x86-64',
     env: env,
     jenkins_slave_label: 'kitchen-slave-mac',
-    kitchen_platforms_file: '/var/jenkins/workspace/pre-golden-platforms-new.yml',
+    kitchen_platforms_file: '/var/jenkins/workspace/pre-golden-platforms-new.3.9.yml',
     nox_env_name: 'pytest-zeromq',
     nox_passthrough_opts: '--ssh-tests',
     python_version: 'py3',
-    testrun_timeout: 6,
+    testrun_timeout: 10,
     use_spot_instances: false,
+    macos_python_version: '3.9',
 )
 
 // vim: ft=groovy

noxfile.py

@@ -326,7 +326,7 @@ def _run_with_coverage(session, *test_cmd, env=None):
             # Instruct sub processes to also run under coverage
             "COVERAGE_PROCESS_START": str(REPO_ROOT / ".coveragerc"),
         },
-        **coverage_base_env
+        **coverage_base_env,
     )
 
     try:
@@ -746,10 +746,6 @@ def _pytest(session, coverage, cmd_args):
     _create_ci_directories()
 
     env = {"CI_RUN": "1" if CI_RUN else "0"}
-    if IS_DARWIN:
-        # Don't nuke our multiprocessing efforts objc!
-        # https://stackoverflow.com/questions/50168647/multiprocessing-causes-python-to-crash-and-gives-an-error-may-have-been-in-progr
-        env["OBJC_DISABLE_INITIALIZE_FORK_SAFETY"] = "YES"
 
     if CI_RUN:
         # We'll print out the collected tests on CI runs.
@@ -771,7 +767,7 @@ def _pytest(session, coverage, cmd_args):
                 "pytest",
                 "--showlocals",
                 *cmd_args,
-                env=env
+                env=env,
             )
         else:
             session.run("python", "-m", "pytest", *cmd_args, env=env)
@@ -797,10 +793,10 @@ def _pytest(session, coverage, cmd_args):
                 "-m",
                 "pytest",
                 "--showlocals",
-                *cmd_args
+                *cmd_args,
             )
         else:
-            session.run("python", "-m", "pytest", *cmd_args, env=env)
+            session.run("python", "-m", "pytest", *cmd_args)
         # pylint: enable=unreachable