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

conditional generators test with configure() #7359

Merged
merged 4 commits into from Jul 15, 2020
Merged

conditional generators test with configure() #7359

merged 4 commits into from Jul 15, 2020

Conversation

memsharded
Copy link
Member

@memsharded memsharded commented Jul 14, 2020 •
edited by czoido

Changelog: Omit
Docs: conan-io/docs#1792

Just a test that proves that configure() is a good place for conditional generators. Do we want to add yet another method for this?

Close #7267

@memsharded memsharded added this to the 1.28 milestone Jul 14, 2020
@memsharded memsharded mentioned this pull request Jul 14, 2020
Closed
@madebr
Copy link
Contributor

madebr commented Jul 14, 2020

No new method needed.
Adding it conditionally in configure works flawlessly for cpython at conan-io/conan-center-index#1510

@jgsogo
Copy link
Contributor

jgsogo commented Jul 15, 2020

Can you add a generator from the command line to those tests and append it to self.generators?

My main concern about adding things to the configure() method is that they are not available to the conan inspect command. Does it make sense to add it to conan info now?

@memsharded
Copy link
Member Author

My main concern about adding things to the configure() method is that they are not available to the conan inspect command. Does it make sense to add it to conan info now?

Yes, but this is irrespective of the solution, if the generators are conditioned on the settings, the inspect will not be able to display it. Yes, I guess it could be added to conan info, but maybe not necessary at this point.

I am going to try to relax the msbuild so it doesn't fail on Linux.

@memsharded memsharded mentioned this pull request Jul 15, 2020
Merged
@memsharded
Copy link
Member Author

Proposed to relax msbuild (in theory it can be used for Linux builds too) in #7361

jgsogo
jgsogo reviewed Jul 15, 2020
View reviewed changes
conans/test/functional/generators/generators_test.py
client.run('install . -s os=Windows -s compiler="Visual Studio" -s compiler.version=15'
' -s compiler.runtime=MD -g cmake')
self.assertIn("conanfile.py: Generator msbuild created conan_deps.props", client.out)
self.assertIn("conanfile.py: Generator cmake created conanbuildinfo.cmake", client.out)
Copy link
Contributor

Choose a reason for hiding this comment

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

This one really surprised me! It looks like you are overriding the generators, but CLI ones are appended:

if self.settings.os == "Windows":
    self.generators = ["msbuild"]

I like this behavior, but I was not expecting it...

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, they are appended at the very last minute, just before calling write_generators:

conan/conans/client/manager.py

Line 96 in 8eabf18

if generators is not False:

jgsogo
jgsogo approved these changes Jul 15, 2020
View reviewed changes
Copy link
Contributor

@jgsogo jgsogo left a comment

Choose a reason for hiding this comment

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

IMO, we can add this test. I think that the configure() method is a good place to override these kinds of things that might depend on the settings/options.

@memsharded memsharded merged commit eb92d3b into conan-io:develop Jul 15, 2020
@memsharded memsharded deleted the feature/conditional_generators branch July 15, 2020 14:24
memsharded added a commit to noizex/conan that referenced this pull request Jul 21, 2020
@memsharded
conditional generators test with configure() (conan-io#7359)
43189fb 
* conditional generators test with configure()

* fixing test

* fixing test

* adding generators in the command line
memsharded added a commit that referenced this pull request Jul 21, 2020
@noizex @jgsogo
@memsharded @czoido @uilianries
Only add User-Agent to headers dict if there was none provided by the…
0c63663 
… user (#7390)

* Only add User-Agent to headers dict if there was none provided by the user

* [cpp_info] [refact] Do not assign to 'xxxx_paths' fields (#7276)

* use get_configs instead of config

* fixing tests

* fix tests

* fix tests

* move pkg_config logic to cpp_info so everyone uses the same

* 'name' from cpp_info needs the generator it is requested for

* configs is a private dict now

* revert change in init

* add test for Conan v2 behavior

* deps_cpp_info['deps'].name warns to use get_name instead

* use cpp_info properly

* compare as lists (convert possible iterables to lists)

* set legit values in cpp_info

* readonly fields expected to be iterable (not nessessaryly lists)

* remove print statement from test

* let any iterable type in

* revert test changes

* use property 'configs' to retrieve the different configs

* check type for cpp_info/deps_cpp_info objects

* just a list

* Do not fail with 'conan remove -r remote -p' if there are no packages in the remote (#7338)

* remove only if there are packages to remove

* working on v1 too

* no need to scape an r-string

* v1 -> no revs

* if not conaninfo, search doesn't work

* propagate 404 only if there are packages for the reference

* Update conans/client/rest/rest_client_v1.py

Co-authored-by: James <james@conan.io>

* when it is not none

* package_ids is always a list. Capture unrelated errors

Co-authored-by: James <james@conan.io>

* [cpp_info] [refact] Rewrite text generator parser (#7277)

* use get_configs instead of config

* fixing tests

* fix tests

* fix tests

* move pkg_config logic to cpp_info so everyone uses the same

* 'name' from cpp_info needs the generator it is requested for

* configs is a private dict now

* revert change in init

* add test for Conan v2 behavior

* deps_cpp_info['deps'].name warns to use get_name instead

* some attributes doesn't make sense at the base level

* rewrite txt parser

* revert test changes

* use property 'configs' to retrieve the different configs

* Avoid usage of '__len__' hook

* fixing test: never root

* read names from txt serialization

* the only information that is serialized in the 'txt' generated file is the name for the txt generator

* use ordereddict to retrieve deps in order

* add test for next Conan v2

* remove commented lines

* remove unused method

* wrong behavior in py2 for it scope

* fix tests in windows

* revert single change

* relax msbuild generator to not fail in Linux (#7361)

* relax msbuild generator to not fail in Linux

* fix test

* cli 2.0: Add commands management (#7278)

* add management for commands 2.0

* refactor cli

* fail on empty docs

* rename _conan to _conan_api

* minimum required version

* add fixme for conan factory

* add discuss

* raise on not allowed formatter

* refactor weird try, except, finally pattern

* change output handling

* remove weird pattern

* minor changes

* move exception handling

* use formatters as dictonary

* minor changes

* do not allow empty remotee

* add output argument only if there are formatters

* move exit codes

* change default formatter

* add init

* conditional generators test with configure() (#7359)

* conditional generators test with configure()

* fixing test

* fixing test

* adding generators in the command line

* #7328 Add 'outdated' column in search table (#7364)

* #7328 Add 'outdated' column in search table

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

* #7328 do not remove more than requested

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

* #7328 Separate functional test

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

* #7328 Update other test to support outdated column

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

* #7364 No need for an additional test (#7373)

* implementing __contains__ for option in self.info.options (#7303)

* implementing __contains__ for option in self.info.options

* add test

* more tests

* clarified test

* changed self.info.options.whatever to raise

* improve tests

* fix tests

* Update conans/test/functional/package_id/package_id_test.py

Co-authored-by: Javier G. Sogo <jgsogo@gmail.com>

* Update conans/test/functional/package_id/package_id_test.py

Co-authored-by: Javier G. Sogo <jgsogo@gmail.com>

* fixed test

Co-authored-by: Javier G. Sogo <jgsogo@gmail.com>

* minor pep8 in conan_api.py

* contribute test

Co-authored-by: Javier G. Sogo <jgsogo@gmail.com>
Co-authored-by: James <james@conan.io>
Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
Co-authored-by: Uilian Ries <uilianries@gmail.com>
@czoido czoido mentioned this pull request Jul 30, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jgsogo jgsogo jgsogo approved these changes

Assignees

@jgsogo jgsogo

Labels
type: look into
Projects
None yet
Milestone
1.28
Development

Successfully merging this pull request may close these issues.

[bug] msbuild generator only works with Visual Studio compiler
3 participants
@memsharded @madebr @jgsogo