cumulusci-plus 5.0.8__py3-none-any.whl → 5.0.8.dev0__py3-none-any.whl

cumulusci/__about__.py

@@ -1 +1 @@
-__version__ = "5.0.8"
+__version__ = "5.0.8.dev0"

cumulusci/cli/cci.py

@@ -93,9 +93,16 @@ def _signal_handler(signum, frame):
         old_handler = signal.signal(signum, signal.SIG_IGN)
 
         try:
-            pgrp = os.getpgrp()
-            # Send signal to all processes in the group except ourselves
-            os.killpg(pgrp, signum)
+            # Only use process group termination on Unix systems
+            if hasattr(os, "getpgrp") and hasattr(os, "killpg"):
+                pgrp = os.getpgrp()
+                # Send signal to all processes in the group except ourselves
+                os.killpg(pgrp, signum)
+            else:
+                # On Windows, we can't use process groups, so just log the attempt
+                console.print(
+                    "[yellow]Process group termination not supported on this platform[/yellow]"
+                )
         finally:
             # Restore the original signal handler
             signal.signal(signum, old_handler)

cumulusci/cli/tests/test_cci.py

@@ -3,7 +3,6 @@ import io
 import os
 import signal
 import sys
-import tempfile
 from pathlib import Path
 from unittest import mock
 
@@ -26,17 +25,11 @@ CONSOLE = mock.Mock()
 
 
 @pytest.fixture(autouse=True)
-def env_config():
-    config = {
-        "global_tempdir": tempfile.gettempdir(),
-        "tempdir": tempfile.gettempdir(),
-    }
-
-    # Reset signal handler flag to ensure clean state for tests
+def reset_signal_handler_flag():
+    """Reset signal handler flag to ensure clean state for tests"""
+    cci._signal_handler_active = False
+    yield
     cci._signal_handler_active = False
-
-    with mock.patch.dict(os.environ, config):
-        yield
 
 
 @mock.patch("cumulusci.cli.cci.tee_stdout_stderr")
@@ -544,8 +537,8 @@ def test_dash_dash_version(
 
 @mock.patch("sys.exit")
 @mock.patch("cumulusci.cli.cci.Console")
-@mock.patch("os.killpg")
-@mock.patch("os.getpgrp")
+@mock.patch("os.killpg", create=True)
+@mock.patch("os.getpgrp", create=True)
 @mock.patch("signal.signal")
 def test_signal_handler_terminates_process_group(
     mock_signal, mock_getpgrp, mock_killpg, mock_console, mock_exit
@@ -557,38 +550,40 @@ def test_signal_handler_terminates_process_group(
     # Mock the global exit stack
     mock_exit_stack = mock.Mock()
     with mock.patch.object(cci, "_exit_stack", mock_exit_stack):
-        # Call the signal handler with SIGTERM
-        cci._signal_handler(signal.SIGTERM, None)
+        # Mock hasattr to return True for Unix functions
+        with mock.patch("builtins.hasattr", return_value=True):
+            # Call the signal handler with SIGTERM
+            cci._signal_handler(signal.SIGTERM, None)
 
-        # Verify console output
-        console_instance.print.assert_any_call(
-            "\n[yellow]Received SIGTERM - CumulusCI is being terminated[/yellow]"
-        )
-        console_instance.print.assert_any_call(
-            "[yellow]Exiting with failure code due to external cancellation.[/yellow]"
-        )
-        console_instance.print.assert_any_call(
-            "[yellow]Terminating child processes...[/yellow]"
-        )
+            # Verify console output
+            console_instance.print.assert_any_call(
+                "\n[yellow]Received SIGTERM - CumulusCI is being terminated[/yellow]"
+            )
+            console_instance.print.assert_any_call(
+                "[yellow]Exiting with failure code due to external cancellation.[/yellow]"
+            )
+            console_instance.print.assert_any_call(
+                "[yellow]Terminating child processes...[/yellow]"
+            )
 
-        # Verify cleanup was called
-        mock_exit_stack.close.assert_called_once()
+            # Verify cleanup was called
+            mock_exit_stack.close.assert_called_once()
 
-        # Verify signal was temporarily ignored and then restored
-        mock_signal.assert_called()
+            # Verify signal was temporarily ignored and then restored
+            mock_signal.assert_called()
 
-        # Verify process group was terminated
-        mock_getpgrp.assert_called_once()
-        mock_killpg.assert_called_once_with(1234, signal.SIGTERM)
+            # Verify process group was terminated
+            mock_getpgrp.assert_called_once()
+            mock_killpg.assert_called_once_with(1234, signal.SIGTERM)
 
-        # Verify exit with correct code
-        mock_exit.assert_called_once_with(143)
+            # Verify exit with correct code
+            mock_exit.assert_called_once_with(143)
 
 
 @mock.patch("sys.exit")
 @mock.patch("cumulusci.cli.cci.Console")
-@mock.patch("os.killpg")
-@mock.patch("os.getpgrp")
+@mock.patch("os.killpg", create=True)
+@mock.patch("os.getpgrp", create=True)
 @mock.patch("signal.signal")
 def test_signal_handler_sigint(
     mock_signal, mock_getpgrp, mock_killpg, mock_console, mock_exit
@@ -600,19 +595,21 @@ def test_signal_handler_sigint(
     # Mock the global exit stack
     mock_exit_stack = mock.Mock()
     with mock.patch.object(cci, "_exit_stack", mock_exit_stack):
-        # Call the signal handler with SIGINT
-        cci._signal_handler(signal.SIGINT, None)
+        # Mock hasattr to return True for Unix functions
+        with mock.patch("builtins.hasattr", return_value=True):
+            # Call the signal handler with SIGINT
+            cci._signal_handler(signal.SIGINT, None)
 
-        # Verify console output
-        console_instance.print.assert_any_call(
-            "\n[yellow]Received SIGINT - CumulusCI is being terminated[/yellow]"
-        )
+            # Verify console output
+            console_instance.print.assert_any_call(
+                "\n[yellow]Received SIGINT - CumulusCI is being terminated[/yellow]"
+            )
 
-        # Verify process group was terminated with SIGINT
-        mock_killpg.assert_called_once_with(1234, signal.SIGINT)
+            # Verify process group was terminated with SIGINT
+            mock_killpg.assert_called_once_with(1234, signal.SIGINT)
 
-        # Verify exit with correct code for SIGINT
-        mock_exit.assert_called_once_with(130)
+            # Verify exit with correct code for SIGINT
+            mock_exit.assert_called_once_with(130)
 
 
 @mock.patch("sys.exit")
@@ -635,8 +632,8 @@ def test_signal_handler_prevents_recursion(mock_console, mock_exit):
 
 @mock.patch("sys.exit")
 @mock.patch("cumulusci.cli.cci.Console")
-@mock.patch("os.killpg")
-@mock.patch("os.getpgrp")
+@mock.patch("os.killpg", create=True)
+@mock.patch("os.getpgrp", create=True)
 @mock.patch("signal.signal")
 def test_signal_handler_handles_killpg_error(
     mock_signal, mock_getpgrp, mock_killpg, mock_console, mock_exit
@@ -646,8 +643,10 @@ def test_signal_handler_handles_killpg_error(
     mock_getpgrp.return_value = 1234
     mock_killpg.side_effect = OSError("Process group not found")
 
-    # Call the signal handler with SIGTERM
-    cci._signal_handler(signal.SIGTERM, None)
+    # Mock hasattr to return True for Unix functions
+    with mock.patch("builtins.hasattr", return_value=True):
+        # Call the signal handler with SIGTERM
+        cci._signal_handler(signal.SIGTERM, None)
 
     # Verify error message was printed
     console_instance.print.assert_any_call(
@@ -661,27 +660,39 @@ def test_signal_handler_handles_killpg_error(
 @mock.patch("sys.exit")
 @mock.patch("cumulusci.cli.cci.Console")
 def test_signal_handler_without_process_group_support(mock_console, mock_exit):
-    """Test that the signal handler works on systems without process group support"""
+    """Test that the signal handler works on Windows where process groups aren't supported"""
     console_instance = mock_console.return_value
 
     # Mock the global exit stack
     mock_exit_stack = mock.Mock()
-
-    # Mock os module to not have killpg or getpgrp
     with mock.patch.object(cci, "_exit_stack", mock_exit_stack):
-        with mock.patch.object(os, "killpg", None, create=True):
-            with mock.patch.object(os, "getpgrp", None, create=True):
-                # Call the signal handler with SIGTERM
-                cci._signal_handler(signal.SIGTERM, None)
-
-                # Verify basic functionality still works
-                console_instance.print.assert_any_call(
-                    "\n[yellow]Received SIGTERM - CumulusCI is being terminated[/yellow]"
-                )
-                mock_exit.assert_called_once_with(143)
-
-
-@mock.patch("os.setpgrp")
+        # Mock hasattr to return False for Unix functions (like on Windows)
+        with mock.patch("builtins.hasattr", return_value=False):
+            # Call the signal handler with SIGTERM
+            cci._signal_handler(signal.SIGTERM, None)
+
+            # Verify console output
+            console_instance.print.assert_any_call(
+                "\n[yellow]Received SIGTERM - CumulusCI is being terminated[/yellow]"
+            )
+            console_instance.print.assert_any_call(
+                "[yellow]Exiting with failure code due to external cancellation.[/yellow]"
+            )
+            console_instance.print.assert_any_call(
+                "[yellow]Terminating child processes...[/yellow]"
+            )
+            console_instance.print.assert_any_call(
+                "[yellow]Process group termination not supported on this platform[/yellow]"
+            )
+
+            # Verify cleanup was called
+            mock_exit_stack.close.assert_called_once()
+
+            # Verify exit with correct code
+            mock_exit.assert_called_once_with(143)
+
+
+@mock.patch("os.setpgrp", create=True)
 def test_main_creates_process_group(mock_setpgrp):
     """Test that main() creates a new process group"""
     # Mock dependencies to avoid actual CLI execution
@@ -711,7 +722,7 @@ def test_main_creates_process_group(mock_setpgrp):
         mock_setpgrp.assert_called_once()
 
 
-@mock.patch("os.setpgrp")
+@mock.patch("os.setpgrp", create=True)
 def test_main_handles_setpgrp_error(mock_setpgrp):
     """Test that main() handles setpgrp errors gracefully"""
     mock_setpgrp.side_effect = OSError("Operation not permitted")

cumulusci/tasks/vcs/tests/github/test_download_extract.py

@@ -373,20 +373,24 @@ class TestDownloadExtract:
 
     def test_set_target_directory__absolute_path(self):
         """Test _set_target_directory with absolute path"""
-        absolute_path = "/tmp/test_dir"
-        task_config = TaskConfig(
-            {
-                "options": {
-                    "repo_url": self.repo_url,
-                    "target_directory": absolute_path,
+        absolute_path = tempfile.mkdtemp(prefix="test_")
+        try:
+            task_config = TaskConfig(
+                {
+                    "options": {
+                        "repo_url": self.repo_url,
+                        "target_directory": absolute_path,
+                    }
                 }
-            }
-        )
-        task = DownloadExtract(self.project_config, task_config)
+            )
+            task = DownloadExtract(self.project_config, task_config)
 
-        task._set_target_directory()
+            task._set_target_directory()
 
-        assert task.options["target_directory"] == absolute_path
+            assert task.options["target_directory"] == absolute_path
+        finally:
+            # Clean up the temporary directory
+            os.rmdir(absolute_path)
 
     def test_rename_files(self):
         """Test _rename_files method"""

{cumulusci_plus-5.0.8.dist-info → cumulusci_plus-5.0.8.dev0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cumulusci-plus
-Version: 5.0.8
+Version: 5.0.8.dev0
 Summary: Build and release tools for Salesforce developers
 Project-URL: Homepage, https://github.com/jorgesolebur/CumulusCI
 Project-URL: Changelog, https://cumulusci.readthedocs.io/en/stable/history.html

{cumulusci_plus-5.0.8.dist-info → cumulusci_plus-5.0.8.dev0.dist-info}/RECORD

@@ -1,10 +1,10 @@
-cumulusci/__about__.py,sha256=iknMV3i3Ktpb-eCRBUG-Q--oWKy45MyfhUxfGmOFozU,22
+cumulusci/__about__.py,sha256=nnWzpE6c_AzsihHEu6Ul-b8Oj0n88PpGCNkmHuwzmis,27
 cumulusci/__init__.py,sha256=jdanFQ_i8vbdO7Eltsf4pOfvV4mwa_Osyc4gxWKJ8ng,764
 cumulusci/__main__.py,sha256=kgRH-n5AJrH_daCK_EJwH7azAUxdXEmpi-r-dPGMR6Y,43
 cumulusci/conftest.py,sha256=AIL98BDwNAQtdo8YFmLKwav0tmrQ5dpbw1cX2FyGouQ,5108
 cumulusci/cumulusci.yml,sha256=FE1Dm7EhcMXY-XtLljbcbRyo_E0tvspaxqh8Nsiup3w,72365
 cumulusci/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cumulusci/cli/cci.py,sha256=fDA3Kym5OoKOsjW4YSPxCLnGIu9y7NrCiIZHvial2ck,11513
+cumulusci/cli/cci.py,sha256=NcFm0Nng5o47fAMcjpSHjWRvQKDbD2lwPSkuoCVW9eA,11901
 cumulusci/cli/error.py,sha256=znj0YN8D2Grozm1u7mZAsJlmmdGebbuy0c1ofQluL4Q,4410
 cumulusci/cli/flow.py,sha256=rN_9WL2Z6dcx-oRngChIgei3E5Qmg3XVzk5ND1o0i3s,6171
 cumulusci/cli/logger.py,sha256=bpzSD0Bm0BAwdNbVR6yZXMREh2vm7jOytZevEaNoVR4,2267
@@ -18,7 +18,7 @@ cumulusci/cli/task.py,sha256=xm8lo0_LMMpcsUDv1Gj_HpW1phllyEW9IRm2lQSh5wg,10077
 cumulusci/cli/ui.py,sha256=Ld-2S6Kr204SBput-1pNAVlYglzcvbV5nVA_rGXlAo8,7346
 cumulusci/cli/utils.py,sha256=Bl-l8eOXxzi6E_DsWGGGeefwZxrVg7Zo52BIwoNhKH8,5522
 cumulusci/cli/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cumulusci/cli/tests/test_cci.py,sha256=oosAcnp3CCkRSs_izsT8zPTXoDUdbPO-_pfCoaTACGk,26917
+cumulusci/cli/tests/test_cci.py,sha256=p9PYNij3dB3dNwOg9ivPSzVw179WORFVMfRpkWW68pg,27891
 cumulusci/cli/tests/test_error.py,sha256=zU2ccfGOivcVMpCManam18uyhlzT-HFb9xuMljU4few,6629
 cumulusci/cli/tests/test_flow.py,sha256=CIkZWvai5H4EOs35epMKWmxzDfauIEqL6BUwC8q3LPU,8535
 cumulusci/cli/tests/test_logger.py,sha256=-XBwSmtuelpx5sax0_E2xi4F9m_UsRkt2gn1o9ub6h8,834
@@ -622,7 +622,7 @@ cumulusci/tasks/vcs/release.py,sha256=xXim12XVij34LRK6kAQ_5qeQLlYHNtx4e386doQCxh
 cumulusci/tasks/vcs/release_report.py,sha256=B8ehl6PK7kaEI_jS-rapQfNm0bhJRR7LBL4WFq1meNE,4226
 cumulusci/tasks/vcs/tag.py,sha256=x9Xw5t6g13ztl0TjtclQ1_JRBWtez73e9Az8oYJeqvU,1098
 cumulusci/tasks/vcs/tests/github/test_commit_status.py,sha256=1IAGz8_wFVUvk0wY5V_Aetb6M5Ri0nkOHaRSUdqQkZI,7206
-cumulusci/tasks/vcs/tests/github/test_download_extract.py,sha256=mpDYmuai0cF_p-PjPlY3MPMoDhk2r8QAcm4qZq2fOHQ,32420
+cumulusci/tasks/vcs/tests/github/test_download_extract.py,sha256=_8j2xkypbF6xECkYgWby6vfHAss16FHhuy9flu-m5Fo,32594
 cumulusci/tasks/vcs/tests/github/test_merge.py,sha256=OS25YJHNVqfb2lPzpXOpzR8BEiDEh_C94BwDTvTDQ-U,39306
 cumulusci/tasks/vcs/tests/github/test_publish.py,sha256=kl3IvWmDL8M225R7Ygyr-vUjXQ0_GoUDH85kOncDlMk,30739
 cumulusci/tasks/vcs/tests/github/test_pull_request.py,sha256=dh-XihMjCH69wML6vg3KKqjB2NsfhBoMr0Ii1xfM8gw,974
@@ -736,9 +736,9 @@ cumulusci/vcs/tests/dummy_service.py,sha256=RltOUpMIhSDNrfxk0LhLqlH4ppC0sK6NC2cO
 cumulusci/vcs/tests/test_vcs_base.py,sha256=9mp6uZ3lTxY4onjUNCucp9N9aB3UylKS7_2Zu_hdAZw,24331
 cumulusci/vcs/tests/test_vcs_bootstrap.py,sha256=N0NA48-rGNIIjY3Z7PtVnNwHObSlEGDk2K55TQGI8g4,27954
 cumulusci/vcs/utils/__init__.py,sha256=py4fEcHM7Vd0M0XWznOlywxaeCtG3nEVGmELmEKVGU8,869
-cumulusci_plus-5.0.8.dist-info/METADATA,sha256=8u-lOMmYllxq6LLwXp7uUzNerM3gi0BDn4lTDExZ_eA,6134
-cumulusci_plus-5.0.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-cumulusci_plus-5.0.8.dist-info/entry_points.txt,sha256=nTtu04b9iLXhzADcTrb5PwmdXE6e2MTUAMh9OK6Z2pg,80
-cumulusci_plus-5.0.8.dist-info/licenses/AUTHORS.rst,sha256=PvewjKImdKPhhJ6xR2EEZ4T7GbpY2ZeAeyWm2aLtiMQ,676
-cumulusci_plus-5.0.8.dist-info/licenses/LICENSE,sha256=NFsF_s7RVXk2dU6tmRAN8wF45pnD98VZ5IwqOsyBcaU,1499
-cumulusci_plus-5.0.8.dist-info/RECORD,,
+cumulusci_plus-5.0.8.dev0.dist-info/METADATA,sha256=No5M7E99WFdnfIqbyhyCUrW2WpLlo8W09i7yx6wgr7w,6139
+cumulusci_plus-5.0.8.dev0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+cumulusci_plus-5.0.8.dev0.dist-info/entry_points.txt,sha256=nTtu04b9iLXhzADcTrb5PwmdXE6e2MTUAMh9OK6Z2pg,80
+cumulusci_plus-5.0.8.dev0.dist-info/licenses/AUTHORS.rst,sha256=PvewjKImdKPhhJ6xR2EEZ4T7GbpY2ZeAeyWm2aLtiMQ,676
+cumulusci_plus-5.0.8.dev0.dist-info/licenses/LICENSE,sha256=NFsF_s7RVXk2dU6tmRAN8wF45pnD98VZ5IwqOsyBcaU,1499
+cumulusci_plus-5.0.8.dev0.dist-info/RECORD,,