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.

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

refactor apple_min_version_flag() #16017

Merged

Conversation

memsharded
Copy link
Member

Changelog: Omit
Docs: Omit

Close #15494

Copy link
Member Author

@memsharded memsharded left a comment

Choose a reason for hiding this comment

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

Looking good!

conan/tools/apple/apple.py Outdated Show resolved Hide resolved
@@ -82,40 +85,3 @@ def test_to_apple_arch(self):
self.assertEqual(_to_apple_arch('armv8_32'), 'arm64_32')
self.assertIsNone(_to_apple_arch('mips'))
self.assertEqual(_to_apple_arch('mips', default='mips'), 'mips')

@pytest.mark.skipif(platform.system() != "Darwin", reason="Requires OSX")
def test_xcrun(self):
Copy link
Contributor

@franramirez688 franramirez688 Apr 8, 2024

Choose a reason for hiding this comment

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

Moved to integration tests. It's running xcrun tool so, IMO, better to keep it there.

@franramirez688 franramirez688 marked this pull request as ready for review April 8, 2024 09:18
"""
if not is_apple_os(conanfile):
# Keeping legacy defaults
return "", None, None
Copy link
Contributor

Choose a reason for hiding this comment

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

@memsharded keeping legacy behavior.

@franramirez688 franramirez688 added this to the 2.3.0 milestone Apr 8, 2024
Copy link
Member Author

@memsharded memsharded left a comment

Choose a reason for hiding this comment

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

LGTM

@franramirez688 franramirez688 merged commit 0f16d0b into conan-io:develop2 Apr 8, 2024
2 checks passed
memsharded added a commit to memsharded/conan that referenced this pull request Apr 9, 2024
* refactor apple_min_version_flag()

* Refactored all the apple module and where it was being used (AutotoolsToolchain and MesonToolchain for now)

* Fixed bad return

* Fixing tests

* Keeping legacy behavior in apple_min_version_flag function

* Preventing possible breaking change

---------

Co-authored-by: Francisco Ramirez de Anton <franchuti688@gmail.com>
memsharded added a commit to memsharded/conan that referenced this pull request Apr 10, 2024
* refactor apple_min_version_flag()

* Refactored all the apple module and where it was being used (AutotoolsToolchain and MesonToolchain for now)

* Fixed bad return

* Fixing tests

* Keeping legacy behavior in apple_min_version_flag function

* Preventing possible breaking change

---------

Co-authored-by: Francisco Ramirez de Anton <franchuti688@gmail.com>
@memsharded memsharded deleted the refactor/apple_min_version branch April 10, 2024 21:39
memsharded added a commit that referenced this pull request Apr 11, 2024
* cmake deps internal refactor for readability

* fix

* fix

* fix

* fix

* fix

* copy only if different (#16031)

* allow conf in exports-sources and export (#16034)

* refactor apple_min_version_flag() (#16017)

* refactor apple_min_version_flag()

* Refactored all the apple module and where it was being used (AutotoolsToolchain and MesonToolchain for now)

* Fixed bad return

* Fixing tests

* Keeping legacy behavior in apple_min_version_flag function

* Preventing possible breaking change

---------

Co-authored-by: Francisco Ramirez de Anton <franchuti688@gmail.com>

* Allow to unhide git url (#16038)

* Add hide_url tests for git scm tool

* Add hide_url flag to clone and fetch_commit.

Resolves #15684

* Update conans/test/functional/tools/scm/test_git.py

* Update conans/test/functional/tools/scm/test_git.py

---------

Co-authored-by: Rubén Rincón Blanco <git@rinconblanco.es>

* remove repeated non-running test (#16053)

* refactor transitive_requires

---------

Co-authored-by: Francisco Ramirez de Anton <franchuti688@gmail.com>
Co-authored-by: Sebastian Höffner <info@sebastian-hoeffner.de>
Co-authored-by: Rubén Rincón Blanco <git@rinconblanco.es>
czoido pushed a commit that referenced this pull request Jun 4, 2024
* wip

* wip

* wip

* Test for BazelDeps in the build context (#16025)

* feat add test to bazeldeps

* Fixed several bugs. Improved tests coverage

* Reverted

* Better name

---------

Co-authored-by: Francisco Ramirez de Anton <franchuti688@gmail.com>

* copy only if different (#16031)

* allow conf in exports-sources and export (#16034)

* refactor apple_min_version_flag() (#16017)

* refactor apple_min_version_flag()

* Refactored all the apple module and where it was being used (AutotoolsToolchain and MesonToolchain for now)

* Fixed bad return

* Fixing tests

* Keeping legacy behavior in apple_min_version_flag function

* Preventing possible breaking change

---------

Co-authored-by: Francisco Ramirez de Anton <franchuti688@gmail.com>

* Allow to unhide git url (#16038)

* Add hide_url tests for git scm tool

* Add hide_url flag to clone and fetch_commit.

Resolves #15684

* Update conans/test/functional/tools/scm/test_git.py

* Update conans/test/functional/tools/scm/test_git.py

---------

Co-authored-by: Rubén Rincón Blanco <git@rinconblanco.es>

* wip

* wip

* wip

* fix

* Update conan/tools/build/cstd.py

Co-authored-by: Rubén Rincón Blanco <git@rinconblanco.es>

* Update conan/tools/build/cstd.py

Co-authored-by: Rubén Rincón Blanco <git@rinconblanco.es>

* Update conan/tools/build/cstd.py

Co-authored-by: Rubén Rincón Blanco <git@rinconblanco.es>

---------

Co-authored-by: Ernesto de Gracia Herranz <vivalaburocracia@hotmail.com>
Co-authored-by: Francisco Ramirez de Anton <franchuti688@gmail.com>
Co-authored-by: Sebastian Höffner <info@sebastian-hoeffner.de>
Co-authored-by: Rubén Rincón Blanco <git@rinconblanco.es>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[technical debt] Review the flow after using the get_apple_sdk_fullname helper
3 participants