From 1db72b41387de6f00f7f05256693255cea052723 Mon Sep 17 00:00:00 2001 From: czoido Date: Fri, 31 Jan 2020 16:59:01 +0100 Subject: [PATCH 1/3] update version --- changelog.rst | 8 ++++++++ conf.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changelog.rst b/changelog.rst index d26b5349d962..cc3d38b55e8c 100644 --- a/changelog.rst +++ b/changelog.rst @@ -21,6 +21,14 @@ Check https://github.com/conan-io/conan for issues and more details about develo Conan 1.21 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`. +1.21.2 (31-Jan-2020) +-------------------- + +- Fix: Recipe substitution for scm (old behavior) fixed for multiline comments in Python 3.8 `#6439 `_ +- Bugfix: Fix broken compression of .tgz files due to Python 3.8 changing tar default schema. `#6439 `_ +- Bugfix: Append `CONAN_LIBS` in `cmake` generator to avoid overwriting user-defined libs. `#6433 `_ + + 1.21.1 (14-Jan-2020) -------------------- diff --git a/conf.py b/conf.py index 2e461f073e9b..18814c26b3cc 100644 --- a/conf.py +++ b/conf.py @@ -41,7 +41,7 @@ # The short X.Y version. version = "1.21" # The full version, including alpha/beta/rc tags. -release = u'1.21.1' +release = u'1.21.2' dir_path = os.path.dirname(os.path.realpath(__file__)) if not os.path.exists(os.path.join(dir_path, "versions.json")): From 8773d2a9a792cfa369b4efbb3f76ad9e2781ac9d Mon Sep 17 00:00:00 2001 From: czoido Date: Tue, 3 Mar 2020 13:01:14 +0100 Subject: [PATCH 2/3] change version --- changelog.rst | 10 ++++++++++ conf.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/changelog.rst b/changelog.rst index cc3d38b55e8c..245f8429460b 100644 --- a/changelog.rst +++ b/changelog.rst @@ -21,6 +21,16 @@ Check https://github.com/conan-io/conan for issues and more details about develo Conan 1.21 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`. +1.21.3 (03-Mar-2020) +-------------------- + +- Bugfix: Fixing locking system for metadata file so it can be accessed concurrently. `#6543 `_ +- Bugfix: Manage the dirty state of the cache package folder with conan export-pkg. `#6517 `_ +- Bugfix: BugFix: Add quotes to virtualenv scripts, so they don't crash in pure sh shells. `#6516 `_ +- Bugfix: Upload was silently skipping exceptions, which could result in packages not uploaded, but user not realizing about the error. `#6515 `_ +- BugFix: Add ``system_libs`` to ``premake`` generator. `#6496 `_ + + 1.21.2 (31-Jan-2020) -------------------- diff --git a/conf.py b/conf.py index 18814c26b3cc..fbbff2a81e75 100644 --- a/conf.py +++ b/conf.py @@ -41,7 +41,7 @@ # The short X.Y version. version = "1.21" # The full version, including alpha/beta/rc tags. -release = u'1.21.2' +release = u'1.21.3' dir_path = os.path.dirname(os.path.realpath(__file__)) if not os.path.exists(os.path.join(dir_path, "versions.json")): From 709f252ba524d794ce1498d68e9a736d310dfff0 Mon Sep 17 00:00:00 2001 From: czoido Date: Tue, 3 Mar 2020 13:20:36 +0100 Subject: [PATCH 3/3] fix version --- changelog.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.rst b/changelog.rst index 90125bb3c10f..d14ad9851a75 100644 --- a/changelog.rst +++ b/changelog.rst @@ -18,7 +18,7 @@ Check https://github.com/conan-io/conan for issues and more details about develo .. important:: - Conan 1.21 shouldn't break any existing 1.0 recipe or command line invocation. If it does, please submit a report on GitHub. + Conan 1.22 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`. 1.22.2 (13-Feb-2020)