Merge pull request conan-io#3311 from conan-io/master

Master to develop

Author: czoido

.ci/scripts/common.py

@@ -12,7 +12,7 @@
     # must be always the latest version
     "2.0": "release/2.0",
     latest_v1_folder: latest_v1_branch,
-    "en/1.60": "release/1.60.1",
+    "en/1.60": "release/1.60.2",
     "en/1.59": "release/1.59.0",
     "en/1.58": "release/1.58.0",
     "en/1.57": "release/1.57.0",

changelog.rst

@@ -21,6 +21,11 @@ Check https://github.com/conan-io/conan for issues and more details about develo
     Conan 1.60 shouldn't break any existing 1.0 recipe or command line invocation. If it does, please submit 
     a report on GitHub. Read more about the :ref:`Conan stability commitment<stability>`.
 
+1.60.2 (26-Jul-2023)
+--------------------
+
+- Fix: Allow Pyyaml 6.0.X versions to avoid cython 3.0 problems. (backport #14323) `#14363 <https://github.com/conan-io/conan/pull/14363>`_
+
 1.60.1 (30-May-2023)
 --------------------
 

conf.py

@@ -44,7 +44,7 @@
 # The short X.Y version.
 version = "1.60"
 # The full version, including alpha/beta/rc tags.
-release = u'1.60.1'
+release = u'1.60.2'
 
 dir_path = os.path.dirname(os.path.realpath(__file__))
 if not os.path.exists(os.path.join(dir_path, "versions.json")):