Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Troubleshooting: How to fix incompatible requirements #2016

Merged
merged 10 commits into from Feb 22, 2021
Merged

Troubleshooting: How to fix incompatible requirements #2016

merged 10 commits into from Feb 22, 2021

Conversation

uilianries
Copy link
Member

This FAQ comes from:

https://stackoverflow.com/questions/66078352/conan-error-incompatible-requirements-obtained-in-different-evaluations-of-req

I can't remember if we have such solution in docs, but when looking for Incompatible requirements obtained in different evaluations of 'requirements' I find anything.

danimtb
danimtb approved these changes Feb 10, 2021
View reviewed changes
Copy link
Member

@danimtb danimtb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I think this is needed and can't tell if it was documented. Anyway it is legit to have it in the FAQ

czoido
czoido reviewed Feb 17, 2021
View reviewed changes
faq/troubleshooting.rst Outdated Show resolved Hide resolved
czoido
czoido reviewed Feb 17, 2021
View reviewed changes
faq/troubleshooting.rst Outdated Show resolved Hide resolved
czoido
czoido reviewed Feb 17, 2021
View reviewed changes
faq/troubleshooting.rst Outdated Show resolved Hide resolved
czoido
czoido reviewed Feb 17, 2021
View reviewed changes
faq/troubleshooting.rst Outdated Show resolved Hide resolved
@czoido
Copy link
Contributor

czoido commented Feb 17, 2021 •
edited

@uilianries, I think this will be useful in the faq, just some minor comments and also I think that it would be nice to link this: https://docs.conan.io/en/latest/versioning/introduction.html?#dependencies-overriding

uilianries and others added 4 commits February 19, 2021 08:29
@uilianries @czoido
Update faq/troubleshooting.rst
858cee0 
Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
@uilianries @czoido
Update faq/troubleshooting.rst
8121c58 
Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
@uilianries @czoido
Update faq/troubleshooting.rst
6c33b98 
Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
@uilianries @czoido
Update faq/troubleshooting.rst
9310863 
Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
uilianries
uilianries commented Feb 19, 2021
View reviewed changes
faq/troubleshooting.rst Outdated Show resolved Hide resolved
@uilianries
Copy link
Member Author

@czoido Yes, thanks for your review! I've added overriding link to the section.

@uilianries
Fix bad indentation
62da715 
Signed-off-by: Uilian Ries <uilianries@gmail.com>
@czoido czoido merged commit b421bdd into conan-io:master Feb 22, 2021
czoido added a commit that referenced this pull request Feb 26, 2021
@czoido @memsharded
@chausner @danimtb @uilianries
Merge master to develop (#2033)
8700e20 
* 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>
czoido added a commit that referenced this pull request Feb 26, 2021
@czoido @memsharded
@chausner @danimtb @uilianries
Merge master to release branch (#2034)
e65f5fc 
* 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>
czoido added a commit that referenced this pull request Feb 26, 2021
@czoido @rico-chet
@SSE4 @memsharded @chausner @Psy-Kai @danimtb @uilianries
Release 1.34.0 (#2035)
06f021f 
* 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>
czoido added a commit that referenced this pull request Feb 26, 2021
@czoido @memsharded
@chausner @danimtb @uilianries @rico-chet @SSE4 @Psy-Kai
Merge master to develop (#2036)
1c8081d 
* 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>
czoido added a commit that referenced this pull request Mar 30, 2021
@czoido @rico-chet
@SSE4 @memsharded @chausner @Psy-Kai @danimtb @uilianries @melak47 @jsinge @solvingj
Release/1.35.0 (#2063)
7398981 
* 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>
czoido added a commit that referenced this pull request Mar 30, 2021
@czoido @solvingj
@rico-chet @SSE4 @memsharded @chausner @Psy-Kai @danimtb @uilianries @melak47 @jsinge
Merge master develop 1.35.0 (#2064)
f0c168e 
* 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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@czoido czoido czoido left review comments

@danimtb danimtb danimtb approved these changes

Assignees

@czoido czoido

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@uilianries @czoido @danimtb