Skip to content

Commit

Permalink
Merge master develop 1.35.0 (#2064)
Browse files Browse the repository at this point in the history 
* Update lockfile bundle docs for 1.34.1 (#2040)

* Update lockfile bundle docs for 1.34.1

* Remove erroneous colon

Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>

* Release/1.35.0 (#2063)

* buildroot.rst: Fix a typo (#1996)

Artifatory --> Artifactory

* - meson : add target argument (#2011)

Signed-off-by: SSE4 <tomskside@gmail.com>

* 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 <mrgalleta@gmail.com>

Co-authored-by: James <james@conan.io>
Co-authored-by: chausner <chausner@users.noreply.github.com>

* 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 <mrgalleta@gmail.com>

Co-authored-by: James <james@conan.io>
Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>

* 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 <mrgalleta@gmail.com>

* Update versioning/lockfiles/bundle.rst

Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>

* Update versioning/lockfiles/bundle.rst

Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>

* Update versioning/lockfiles/bundle.rst

Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>

* Update versioning/lockfiles/bundle.rst

Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>

Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>

* Merge master to develop (#2033)

* 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 <mrgalleta@gmail.com>

* 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 <uilianries@gmail.com>

* Update faq/troubleshooting.rst

Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>

* Update faq/troubleshooting.rst

Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>

* Update faq/troubleshooting.rst

Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>

* Update faq/troubleshooting.rst

Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>

* Update faq/troubleshooting.rst

* Fix bad indentation

Signed-off-by: Uilian Ries <uilianries@gmail.com>

Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>

Co-authored-by: James <james@conan.io>
Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: Daniel <danimanzaneque@gmail.com>
Co-authored-by: Uilian Ries <uilianries@gmail.com>

* 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 <mrgalleta@gmail.com>

* 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 <uilianries@gmail.com>

* Update faq/troubleshooting.rst

Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>

* Update faq/troubleshooting.rst

Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>

* Update faq/troubleshooting.rst

Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>

* Update faq/troubleshooting.rst

Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>

* Update faq/troubleshooting.rst

* Fix bad indentation

Signed-off-by: Uilian Ries <uilianries@gmail.com>

Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>

* Release 1.34.0 (#2035)

* buildroot.rst: Fix a typo (#1996)

Artifatory --> Artifactory

* - meson : add target argument (#2011)

Signed-off-by: SSE4 <tomskside@gmail.com>

* 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 <mrgalleta@gmail.com>

Co-authored-by: James <james@conan.io>
Co-authored-by: chausner <chausner@users.noreply.github.com>

* 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 <mrgalleta@gmail.com>

Co-authored-by: James <james@conan.io>
Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>

* 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 <mrgalleta@gmail.com>

* Update versioning/lockfiles/bundle.rst

Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>

* Update versioning/lockfiles/bundle.rst

Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>

* Update versioning/lockfiles/bundle.rst

Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>

* Update versioning/lockfiles/bundle.rst

Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>

Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>

* 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 <mrgalleta@gmail.com>

* 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 <uilianries@gmail.com>

* Update faq/troubleshooting.rst

Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>

* Update faq/troubleshooting.rst

Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>

* Update faq/troubleshooting.rst

Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>

* Update faq/troubleshooting.rst

Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>

* Update faq/troubleshooting.rst

* Fix bad indentation

Signed-off-by: Uilian Ries <uilianries@gmail.com>

Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>

Co-authored-by: James <james@conan.io>
Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: Daniel <danimanzaneque@gmail.com>
Co-authored-by: Uilian Ries <uilianries@gmail.com>

Co-authored-by: rico-chet <rico-chet@users.noreply.github.com>
Co-authored-by: SSE4 <tomskside@gmail.com>
Co-authored-by: James <james@conan.io>
Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: Psy-Kai <psykai1993@googlemail.com>
Co-authored-by: Daniel <danimanzaneque@gmail.com>
Co-authored-by: Uilian Ries <uilianries@gmail.com>

Co-authored-by: James <james@conan.io>
Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: Daniel <danimanzaneque@gmail.com>
Co-authored-by: Uilian Ries <uilianries@gmail.com>
Co-authored-by: rico-chet <rico-chet@users.noreply.github.com>
Co-authored-by: SSE4 <tomskside@gmail.com>
Co-authored-by: Psy-Kai <psykai1993@googlemail.com>

* update constrained settings example error message (#2032)

* Make the instructions in the note about gcc libcxx ABI compatibility more explicit. (#2037)

* More explicit instructions on the Getting Started page
* Provide a command to check gccs default configuration value on the Manage gcc >= 5 ABI page.

* - document custom template definitions (#2051)

Signed-off-by: SSE4 <tomskside@gmail.com>

* Docs for lockfiles features from 1.35 (#2053)

* modify command reference

* update lock reference

* wip

* document clean-modified for lockfiles

* update bundle docs

* document conan lock install

* Docs for automatically handle CONAN_RUN_TESTS environment variable (#2056)

* wip

* wip

* update bh docs

* Add docs for CMAKE_SH and data in cmakedeps (#2055)

* Add docs for CMAKE_SH and data in cmakedeps

* remove note box

* Update lockfile bundle docs for 1.34.1 (#2040) (#2058)

* Update lockfile bundle docs for 1.34.1

* Remove erroneous colon

Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>

Co-authored-by: Jerry Wiltse <jerrywiltse@gmail.com>

* update cconf (#2059)

* add confs (#2061)

* docs for new msbuilddeps transitivity (#2052)

* docs for new msbuilddeps transitivity

* fix ci

Co-authored-by: czoido <mrgalleta@gmail.com>

* add docs for patches (#2062)

* autotools docs (#2057)

* autotools docs

* add marker

Co-authored-by: czoido <mrgalleta@gmail.com>

* Feature/tools virtualenv (#2060)

* add virtualenv and environment docs

* removing env from .gitignore

* fix contents

Co-authored-by: czoido <mrgalleta@gmail.com>

* [conf] to define vs version for msvc (#2054)

* [conf] to define vs version for msvc

* notes about ``conanvcvars.bat`` file creation

* fix ci

* Update reference/config_files/settings.yml.rst

Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>

* add to conf

Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>

* version 1.35.0

* update changelog

Co-authored-by: rico-chet <rico-chet@users.noreply.github.com>
Co-authored-by: SSE4 <tomskside@gmail.com>
Co-authored-by: James <james@conan.io>
Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: Psy-Kai <psykai1993@googlemail.com>
Co-authored-by: Daniel <danimanzaneque@gmail.com>
Co-authored-by: Uilian Ries <uilianries@gmail.com>
Co-authored-by: melak47 <melak47@users.noreply.github.com>
Co-authored-by: jsinge <jonsinge@freenet.de>
Co-authored-by: Jerry Wiltse <jerrywiltse@gmail.com>

Co-authored-by: Jerry Wiltse <jerrywiltse@gmail.com>
Co-authored-by: rico-chet <rico-chet@users.noreply.github.com>
Co-authored-by: SSE4 <tomskside@gmail.com>
Co-authored-by: James <james@conan.io>
Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: Psy-Kai <psykai1993@googlemail.com>
Co-authored-by: Daniel <danimanzaneque@gmail.com>
Co-authored-by: Uilian Ries <uilianries@gmail.com>
Co-authored-by: melak47 <melak47@users.noreply.github.com>
Co-authored-by: jsinge <jonsinge@freenet.de>
  • Loading branch information
@czoido @solvingj
@rico-chet @SSE4 @memsharded @chausner @Psy-Kai @danimtb @uilianries @melak47 @jsinge
11 people committed Mar 30, 2021
1 parent c95a316 commit f0c168e
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 3 deletions.
1 change: 1 addition & 0 deletions .ci/publish.jenkins
View file
Expand Up @@ -2,6 +2,7 @@

// TODO: Move to a file and avoid modifying CI script
Map<String, String> versions = [
'release/1.35.0': '1.35',
'release/1.34.1': '1.34',
'release/1.33.1': '1.33',
'release/1.32.1': '1.32',
Expand Down
45 changes: 44 additions & 1 deletion changelog.rst
View file
Expand Up @@ -18,9 +18,52 @@ Check https://github.com/conan-io/conan for issues and more details about develo

.. important::

Conan 1.34 shouldn't break any existing 1.0 recipe or command line invocation. If it does, please
Conan 1.35 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.35.0 (30-Mar-2021)
--------------------

- Feature: ``MSBuildDeps`` generator uses new visitor model and handles conditional requirements correctly. `#8733 <https://github.com/conan-io/conan/pull/8733>`_ . Docs `here <https://github.com/conan-io/docs/pull/2052>`__
- Feature: CMake toolchain supports include_guard() feature `#8728 <https://github.com/conan-io/conan/pull/8728>`_
- Feature: New ``conan lock bundle clean-modified`` command. `#8726 <https://github.com/conan-io/conan/pull/8726>`_ . Docs `here <https://github.com/conan-io/docs/pull/2053>`__
- Feature: Use ``conancvvars.bat`` file for Meson toolchain `#8719 <https://github.com/conan-io/conan/pull/8719>`_
- Feature: Allow arbitrary defines in :command:`conan new` templates. `#8718 <https://github.com/conan-io/conan/pull/8718>`_ . Docs `here <https://github.com/conan-io/docs/pull/2051>`__
- Feature: Automatically handle `CONAN_RUN_TESTS` to avoid extra boilerplate. `#8687 <https://github.com/conan-io/conan/pull/8687>`_ . Docs `here <https://github.com/conan-io/docs/pull/2056>`__
- Feature: More fine-grained control (using [conf]) for build parallelization. `#8665 <https://github.com/conan-io/conan/pull/8665>`_ . Docs `here <https://github.com/conan-io/docs/pull/2061>`__
- Feature: Add support for testing with different tools versions. `#8656 <https://github.com/conan-io/conan/pull/8656>`_
- Feature: Add different CMake versions for testing. `#8656 <https://github.com/conan-io/conan/pull/8656>`_
- Feature: Move the definition of CMakeDeps variables to its own file `#8655 <https://github.com/conan-io/conan/pull/8655>`_ . Docs `here <https://github.com/conan-io/docs/pull/2055>`__
- Feature: Added `conan.tools.files.patch` to apply a single patch (new interface for legacy `conans.tools.patch` function. `#8650 <https://github.com/conan-io/conan/pull/8650>`_ . Docs `here <https://github.com/conan-io/docs/pull/2062>`__
- Feature: Added `conan.tools.files.apply_conandata_patches` to apply patches defined in `conandata.yml`. `#8650 <https://github.com/conan-io/conan/pull/8650>`_ . Docs `here <https://github.com/conan-io/docs/pull/2062>`__
- Feature: Allow integers as ``preprocessor_definitions`` in ``CMakeToolchain``. `#8645 <https://github.com/conan-io/conan/pull/8645>`_
- Feature: New ``Environment`` model for recipes and profiles `#8630 <https://github.com/conan-io/conan/pull/8630>`_ . Docs `here <https://github.com/conan-io/docs/pull/2060>`__
- Feature: Do not remove sh from the path in the new CMake helper. `#8625 <https://github.com/conan-io/conan/pull/8625>`_ . Docs `here <https://github.com/conan-io/docs/pull/2055>`__
- Feature: Allow definition of custom Visual Studio version for msvc compiler in MSBuild helpers. `#8603 <https://github.com/conan-io/conan/pull/8603>`_ . Docs `here <https://github.com/conan-io/docs/pull/2054>`__
- Feature: MSBuildToolchain creates conanvcvars.bat containing vcvars command for command line building. `#8603 <https://github.com/conan-io/conan/pull/8603>`_ . Docs `here <https://github.com/conan-io/docs/pull/2054>`__
- Feature: Set `CMAKE_FIND_PACKAGE_PREFER_CONFIG=ON`. `#8599 <https://github.com/conan-io/conan/pull/8599>`_
- Feature: Include the recipe name when constrained settings prevent install. `#8559 <https://github.com/conan-io/conan/pull/8559>`_ . Docs `here <https://github.com/conan-io/docs/pull/2032>`__
- Feature: Create new conan.tools.files for 2.0. `#8550 <https://github.com/conan-io/conan/pull/8550>`_
- Feature: New AutotoolsDeps, AutotoolsToolchain helpers in conan.tools.gnu `#8457 <https://github.com/conan-io/conan/pull/8457>`_ . Docs `here <https://github.com/conan-io/docs/pull/2057>`__
- Feature: Experimental ``conan lock install`` that can install a lockfile in the cache, all the binaries or only the recipes with ``--recipes``, intended for CI flows. `#8021 <https://github.com/conan-io/conan/pull/8021>`_ . Docs `here <https://github.com/conan-io/docs/pull/2053>`__
- Fix: Fix incorrect output of ``default_user`` and ``default_channel`` in ``export``. `#8732 <https://github.com/conan-io/conan/pull/8732>`_
- Fix: remotes not being loaded for the :command:`conan alias` command, which was preventing :command:`conan alias` from working if python_requires is used. `#8704 <https://github.com/conan-io/conan/pull/8704>`_
- Fix: Improve error message for ``lock create`` providing a path instead of full path with filename. `#8695 <https://github.com/conan-io/conan/pull/8695>`_
- Fix: Rename `tools.microsoft:msbuild_verbosity` to `tools.microsoft.msbuild:verbosity` `#8692 <https://github.com/conan-io/conan/pull/8692>`_ . Docs `here <https://github.com/conan-io/docs/pull/2059>`__
- Fix: Simplifications to ``CMakeDeps`` generator to remove legacy code. `#8666 <https://github.com/conan-io/conan/pull/8666>`_
- Fix: Add dirty management in download cache, so interrupted downloads doesn't need a manual cleaning of such download cache. `#8664 <https://github.com/conan-io/conan/pull/8664>`_
- Fix: Build helper qbs install now installs directly into package_folder. `#8660 <https://github.com/conan-io/conan/pull/8660>`_
- Fix: Allow arbitrary template structure. `#8641 <https://github.com/conan-io/conan/pull/8641>`_
- Fix: Restoring the behavior that `exports` and `exports_sources` were case sensitive by default. `#8585 <https://github.com/conan-io/conan/pull/8585>`_
- Fix: Remove default dummy value for iOS XCode signature. `#8576 <https://github.com/conan-io/conan/pull/8576>`_
- Fix: Do not order Settings lists, so error messages are in declared order. `#8573 <https://github.com/conan-io/conan/pull/8573>`_
- BugFix: Command :command:`conan new` accepts short reference with address sign. `#8721 <https://github.com/conan-io/conan/pull/8721>`_
- Bugfix: Fix profile definitions of env-vars per-package using patterns, not only the package name. `#8688 <https://github.com/conan-io/conan/pull/8688>`_
- Bugfix: Preserve the explicit value `None` for SCM attributes if the default is a different value. `#8622 <https://github.com/conan-io/conan/pull/8622>`_
- Bugfix: Properly detect Amazon Linux 2 distro. `#8612 <https://github.com/conan-io/conan/pull/8612>`_
- Bugfix: Fix config install not working when .git* folder is in the path. `#8605 <https://github.com/conan-io/conan/pull/8605>`_
- Bugfix: Fix: Transitive python requires not working with the new syntax. `#8604 <https://github.com/conan-io/conan/pull/8604>`_

1.34.1 (10-Mar-2021)
--------------------

Expand Down
4 changes: 2 additions & 2 deletions conf.py
View file
Expand Up @@ -41,9 +41,9 @@
]

# The short X.Y version.
version = "1.34"
version = "1.35"
# The full version, including alpha/beta/rc tags.
release = u'1.34.1'
release = u'1.35.0'

dir_path = os.path.dirname(os.path.realpath(__file__))
if not os.path.exists(os.path.join(dir_path, "versions.json")):
Expand Down

0 comments on commit f0c168e

Please sign in to comment.