Skip_Upload

Author: Behemyth

cppython/plugins/conan/plugin.py

@@ -247,6 +247,7 @@ def publish(self) -> None:
             raise FileNotFoundError(f'conanfile.py not found at {conanfile_path}')
 
         conan_api = ConanAPI()
+
         all_remotes = conan_api.remotes.list()
 
         # Configure remotes for upload
@@ -272,7 +273,7 @@ def publish(self) -> None:
             user=None,
             channel=None,
             lockfile=None,
-            remotes=all_remotes,
+            remotes=all_remotes,  # Use all remotes for dependency resolution
             update=None,
             check_updates=False,
             is_build_require=False,
@@ -284,22 +285,31 @@ def publish(self) -> None:
         conan_api.graph.analyze_binaries(
             graph=deps_graph,
             build_mode=['*'],
-            remotes=all_remotes,
+            remotes=all_remotes,  # Use all remotes for dependency resolution
             update=None,
             lockfile=None,
         )
 
         conan_api.install.install_binaries(deps_graph=deps_graph, remotes=all_remotes)
 
-        # Upload if not local only
-        if not self.data.local_only:
+        if not self.data.skip_upload:
             self._upload_package(conan_api, ref, configured_remotes)
 
     def _get_configured_remotes(self, all_remotes):
-        """Get and validate configured remotes for upload."""
-        if self.data.local_only:
+        """Get and validate configured remotes for upload.
+
+        Note: This only affects upload behavior. For dependency resolution,
+        we always use all available system remotes regardless of this config.
+        """
+        # If skip_upload is True, don't upload anywhere
+        if self.data.skip_upload:
             return []
 
+        # If no remotes specified, upload to all available remotes
+        if not self.data.remotes:
+            return all_remotes
+
+        # Otherwise, upload only to specified remotes
         configured_remotes = [remote for remote in all_remotes if remote.name in self.data.remotes]
 
         if not configured_remotes:

cppython/plugins/conan/resolution.py

@@ -318,6 +318,7 @@ def resolve_conan_data(data: dict[str, Any], core_data: CorePluginData) -> Conan
 
     return ConanData(
         remotes=parsed_data.remotes,
+        skip_upload=parsed_data.skip_upload,
         host_profile=host_profile,
         build_profile=build_profile,
     )

cppython/plugins/conan/schema.py

@@ -293,22 +293,22 @@ class ConanData(CPPythonModel):
     """Resolved conan data"""
 
     remotes: list[str]
+    skip_upload: bool
     host_profile: Profile
     build_profile: Profile
 
-    @property
-    def local_only(self) -> bool:
-        """Check if publishing should be local-only."""
-        return len(self.remotes) == 0
-
 
 class ConanConfiguration(CPPythonModel):
     """Raw conan data"""
 
     remotes: Annotated[
         list[str],
-        Field(description='List of remotes to upload to. Empty list means the local conan cache will be used.'),
+        Field(description='List of remotes to upload to. If empty, uploads to all available remotes.'),
     ] = ['conancenter']
+    skip_upload: Annotated[
+        bool,
+        Field(description='If true, skip uploading packages during publish (local-only mode).'),
+    ] = False
     host_profile: Annotated[
         str | None,
         Field(

tests/fixtures/conan.py

@@ -1,6 +1,7 @@
 """Shared fixtures for Conan plugin tests"""
 
 from pathlib import Path
+from typing import Any
 from unittest.mock import Mock
 
 import pytest
@@ -10,6 +11,24 @@
 from cppython.plugins.conan.plugin import ConanProvider
 from cppython.plugins.conan.schema import ConanDependency
 
+# Shared parameterization for plugin data across all conan tests
+CONAN_PLUGIN_DATA_PARAMS = [
+    {'remotes': ['conancenter'], 'skip_upload': False},  # Default behavior
+    {'remotes': [], 'skip_upload': False},  # Empty remotes (upload to all)
+    {'remotes': ['conancenter'], 'skip_upload': True},  # Skip upload with specific remotes
+    {'remotes': [], 'skip_upload': True},  # Skip upload with empty remotes
+]
+
+
+@pytest.fixture(name='conan_plugin_data', scope='session', params=CONAN_PLUGIN_DATA_PARAMS)
+def fixture_conan_plugin_data(request) -> dict[str, Any]:
+    """Shared parameterized plugin data for conan tests
+
+    Returns:
+        The constructed plugin data with different combinations of remotes and skip_upload
+    """
+    return request.param
+
 
 @pytest.fixture(autouse=True)
 def clean_conan_cache(tmp_path: Path, monkeypatch: pytest.MonkeyPatch):

tests/integration/examples/test_conan_cmake.py

@@ -52,7 +52,7 @@ def test_simple(example_runner: CliRunner) -> None:
 
         # --- Setup for Publish with modified config ---
         # Modify the in-memory representation of the pyproject data
-        pyproject_data['tool']['cppython']['providers']['conan']['remotes'] = []
+        pyproject_data['tool']['cppython']['providers']['conan']['skip_upload'] = True
 
         # Create a new project instance with the modified configuration for the 'publish' step
         publish_project = Project(project_configuration, interface, pyproject_data)

tests/unit/plugins/conan/test_install.py

@@ -29,15 +29,13 @@ class TestConanInstall(ProviderPluginTestMixin[ConanProvider]):
 
     @staticmethod
     @pytest.fixture(name='plugin_data', scope='session')
-    def fixture_plugin_data() -> dict[str, Any]:
+    def fixture_plugin_data(conan_plugin_data: dict[str, Any]) -> dict[str, Any]:
         """A required testing hook that allows data generation
 
         Returns:
             The constructed plugin data
         """
-        return {
-            'remotes': [],
-        }
+        return conan_plugin_data
 
     @staticmethod
     @pytest.fixture(name='plugin_type', scope='session')

tests/unit/plugins/conan/test_provider.py

@@ -13,13 +13,13 @@ class TestConanProvider(ProviderUnitTestContract[ConanProvider]):
 
     @staticmethod
     @pytest.fixture(name='plugin_data', scope='session')
-    def fixture_plugin_data() -> dict[str, Any]:
+    def fixture_plugin_data(conan_plugin_data: dict[str, Any]) -> dict[str, Any]:
         """A required testing hook that allows data generation
 
         Returns:
             The constructed plugin data
         """
-        return {}
+        return conan_plugin_data
 
     @staticmethod
     @pytest.fixture(name='plugin_type', scope='session')

tests/unit/plugins/conan/test_publish.py

@@ -42,19 +42,19 @@ def fixture_plugin_type() -> type[ConanProvider]:
         """
         return ConanProvider
 
-    def test_local_only(
+    def test_skip_upload(
         self, plugin: ConanProvider, conan_mock_api_publish: Mock, conan_temp_conanfile: None, mocker: MockerFixture
     ) -> None:
-        """Test that publish with remotes=[] only exports and builds locally
+        """Test that publish with skip_upload=True only exports and builds locally
 
         Args:
             plugin: The plugin instance
             conan_mock_api_publish: Mock ConanAPI for publish operations
             conan_temp_conanfile: Fixture to create conanfile.py
             mocker: Pytest mocker fixture
         """
-        # Set plugin to local mode
-        plugin.data.remotes = []
+        # Set plugin to skip upload mode
+        plugin.data.skip_upload = True
 
         # Mock the necessary imports and API creation
         mocker.patch('cppython.plugins.conan.plugin.ConanAPI', return_value=conan_mock_api_publish)
@@ -190,8 +190,8 @@ def test_with_default_profiles(
             conan_temp_conanfile: Fixture to create conanfile.py
             mocker: Pytest mocker fixture
         """
-        # Set plugin to local mode
-        plugin.data.remotes = []
+        # Set plugin to skip upload mode
+        plugin.data.skip_upload = True
 
         # Mock the necessary imports and API creation
         mocker.patch('cppython.plugins.conan.plugin.ConanAPI', return_value=conan_mock_api_publish)

tests/unit/plugins/conan/test_resolution.py

@@ -446,7 +446,7 @@ def test_null_profiles(
         mock_build_profile = Mock(spec=Profile)
         mock_resolve_profiles.return_value = (mock_host_profile, mock_build_profile)
 
-        data = {'host_profile': None, 'build_profile': None, 'remotes': []}
+        data = {'host_profile': None, 'build_profile': None, 'remotes': [], 'skip_upload': False}
         core_data = Mock(spec=CorePluginData)
 
         result = resolve_conan_data(data, core_data)
@@ -455,6 +455,7 @@ def test_null_profiles(
         assert result.host_profile == mock_host_profile
         assert result.build_profile == mock_build_profile
         assert result.remotes == []
+        assert result.skip_upload is False
 
         # Verify profile resolution was called with None values
         mock_resolve_profiles.assert_called_once_with(None, None, mock_conan_api, None)

tests/unit/plugins/conan/test_update.py

@@ -20,15 +20,13 @@ class TestConanUpdate(ProviderPluginTestMixin[ConanProvider]):
 
     @staticmethod
     @pytest.fixture(name='plugin_data', scope='session')
-    def fixture_plugin_data() -> dict[str, Any]:
+    def fixture_plugin_data(conan_plugin_data: dict[str, Any]) -> dict[str, Any]:
         """A required testing hook that allows data generation
 
         Returns:
             The constructed plugin data
         """
-        return {
-            'remotes': [],
-        }
+        return conan_plugin_data
 
     @staticmethod
     @pytest.fixture(name='plugin_type', scope='session')