diff --git a/conans/__init__.py b/conans/__init__.py index 400cf7eccd3..7818586d786 100644 --- a/conans/__init__.py +++ b/conans/__init__.py @@ -15,5 +15,4 @@ COMPLEX_SEARCH_CAPABILITY = "complex_search" SERVER_CAPABILITIES = [COMPLEX_SEARCH_CAPABILITY, ] -__version__ = '0.23.1' - +__version__ = '0.23.2' diff --git a/conans/client/remote_registry.py b/conans/client/remote_registry.py index acdcc8e5346..71eacaf162c 100644 --- a/conans/client/remote_registry.py +++ b/conans/client/remote_registry.py @@ -7,7 +7,8 @@ from conans.util.log import logger -default_remotes = """conan.io https://server.conan.io True +default_remotes = """conan-center https://conan.bintray.com True +conan-transit https://conan-transit.bintray.com True """ Remote = namedtuple("Remote", "name url verify_ssl") diff --git a/conans/test/functional/registry_test.py b/conans/test/functional/registry_test.py index ea49c72879b..758f2088694 100644 --- a/conans/test/functional/registry_test.py +++ b/conans/test/functional/registry_test.py @@ -23,31 +23,36 @@ def add_remove_update_test(self): # Add registry.add("local", "http://localhost:9300") - self.assertEqual(registry.remotes, [("conan.io", "https://server.conan.io", True), + self.assertEqual(registry.remotes, [("conan-center", "https://conan.bintray.com", True), + ("conan-transit", "https://conan-transit.bintray.com", True), ("local", "http://localhost:9300", True)]) # Add registry.add("new", "new_url", False) - self.assertEqual(registry.remotes, [("conan.io", "https://server.conan.io", True), + self.assertEqual(registry.remotes, [("conan-center", "https://conan.bintray.com", True), + ("conan-transit", "https://conan-transit.bintray.com", True), ("local", "http://localhost:9300", True), ("new", "new_url", False)]) with self.assertRaises(ConanException): registry.add("new", "new_url") # Update registry.update("new", "other_url") - self.assertEqual(registry.remotes, [("conan.io", "https://server.conan.io", True), + self.assertEqual(registry.remotes, [("conan-center", "https://conan.bintray.com", True), + ("conan-transit", "https://conan-transit.bintray.com", True), ("local", "http://localhost:9300", True), ("new", "other_url", True)]) with self.assertRaises(ConanException): registry.update("new2", "new_url") registry.update("new", "other_url", False) - self.assertEqual(registry.remotes, [("conan.io", "https://server.conan.io", True), + self.assertEqual(registry.remotes, [("conan-center", "https://conan.bintray.com", True), + ("conan-transit", "https://conan-transit.bintray.com", True), ("local", "http://localhost:9300", True), ("new", "other_url", False)]) # Remove registry.remove("local") - self.assertEqual(registry.remotes, [("conan.io", "https://server.conan.io", True), + self.assertEqual(registry.remotes, [("conan-center", "https://conan.bintray.com", True), + ("conan-transit", "https://conan-transit.bintray.com", True), ("new", "other_url", False)]) with self.assertRaises(ConanException): registry.remove("new2")