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] Bump to v3.7.1 #7050

Merged
merged 32 commits into from
Sep 22, 2023
Merged

Conversation

jeremiahpslewis
Copy link
Contributor

No description provided.

G/GDAL/build_tarballs.jl Outdated Show resolved Hide resolved
@giordano
Copy link
Member

As I said already, it's more likely we want to update compat bounds. For example using HDF5 1.14 would be better, since we compile that one from source.

@jeremiahpslewis
Copy link
Contributor Author

[ Info: Copying content of bundled in srcdir...
--
  | Updating registry at `/cache/julia-buildkite-plugin/depots/e2fd9734-29d8-45cd-b0eb-59f7104f3131/registries/General.toml`
  | Resolving package versions...
  | ERROR: LoadError: Unsatisfiable requirements detected for package OpenSSL_jll [458c3c95]:
  | OpenSSL_jll [458c3c95] log:
  | ├─possible versions are: 1.1.1-3.0.9 or uninstalled
  | ├─restricted by compatibility requirements with HDF5_jll [0234f1f7] to versions: 3.0.8-3.0.9
  | │ └─HDF5_jll [0234f1f7] log:
  | │   ├─possible versions are: 1.10.5-1.14.0 or uninstalled
  | │   └─restricted to versions 1.14.0 by an explicit requirement, leaving only versions 1.14.0
  | └─restricted by compatibility requirements with LibPQ_jll [08be9ffa] to versions: 1.1.10-1.1.21 — no versions left
  | └─LibPQ_jll [08be9ffa] log:
  | ├─possible versions are: 12.3.0-14.3.0 or uninstalled
  | └─restricted to versions * by an explicit requirement, leaving only versions 12.3.0-14.3.0

Does this mean LibPQ needs to be rebuilt with v3.x OpenSSL?

@giordano
Copy link
Member

Yes:

Dependency("OpenSSL_jll"; compat="1.1.10"),

Copy link
Contributor

@visr visr left a comment

Choose a reason for hiding this comment

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

Would be great to have a new GDAL build again, thanks for working on this. I see you also make progress in #7053.

Left some comments to include the latest changes.

G/GDAL/build_tarballs.jl Outdated Show resolved Hide resolved
G/GDAL/build_tarballs.jl Show resolved Hide resolved
G/GDAL/build_tarballs.jl Outdated Show resolved Hide resolved
G/GDAL/build_tarballs.jl Show resolved Hide resolved
G/GDAL/build_tarballs.jl Outdated Show resolved Hide resolved
G/GDAL/build_tarballs.jl Show resolved Hide resolved
jeremiahpslewis and others added 3 commits September 19, 2023 12:31
Co-authored-by: Martijn Visser <mgvisser@gmail.com>
Co-authored-by: Martijn Visser <mgvisser@gmail.com>
Copy link
Contributor

@visr visr left a comment

Choose a reason for hiding this comment

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

Looks good to me, thanks!

@jeremiahpslewis
Copy link
Contributor Author

@giordano This should be ready to merge now.

G/GDAL/build_tarballs.jl Outdated Show resolved Hide resolved
Dependency("GEOS_jll"; compat="~3.11"),
Dependency("PROJ_jll"; compat="~900.100"),
Dependency("GEOS_jll"; compat="3.11.2"),
Dependency("PROJ_jll"; compat="901.300.0"),
Copy link
Member

Choose a reason for hiding this comment

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

PROJ_jll above had a ~ compat specification. @visr what's the usual thing to do here with this package? Is ^ (the default) enough?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah I think this is fine. Since PROJ_jll has the 100x version_offset, I figured in #7366 it's easier to tag it as breaking using that, rather than forcing all dependencies to use ~.

@giordano giordano merged commit 9aa7a94 into JuliaPackaging:master Sep 22, 2023
@@ -3,27 +3,26 @@
using BinaryBuilder, Pkg

name = "GDAL"
upstream_version = v"3.6.2"
version_offset = v"1.0.0"
Copy link
Contributor

@visr visr Sep 22, 2023

Choose a reason for hiding this comment

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

Sorry I missed this in review, but this version offset should not have been set back to 0, since now the major version is v300, while the previous one was v301. Should we yank v300.700.200 from the registry and create a new v301 build?

Copy link
Member

Choose a reason for hiding this comment

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

Probably good, yeah

visr added a commit to visr/Yggdrasil that referenced this pull request Sep 22, 2023
See JuliaPackaging#7050 (comment)

Registration of the previous version was blocked: JuliaRegistries/General#91991
@visr visr mentioned this pull request Sep 22, 2023
giordano pushed a commit that referenced this pull request Sep 22, 2023
See #7050 (comment)

Registration of the previous version was blocked: JuliaRegistries/General#91991
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.

3 participants