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

icu: validate dat package file exists #14980

Merged
merged 19 commits into from
Feb 14, 2023

Conversation

System-Arch
Copy link
Contributor

Specify library name and version: icu71.1

Addressed some issues that were preventing ICU use with Conan 2.0 as noted in #14979 and #12888


@conan-center-bot

This comment has been minimized.

@System-Arch
Copy link
Contributor Author

These changes now build on a sufficiently new version of Conan 2.0 (that is to say, newer that what CCI is presently running) but they fail the v2 migration lint checks because they rely on _get_gnu_triplet, which is not part of the published V2 API. While there are various threads on related topics (e.g., conan-io/conan#12546 and conan-io/conan#7565), it's not obvious (at least to me) that the solutions to these issues will obviate the need expressed in this recipe.

@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

Copy link
Contributor

@prince-chrismc prince-chrismc left a comment

Choose a reason for hiding this comment

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

Two small question, I am not sure about the private import 🤔 so I asked the team to see since it's planned for the next release

recipes/icu/all/conanfile.py Outdated Show resolved Hide resolved
from conan.tools.env import Environment, VirtualBuildEnv
from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, mkdir, rename, replace_in_file, rm, rmdir, save
from conan.tools.gnu import Autotools, AutotoolsToolchain
from conan.tools.gnu.get_gnu_triplet import _get_gnu_triplet # Ugly but not currently exported in Conan 2.0
Copy link
Contributor

Choose a reason for hiding this comment

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

conan-io/conan#12546 is marked for 1.57 so I poked the dev team to see what might come of it 🤞

recipes/icu/all/conanfile.py Outdated Show resolved Hide resolved
Co-authored-by: Chris Mc <prince.chrismc@gmail.com>
@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

@Nekto89
Copy link
Contributor

Nekto89 commented Jan 19, 2023

does this fix ios on mac m1?

Co-authored-by: Marian Klymov <nekto1989@gmail.com>
@conan-center-bot

This comment has been minimized.

Co-authored-by: Marian Klymov <nekto1989@gmail.com>
@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

@ghost
Copy link

ghost commented Feb 6, 2023

I detected other pull requests that are modifying icu/all recipe:

This message is automatically generated by https://github.com/ericLemanissier/conan-center-conflicting-prs so don't hesitate to report issues/improvements there.

Copy link
Contributor

@prince-chrismc prince-chrismc left a comment

Choose a reason for hiding this comment

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

Few extra infos are there

recipes/icu/all/conanfile.py Outdated Show resolved Hide resolved
recipes/icu/all/conanfile.py Outdated Show resolved Hide resolved

required_conan_version = ">=1.53.0"
required_conan_version = ">=1.54.0"
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
required_conan_version = ">=1.54.0"
required_conan_version = ">=1.57.0"

Copy link
Contributor

@prince-chrismc prince-chrismc left a comment

Choose a reason for hiding this comment

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

3 tiny comments and FYI there's merge conflicts but otherwise this looks really good 👍

recipes/icu/all/conanfile.py Outdated Show resolved Hide resolved
@ghost ghost mentioned this pull request Feb 8, 2023
@prince-chrismc
Copy link
Contributor

there's merge conflict and @jcar87 has a conflicting PR that's green just FYI

@prince-chrismc prince-chrismc marked this pull request as draft February 10, 2023 19:41
@prince-chrismc
Copy link
Contributor

Trying to fix this 🤞

@prince-chrismc prince-chrismc changed the title ICU Conan 2.0 compatibility tweaks icu: validate dat package file exists Feb 10, 2023
@prince-chrismc prince-chrismc marked this pull request as ready for review February 10, 2023 19:46
Copy link
Contributor

@prince-chrismc prince-chrismc left a comment

Choose a reason for hiding this comment

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

I'm perfect

image

Comment on lines +73 to +76
def validate(self):
if self.options.dat_package_file:
if not os.path.exists(self.options.dat_package_file):
raise ConanInvalidConfiguration("Non-existent dat_package_file specified")
Copy link
Contributor

Choose a reason for hiding this comment

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

if it didn't exist it would fail in package_id() before hand anyway.

@conan-center-bot

This comment has been minimized.

@conan-center-bot
Copy link
Collaborator

Conan v1 pipeline ✔️

All green in build 21 (eb31859b03d2433972d232ac896b79fa9132fb88):

  • icu/72.1@:
    All packages built successfully! (All logs)

  • icu/69.1@:
    All packages built successfully! (All logs)

  • icu/68.2@:
    All packages built successfully! (All logs)

  • icu/71.1@:
    All packages built successfully! (All logs)

  • icu/70.1@:
    All packages built successfully! (All logs)


Conan v2 pipeline (informative, not required for merge) ✔️

Note: Conan v2 builds are informative and they are not required for the PR to be merged.

All green in build 22 (eb31859b03d2433972d232ac896b79fa9132fb88):

  • icu/72.1@:
    All packages built successfully! (All logs)

  • icu/71.1@:
    All packages built successfully! (All logs)

  • icu/69.1@:
    All packages built successfully! (All logs)

  • icu/70.1@:
    All packages built successfully! (All logs)

  • icu/68.2@:
    All packages built successfully! (All logs)

@SpaceIm
Copy link
Contributor

SpaceIm commented Feb 13, 2023

Not sure to understand the new scope of this PR now. As I said, this check is useless because if dat package file was not an existing file, it would fail anyway in package_id() which is called before validate().

@conan-center-bot conan-center-bot merged commit 5f9985b into conan-io:master Feb 14, 2023
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.

8 participants