Merge pull request #3009 from conan-io/release/2.0

Release/2.0 to develop2

.ci/test.jenkins

@@ -1,13 +1,14 @@
 #!groovy​
 
 node('Linux') {
-    String betaReleaseBranch = 'release/2.0.0-beta'
-    boolean publishDocs = env.BRANCH_NAME == betaReleaseBranch
-    def targetBranch = env.CHANGE_BRANCH
+
+    boolean publishDocs = env.BRANCH_NAME.startsWith("release/2.")
+    def targetBranch = env.CHANGE_BRANCH ? env.CHANGE_BRANCH : env.BRANCH_NAME
 
     // We also have to clone conan sources for the sphinx autodoc extension
-    def conanBranch = (targetBranch == betaReleaseBranch) ? 'release/2.0-beta' : 'develop2'
+    def conanBranch = targetBranch.startsWith("release/2.") ? targetBranch : 'develop2'
     def conan_repo_url = 'https://github.com/conan-io/conan.git'
+
     echo "Docs target branch: ${targetBranch}"
     echo "Conan target branch: ${conanBranch}"
 
@@ -56,7 +57,6 @@ node('Linux') {
     // latest parameter still has to be 'master'
     if (publishDocs) {
         build(job: 'Conan-Docs-Publish', propagate: true, wait: true, parameters: [
-            [$class: 'StringParameterValue', name: 'latest', value: 'master'],
             [$class: 'StringParameterValue', name: 'prefix', value: 'https://docs.conan.io/'],
             [$class: 'BooleanParameterValue', name: 'publish', value: true]
         ])

changelog.rst

@@ -3,6 +3,16 @@ Changelog
 
 For a more detailed description of the major changes that Conan 2.0 brings, compared with Conan 1.X, please read :ref:`whatsnew`
 
+2.0.0 (22-Feb-2023)
+-------------------
+
+- Feature: Change default profile cppstd for apple-clang to gnu17. `#13185 <https://github.com/conan-io/conan/pull/13185>`_ 
+- Feature: New ``conan remote auth`` command to force authentication in the remotes `#13180 <https://github.com/conan-io/conan/pull/13180>`_ 
+- Fix: Allow defining options trait in ``test_requires(..., options={})`` `#13178 <https://github.com/conan-io/conan/pull/13178>`_ 
+- Fix: Unifying Conan commands help messages. `#13176 <https://github.com/conan-io/conan/pull/13176>`_ 
+- Bugfix: Fix MesonToolchain wrong cppstd in apple-clang `#13172 <https://github.com/conan-io/conan/pull/13172>`_ 
+- Feature: Improved global Conan output messages (create, install, export, etc.) `#12746 <https://github.com/conan-io/conan/pull/12746>`_ 
+
 2.0.0-beta10 (16-Feb-2023)
 --------------------------
 

conf.py

@@ -62,7 +62,7 @@
 # The short X.Y version.
 version = "2.0"
 # The full version, including alpha/beta/rc tags.
-release = u'2.0.0-beta'
+release = u'2.0.0'
 
 dir_path = os.path.dirname(os.path.realpath(__file__))
 if not os.path.exists(os.path.join(dir_path, "versions.json")):
@@ -181,7 +181,7 @@
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-html_logo = "_static/conan-logo-2.0.png"
+html_logo = "_static/logo_docs_v2.png"
 
 # The name of an image file (relative to this directory) to use as a favicon of
 # the docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32

installation.rst

@@ -24,7 +24,7 @@ Install Conan:
 
 .. code-block:: bash
 
-    $ pip install conan --pre
+    $ pip install conan
 
 .. important::
 
@@ -62,7 +62,7 @@ If installed via ``pip``, Conan version can be updated with:
 
 .. code-block:: bash
 
-    $ pip install conan --pre --upgrade  # Might need sudo or --user
+    $ pip install conan --upgrade  # Might need sudo or --user
 
 The upgrade shouldn't affect the installed packages or cache information. If the cache becomes inconsistent somehow, you may want to remove its content by deleting it (``<userhome>/.conan2``).