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

Gdal: Fix conflicts #22204

Merged
merged 16 commits into from
May 13, 2024
Merged

Gdal: Fix conflicts #22204

merged 16 commits into from
May 13, 2024

Conversation

ericLemanissier
Copy link
Contributor

@ericLemanissier ericLemanissier commented Jan 8, 2024

Specify library name and version: gdal/*

It's just not possible to build the current gdal recipe, cf https://github.com/eirikb/proof-of-conan/actions/runs/8718677788
the conflicts are:

  • libgeotiff/1.7.1->libtiff/4.6.0, gdal/3.4.3->libtiff/4.5.1.
  • libtiff/4.6.0->libdeflate/1.19, gdal/3.4.3->libdeflate/1.18.
  • libgeotiff/1.7.1->proj/9.3.1, gdal/3.4.3->proj/9.2.1.
  • proj/9.3.1->sqlite3/3.44.2, gdal/3.4.3->sqlite3/3.42.0.

also, libpq/14.5 and openssl/1.1.1u are not maintained on CCI any more

The other requirements modification are the transition to ranges for zlib, libpng and libcurl

Also, drop dead code, and 3.4.1 and 3.3.3 which are not used


@ghost
Copy link

ghost commented Jan 8, 2024

I detected other pull requests that are modifying gdal/pre_3.5.0 recipe:

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

@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

@ericLemanissier ericLemanissier changed the title Gdal: bump deps Gdal: Fix conflicts Apr 4, 2024
@ericLemanissier
Copy link
Contributor Author

The build is now finished. You can take a look at the results here

@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

@ericLemanissier
Copy link
Contributor Author

@uilianries it's ready for review

to reduce the scope of the change, the potential for regression, and ease review
@ericLemanissier
Copy link
Contributor Author

@uilianries @RubenRBS I simplified this PR by not migrating to f-strings. Is it possible to get a review ?

@ericLemanissier
Copy link
Contributor Author

The build is now finished. You can take a look at the results here

@conan-center-bot

This comment has been minimized.

@ericLemanissier
Copy link
Contributor Author

@jcar87 how can we make progress on this one ? is the description clear enough ? is the change ok ?

@uilianries
Copy link
Member

@ericLemanissier
Copy link
Contributor Author

Yes, bus as it's conan 1 only, and not touched in the last 2 years, it'll need an important refactoring anyway

@ericLemanissier
Copy link
Contributor Author

@uilianries I restored 3.4.1

Copy link
Member

@uilianries uilianries 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, only a small comment.

recipes/gdal/pre_3.5.0/conanfile.py Outdated Show resolved Hide resolved
Co-authored-by: Uilian Ries <uilianries@gmail.com>
@ericLemanissier
Copy link
Contributor Author

The build is now finished. You can take a look at the results here

@conan-center-bot
Copy link
Collaborator

Conan v1 pipeline ✔️

All green in build 12 (0bac27b397a001b1bdd8448dcbf40b23086abc87):

  • gdal/3.4.3:
    All packages built successfully! (All logs)

  • gdal/3.4.1:
    All packages built successfully! (All logs)


Conan v2 pipeline ✔️

Note: Conan v2 builds are now mandatory. Please read our discussion about it.

All green in build 12 (0bac27b397a001b1bdd8448dcbf40b23086abc87):

  • gdal/3.4.3:
    All packages built successfully! (All logs)

  • gdal/3.4.1:
    All packages built successfully! (All logs)

Copy link
Member

@uilianries uilianries left a comment

Choose a reason for hiding this comment

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

LGTM

@uilianries uilianries self-assigned this May 10, 2024
@conan-center-bot conan-center-bot merged commit 2ba424b into conan-io:master May 13, 2024
18 checks passed
@ericLemanissier ericLemanissier deleted the gdal branch May 13, 2024 12:47
@ericLemanissier
Copy link
Contributor Author

ericLemanissier commented May 13, 2024

Thank you for the approvals, it's been a long one !

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.

6 participants