From 4b9bec4968c16d6556fe3315cb844a473abc3026 Mon Sep 17 00:00:00 2001 From: danimtb Date: Fri, 3 Sep 2021 12:12:34 +0200 Subject: [PATCH 1/3] Remove conan-center default remote --- mastering/virtualenv.rst | 5 ++--- reference/commands/consumer/get.rst | 4 ++-- reference/commands/consumer/search.rst | 4 ++-- reference/commands/misc/inspect.rst | 2 +- reference/env_vars.rst | 8 ++++---- uploading_packages/remotes.rst | 15 ++++++++------- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/mastering/virtualenv.rst b/mastering/virtualenv.rst index a1c1bf9c651..1a7fb9cd749 100644 --- a/mastering/virtualenv.rst +++ b/mastering/virtualenv.rst @@ -28,12 +28,11 @@ variables declared in the ``package_info()`` method and generate two scripts "ac The recipe of ``cmake/3.16.3`` appends to the PATH variable the package folder/bin. -You can check existing CMake conan package versions in conan-center with: +You can check existing CMake Conan package versions in `conancenter` with: .. code-block:: bash - $ conan search cmake* -r=conan-center - + $ conan search cmake* -r=conancenter In the **bin** folder there is a **cmake** executable: diff --git a/reference/commands/consumer/get.rst b/reference/commands/consumer/get.rst index 7272f7e846b..eb1ef5228c8 100644 --- a/reference/commands/consumer/get.rst +++ b/reference/commands/consumer/get.rst @@ -36,7 +36,7 @@ Gets a file or list a directory of a given reference or package. .. code-block:: bash - $ conan get zlib/1.2.8@ -r conan-center + $ conan get zlib/1.2.8@ -r conancenter - List the files for a local package recipe: @@ -81,7 +81,7 @@ Gets a file or list a directory of a given reference or package. .. code-block:: bash - $ conan get zlib/1.2.11@:2144f833c251030c3cfd61c4354ae0e38607a909 . -r conan-center + $ conan get zlib/1.2.11@:ff82a1e70ba8430648a79986385b20a3648f8c19 . -r conancenter Listing directory '.': conan_package.tgz diff --git a/reference/commands/consumer/search.rst b/reference/commands/consumer/search.rst index 2cba31d1c9e..a3fc13e3556 100644 --- a/reference/commands/consumer/search.rst +++ b/reference/commands/consumer/search.rst @@ -56,7 +56,7 @@ Examples .. code-block:: bash $ conan search "zlib/*" - $ conan search "zlib/*" -r=conan-center + $ conan search "zlib/*" -r=conancenter To search for recipes in all defined remotes use :command:`-r all` (this is only valid for searching recipes, not binaries): @@ -118,7 +118,7 @@ You can generate a table for all binaries from a given recipe with the :command: .. code-block:: bash - $ conan search jinja2cpp/1.1.0@ --table=file.html -r=conan-center + $ conan search jinja2cpp/1.1.0@ --table=file.html -r=conancenter $ file.html # or open the file, double-click .. image:: /images/conan-search_binary_table.png diff --git a/reference/commands/misc/inspect.rst b/reference/commands/misc/inspect.rst index d8c044aeb79..b769a275ca6 100644 --- a/reference/commands/misc/inspect.rst +++ b/reference/commands/misc/inspect.rst @@ -38,7 +38,7 @@ Examples: .. code-block:: bash - $ conan inspect zlib/1.2.11@ -a=name -a=version -a=options -a default_options -r=conan-center + $ conan inspect zlib/1.2.11@ -a=name -a=version -a=options -a default_options -r=conancenter name: zlib version: 1.2.11 options diff --git a/reference/env_vars.rst b/reference/env_vars.rst index 71de2bb63d8..6a9fe0092b0 100644 --- a/reference/env_vars.rst +++ b/reference/env_vars.rst @@ -288,11 +288,11 @@ These variables are useful for unattended executions like CI servers or automate If the remote name contains "-" you have to replace it with "_" in the variable name: -For example: For a remote named "conan-center": +For example: For a remote named "conancenter": .. code-block:: bash - SET CONAN_LOGIN_USERNAME_CONAN_CENTER=MyUser + SET CONAN_LOGIN_USERNAME_CONANCENTER=MyUser .. seealso:: @@ -380,11 +380,11 @@ These variables are useful for unattended executions like CI servers or automate The remote name is transformed to all uppercase. If the remote name contains "-", you have to replace it with "_" in the variable name. -For example, for a remote named "conan-center": +For example, for a remote named "conancenter": .. code-block:: bash - SET CONAN_PASSWORD_CONAN_CENTER=Mypassword + SET CONAN_PASSWORD_CONANCENTER=Mypassword .. seealso:: diff --git a/uploading_packages/remotes.rst b/uploading_packages/remotes.rst index 83c98e46f8e..22b641c2921 100644 --- a/uploading_packages/remotes.rst +++ b/uploading_packages/remotes.rst @@ -55,21 +55,22 @@ To contribute packages to ConanCenter, read the :ref:`ConanCenter guide `zlib/1.2.11`). From 8a02be951a2e67191eabcc3ba162c5db2458a32e Mon Sep 17 00:00:00 2001 From: Daniel Date: Fri, 3 Sep 2021 12:41:12 +0200 Subject: [PATCH 2/3] Update uploading_packages/remotes.rst Co-authored-by: Javier G. Sogo --- uploading_packages/remotes.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uploading_packages/remotes.rst b/uploading_packages/remotes.rst index 22b641c2921..4be2c579d73 100644 --- a/uploading_packages/remotes.rst +++ b/uploading_packages/remotes.rst @@ -62,7 +62,7 @@ discouraged**. This documentation is kept here only for reference purposes. $ conan-center: https://conan.bintray.com [Verify SSL: True] -It contains all the packages that were in the `conancenter` remote until July 1st (new packages are no longer uploaded to this remote), +It contains all the packages that were uploaded to ConanCenter before July 1st (new packages are no longer uploaded to this remote), as well as **legacy packages with full reference** (`zlib/1.2.11@conan/stable`). These package binaries were created by users in their own Bintray repositories and included in this main repository. This flow of contributing packages to ConanCenter is no longer available and packages are **not recommended** and should be considered as **legacy**. From a1b1b2a930df341cf90a26768fe86f925459a296 Mon Sep 17 00:00:00 2001 From: Daniel Date: Fri, 3 Sep 2021 12:41:26 +0200 Subject: [PATCH 3/3] Update uploading_packages/remotes.rst Co-authored-by: Javier G. Sogo --- uploading_packages/remotes.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uploading_packages/remotes.rst b/uploading_packages/remotes.rst index 4be2c579d73..a47b83c4044 100644 --- a/uploading_packages/remotes.rst +++ b/uploading_packages/remotes.rst @@ -55,7 +55,7 @@ To contribute packages to ConanCenter, read the :ref:`ConanCenter guide