moved files to new cache package (#4378)

conans/client/cache.py → conans/client/cache/cache.py

@@ -5,10 +5,10 @@
 
 from conans.client.conf import ConanClientConfigParser, default_client_conf, default_settings_yml
 from conans.client.conf.detect import detect_defaults_settings
-from conans.client.editable import EditablePackages
+from conans.client.cache.editable import EditablePackages
 from conans.client.output import Color
 from conans.client.profile_loader import read_profile
-from conans.client.remote_registry import default_remotes, dump_registry, migrate_registry_file, \
+from conans.client.cache.remote_registry import default_remotes, dump_registry, migrate_registry_file, \
     RemoteRegistry
 from conans.errors import ConanException
 from conans.model.profile import Profile

conans/client/command.py

@@ -263,7 +263,8 @@ def create(self, *args):
         parser.add_argument('-k', '-ks', '--keep-source', default=False, action='store_true',
                             help=_KEEP_SOURCE_HELP)
         parser.add_argument('-kb', '--keep-build', default=False, action='store_true',
-                            help='Do not remove the build folder in local cache. Implies --keep-source. '
+                            help='Do not remove the build folder in local cache. '
+                                 'Implies --keep-source. '
                                  'Use this for testing purposes only')
         parser.add_argument("-ne", "--not-export", default=False, action='store_true',
                             help='Do not export the conanfile.py')
@@ -424,7 +425,8 @@ def config(self, *args):
         rm_subparser.add_argument("item", help="Item to remove")
         get_subparser.add_argument("item", nargs="?", help="Item to print")
         set_subparser.add_argument("item", help="'item=value' to set")
-        install_subparser.add_argument("item", nargs="?", help="Configuration file or directory to use")
+        install_subparser.add_argument("item", nargs="?",
+                                       help="Configuration file or directory to use")
 
         install_subparser.add_argument("--verify-ssl", nargs="?", default="True",
                                        help='Verify SSL connection when downloading file')

conans/client/conan_api.py

@@ -7,7 +7,7 @@
 import conans
 from conans import __version__ as client_version
 from conans.client import packager, tools
-from conans.client.cache import ClientCache
+from conans.client.cache.cache import ClientCache
 from conans.client.cmd.build import build
 from conans.client.cmd.create import create
 from conans.client.cmd.download import download

conans/client/conf/__init__.py

@@ -306,7 +306,7 @@ def default_profile(self):
         ret = os.environ.get("CONAN_DEFAULT_PROFILE_PATH", None)
         if ret:
             if not os.path.isabs(ret):
-                from conans.client.cache import PROFILES_FOLDER
+                from conans.client.cache.cache import PROFILES_FOLDER
                 profiles_folder = os.path.join(os.path.dirname(self.filename), PROFILES_FOLDER)
                 ret = os.path.abspath(os.path.join(profiles_folder, ret))
 

conans/client/conf/config_installer.py

@@ -5,7 +5,7 @@
 
 from conans import load
 from conans.client import tools
-from conans.client.remote_registry import load_registry_txt
+from conans.client.cache.remote_registry import load_registry_txt
 from conans.client.tools import Git
 from conans.client.tools.files import unzip
 from conans.errors import ConanException

conans/client/manager.py

@@ -1,6 +1,6 @@
 import os
 
-from conans.client.cache import ClientCache
+from conans.client.cache.cache import ClientCache
 from conans.client.generators import write_generators
 from conans.client.graph.graph import RECIPE_CONSUMER, RECIPE_VIRTUAL
 from conans.client.graph.printer import print_graph

conans/client/manifest_manager.py

@@ -1,7 +1,7 @@
 import os
 
 from conans.client.graph.graph import RECIPE_CONSUMER, RECIPE_VIRTUAL
-from conans.client.remote_registry import Remote
+from conans.client.cache.remote_registry import Remote
 from conans.errors import ConanException
 from conans.model.manifest import FileTreeManifest
 from conans.model.ref import PackageReference

conans/client/migrations.py

@@ -1,7 +1,7 @@
 import os
 import shutil
 
-from conans.client.cache import CONAN_CONF, PROFILES_FOLDER
+from conans.client.cache.cache import CONAN_CONF, PROFILES_FOLDER
 from conans.client.tools import replace_in_file
 from conans.errors import ConanException
 from conans.migrations import Migrator

conans/client/remote_manager.py

@@ -8,7 +8,7 @@
 from requests.exceptions import ConnectionError
 
 from conans.client.cmd.uploader import UPLOAD_POLICY_SKIP
-from conans.client.remote_registry import Remote
+from conans.client.cache.remote_registry import Remote
 from conans.client.source import merge_directories
 from conans.errors import ConanConnectionError, ConanException, NotFoundException
 from conans.model.manifest import gather_files

conans/client/remover.py

@@ -1,6 +1,6 @@
 import os
 
-from conans.client.remote_registry import Remote
+from conans.client.cache.remote_registry import Remote
 from conans.errors import ConanException
 from conans.model.ref import ConanFileReference, PackageReference
 from conans.paths import SYSTEM_REQS, rm_conandir

conans/test/functional/command/config_install_test.py

@@ -8,7 +8,7 @@
 from conans.client import tools
 from conans.client.conf import ConanClientConfigParser
 from conans.client.conf.config_installer import _hide_password
-from conans.client.remote_registry import Remote
+from conans.client.cache.remote_registry import Remote
 from conans.client.rest.uploader_downloader import Downloader
 from conans.test.utils.test_files import temp_folder
 from conans.test.utils.tools import TestClient, StoppableThreadBottle

conans/test/functional/configuration/default_profile_test.py

@@ -2,7 +2,7 @@
 import unittest
 
 from conans.client import tools
-from conans.client.cache import PROFILES_FOLDER
+from conans.client.cache.cache import PROFILES_FOLDER
 from conans.paths import CONANFILE
 from conans.test.utils.test_files import temp_folder
 from conans.test.utils.tools import NO_SETTINGS_PACKAGE_ID, TestClient

conans/test/functional/configuration/registry_test.py

@@ -1,7 +1,7 @@
 import os
 import unittest
 
-from conans.client.remote_registry import RemoteRegistry, default_remotes, dump_registry, \
+from conans.client.cache.remote_registry import RemoteRegistry, default_remotes, dump_registry, \
     load_registry_txt, migrate_registry_file
 from conans.errors import ConanException
 from conans.model.ref import ConanFileReference

conans/test/integration/conf_default_settings_test.py

@@ -4,7 +4,7 @@
 from collections import OrderedDict
 
 from conans.client import tools
-from conans.client.cache import ClientCache
+from conans.client.cache.cache import ClientCache
 from conans.client.conf.detect import detect_defaults_settings
 from conans.paths import CONANFILE_TXT
 from conans.test.utils.test_files import temp_folder

conans/test/unittests/search/disk_search_test.py

@@ -1,7 +1,7 @@
 import os
 import unittest
 
-from conans.client.cache import ClientCache
+from conans.client.cache.cache import ClientCache
 from conans.client.tools import chdir
 from conans.model.info import ConanInfo
 from conans.model.ref import ConanFileReference

conans/test/unittests/util/client_conf_test.py

@@ -1,7 +1,7 @@
 import os
 import unittest
 
-from conans.client.cache import CONAN_CONF
+from conans.client.cache.cache import CONAN_CONF
 from conans.client.conf import ConanClientConfigParser
 from conans.paths import DEFAULT_PROFILE_NAME
 from conans.test.utils.test_files import temp_folder

conans/test/unittests/util/tools_test.py

@@ -18,7 +18,7 @@
 from six.moves.urllib.parse import quote
 
 from conans.client import tools
-from conans.client.cache import CONAN_CONF
+from conans.client.cache.cache import CONAN_CONF
 from conans.client.conan_api import ConanAPIV1
 from conans.client.conf import default_client_conf, default_settings_yml
 from conans.client.output import ConanOutput

conans/test/utils/tools.py

@@ -23,14 +23,14 @@
 from webtest.app import TestApp
 
 from conans import tools
-from conans.client.cache import ClientCache
+from conans.client.cache.cache import ClientCache
 from conans.client.command import Command
 from conans.client.conan_api import Conan, get_request_timeout, migrate_and_get_cache
 from conans.client.conan_command_output import CommandOutputer
 from conans.client.hook_manager import HookManager
 from conans.client.loader import ProcessedProfile
 from conans.client.output import ConanOutput
-from conans.client.remote_registry import dump_registry
+from conans.client.cache.remote_registry import dump_registry
 from conans.client.rest.conan_requester import ConanRequester
 from conans.client.rest.uploader_downloader import IterableToFileAdapter
 from conans.client.tools.files import chdir