From 1c8081de009423df4c3bb008fc1a664d789b4e6b Mon Sep 17 00:00:00 2001 From: Carlos Zoido Date: Fri, 26 Feb 2021 13:11:22 +0100 Subject: [PATCH] Merge master to develop (#2036) * fix lowercase package names (#2013) * remove training banner (#2015) * Fix incorrect indentation in define_abi_compatibility.rst (#2017) * Fix spelling (#2018) Co-authored-by: Carlos Zoido * Remove misleading message about ConanCenter in shared_library_package_id() (#2000) * Update yocto docs (#2022) * Troubleshooting: How to fix incompatible requirements (#2016) * How to solve incompatible requirements Signed-off-by: Uilian Ries * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido * Update faq/troubleshooting.rst * Fix bad indentation Signed-off-by: Uilian Ries Co-authored-by: Carlos Zoido * Release 1.34.0 (#2035) * buildroot.rst: Fix a typo (#1996) Artifatory --> Artifactory * - meson : add target argument (#2011) Signed-off-by: SSE4 * Update develop with master (#2020) * fix lowercase package names (#2013) * remove training banner (#2015) * Fix incorrect indentation in define_abi_compatibility.rst (#2017) * Fix spelling (#2018) Co-authored-by: Carlos Zoido Co-authored-by: James Co-authored-by: chausner * Fix multiple minor spelling mistakes (#2019) * fix lowercase package names (#2013) * remove training banner (#2015) * Fix multiple minor spelling mistakes * Fix incorrect indentation in define_abi_compatibility.rst (#2017) * Fix spelling (#2018) Co-authored-by: Carlos Zoido Co-authored-by: James Co-authored-by: Carlos Zoido * Rename QbsToolchain to QbsProfile (#2027) * Rename QbsToolchain to QbsProfile * Rename use_profile to profile * conan_v2_error update (#2031) * lock bundle (#2030) * lock bundle * Update versioning/lockfiles/bundle.rst Co-authored-by: Carlos Zoido * Update versioning/lockfiles/bundle.rst Co-authored-by: Carlos Zoido * Update versioning/lockfiles/bundle.rst Co-authored-by: Carlos Zoido * Update versioning/lockfiles/bundle.rst Co-authored-by: Carlos Zoido * Update versioning/lockfiles/bundle.rst Co-authored-by: Carlos Zoido Co-authored-by: Carlos Zoido * release 1.34.0 * fix changelog * Merge master to release branch (#2034) * fix lowercase package names (#2013) * remove training banner (#2015) * Fix incorrect indentation in define_abi_compatibility.rst (#2017) * Fix spelling (#2018) Co-authored-by: Carlos Zoido * Remove misleading message about ConanCenter in shared_library_package_id() (#2000) * Update yocto docs (#2022) * Troubleshooting: How to fix incompatible requirements (#2016) * How to solve incompatible requirements Signed-off-by: Uilian Ries * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido * Update faq/troubleshooting.rst * Fix bad indentation Signed-off-by: Uilian Ries Co-authored-by: Carlos Zoido Co-authored-by: James Co-authored-by: chausner Co-authored-by: Daniel Co-authored-by: Uilian Ries Co-authored-by: rico-chet Co-authored-by: SSE4 Co-authored-by: James Co-authored-by: chausner Co-authored-by: Psy-Kai Co-authored-by: Daniel Co-authored-by: Uilian Ries Co-authored-by: James Co-authored-by: chausner Co-authored-by: Daniel Co-authored-by: Uilian Ries Co-authored-by: rico-chet Co-authored-by: SSE4 Co-authored-by: Psy-Kai --- .ci/publish.jenkins | 1 + changelog.rst | 30 +++++++++++++++++++++++++++++- conf.py | 4 ++-- 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/.ci/publish.jenkins b/.ci/publish.jenkins index 5b827df4316..74248d458e4 100644 --- a/.ci/publish.jenkins +++ b/.ci/publish.jenkins @@ -2,6 +2,7 @@ // TODO: Move to a file and avoid modifying CI script Map versions = [ + 'release/1.34.0': '1.34', 'release/1.33.1': '1.33', 'release/1.32.1': '1.32', 'release/1.31.4': '1.31', diff --git a/changelog.rst b/changelog.rst index 1dbfe9c4ee6..979f5dcf152 100644 --- a/changelog.rst +++ b/changelog.rst @@ -18,9 +18,37 @@ Check https://github.com/conan-io/conan for issues and more details about develo .. important:: - Conan 1.33 shouldn't break any existing 1.0 recipe or command line invocation. If it does, please + Conan 1.34 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.34.0 (26-Feb-2021) +-------------------- + +- Feature: Add `path` and `repository` properties to conan_build_info v2. `#8436 `_ +- Feature: Setting _conan_ as name for `buildAgent` in `conan_build_info`. `#8433 `_ +- Feature: Using actual conan version in version for `buildAgent` in `conan_build_info` instead of 1.X. `#8433 `_ +- Feature: Add `type` _conan_ to Conan build info modules. `#8433 `_ +- Feature: Add ``scm`` output in :command:`conan info` command. `#8380 `_ +- Feature: Forked ``cmake_find_package_multi`` into ``CMakeDeps``, to allow evolution without breaking. `#8371 `_ +- Feature: Use built-in retries in requests lib to retry http requests with _5xx_ response code. `#8352 `_ +- Feature: New lockfile "bundle" feature that can integrate different lockfiles for different configurations and different graphs into a single lockfile bundle that can be used to vastly optimize CI (specially for multiple products), implementing bundle build-order and bundle update operations. `#8344 `_ . Docs `here `__ +- Fix: Renamed generator `QbsToolchain` to `QbsProfile`. `#8537 `_ . Docs `here `__ +- Fix: Renamed default filename of _QbsProfile_ generated file to _conan_toolchain_profile_.qbs. `#8537 `_ . Docs `here `__ +- Fix: Renamed Qbs attribute `use_toolchain_profile` to `profile`. `#8537 `_ . Docs `here `__ +- Fix: Remove extra spaces in flags and colons in path variables. `#8496 `_ +- Fix: `conan_v2_error` if `scm_to_conandata` is not enabled. `#8447 `_ +- Fix: `CONAN_V2_MODE` env-var does not longer alter behavior, only raises errors for Conan 2.0 incompatibilities `#8399 `_ . Docs `here `__ +- Fix: meson : Add target and jobs arguments. `#8384 `_ . Docs `here `__ +- Fix: Set `qbs.targetPlatform` with qbs toolchain. `#8372 `_ +- Fix: Remove warnings for old toolchains imports and ``generate_toolchain_files()`` calls (use new imports and ``generate()`` calls. `#8361 `_ +- BugFix: Improve `tools.unix_path` for Cygwin. `#8509 `_ +- BugFix: Allow `run_in_windows_bash` in MSYS/Cygwin. `#8506 `_ +- BugFix: Add some sanity check to avoid a vague error for custom architectures. `#8502 `_ +- BugFix: Fix Apple M1 detection. `#8501 `_ +- Bugfix: Fix repeated ``build_requires``, including conflicting versions in profile composition or inclusion that repeats ``[build_requires]`` values. `#8463 `_ +- Bugfix: Fixing a `CMakeDeps` bug with components, not finding the _conan_macros.cmake_ file. `#8445 `_ +- Bugfix: Fix exit code for `conan_build_info`. `#8408 `_ + 1.33.1 (02-Feb-2021) -------------------- diff --git a/conf.py b/conf.py index cbad054deaf..0f0e47059d2 100644 --- a/conf.py +++ b/conf.py @@ -41,9 +41,9 @@ ] # The short X.Y version. -version = "1.33" +version = "1.34" # The full version, including alpha/beta/rc tags. -release = u'1.33.1' +release = u'1.34.0' dir_path = os.path.dirname(os.path.realpath(__file__)) if not os.path.exists(os.path.join(dir_path, "versions.json")):