From ad541f3bd4ef49aef0ffe7bfa7cc84bf0ece2374 Mon Sep 17 00:00:00 2001 From: odow Date: Sat, 22 Jun 2024 12:03:19 +1200 Subject: [PATCH] Prep for v9.4.1 --- Artifacts.toml | 32 +++++++++++++++++++------------ Project.toml | 2 +- scripts/update_artifacts.jl | 11 ++++++----- src/wrappers/aarch64-linux-gnu.jl | 15 +++++++++++++++ 4 files changed, 42 insertions(+), 18 deletions(-) create mode 100644 src/wrappers/aarch64-linux-gnu.jl diff --git a/Artifacts.toml b/Artifacts.toml index e063e8b..75f9b77 100644 --- a/Artifacts.toml +++ b/Artifacts.toml @@ -1,32 +1,40 @@ [[Xpress]] -git-tree-sha1 = "76b5ff1036e610191b8e9fe97cc50317bde52bf0" +git-tree-sha1 = "a215c77a593d46c39fb22db3fd56f0f6e1c7eb8b" +arch = "aarch64" +os = "linux" + + [[Xpress.download]] + sha256 = "d4a6d6bf2506c4b010231d5424e1dc3c43b3eee2299530f40c3ff70db9d64bdb" + url = "https://anaconda.org/fico-xpress/xpress/9.4.1/download/linux-aarch64/xpress-9.4.1-py311ha86f405_1716201308.tar.bz2" +[[Xpress]] +git-tree-sha1 = "b1bcdb61c07d95c2df1dfe482a5ed0855b280d3f" arch = "x86_64" os = "linux" [[Xpress.download]] - sha256 = "4c9d7fcd172cc8bc537e8ad329d9ad1c495a95eb193005f9cc11bfbe4239f28f" - url = "https://anaconda.org/fico-xpress/xpress/9.4.0/download/linux-64/xpress-9.4.0-py311hd54f6e1_0.tar.bz2" + sha256 = "d056ac4e2a4bfc2b137f2a7ae566b66170443cb96308f40677c7d34c4e6568ee" + url = "https://anaconda.org/fico-xpress/xpress/9.4.1/download/linux-64/xpress-9.4.1-py311hcb34f93_1716205343.tar.bz2" [[Xpress]] -git-tree-sha1 = "5fe7bfcec61b06c39e2cacc1b7d0b13cd853e1ab" +git-tree-sha1 = "102f1d812e13a60f0c55f70e97409a270b687cb3" arch = "x86_64" os = "macos" [[Xpress.download]] - sha256 = "fc52ba10c03ae9749a9a4a672f441994d00b09cfd83367d9bc3788bcf91f6690" - url = "https://anaconda.org/fico-xpress/xpress/9.4.0/download/osx-64/xpress-9.4.0-py311hd5f4a35_0.tar.bz2" + sha256 = "7cd6e258a2df1e7af0c92818fc61b7990e0a7d2edc6015e7d20ae9d4ea9bd43f" + url = "https://anaconda.org/fico-xpress/xpress/9.4.1/download/osx-64/xpress-9.4.1-py311h2222352_1716216153.tar.bz2" [[Xpress]] -git-tree-sha1 = "4c726b3f9071305f4743d280590a0ded3f1a3aa7" +git-tree-sha1 = "40fd3c1521478db3751e28e87770dae10b0a9a60" arch = "aarch64" os = "macos" [[Xpress.download]] - sha256 = "cb2c1acc6186931dd2f5e049a999e2e397088334b33baaaf4518ff567fa9987c" - url = "https://anaconda.org/fico-xpress/xpress/9.4.0/download/osx-arm64/xpress-9.4.0-py311hb8ed652_0.tar.bz2" + sha256 = "5dbd377d727bbe762a3b6440be2838f25ca118f0a04260abdeb791e22a2e038f" + url = "https://anaconda.org/fico-xpress/xpress/9.4.1/download/osx-arm64/xpress-9.4.1-py311h5c123a4_1716198148.tar.bz2" [[Xpress]] -git-tree-sha1 = "da330e1ab56307f884b4cdb6d8d46697a81527a6" +git-tree-sha1 = "e9440d6c41e667ec8654b023a3c98c4dc251d04c" arch = "x86_64" os = "windows" [[Xpress.download]] - sha256 = "82078b16a987876d368730d1fd844d3c675c466d22ef9b4d4a246c0d5d01fea4" - url = "https://anaconda.org/fico-xpress/xpress/9.4.0/download/win-64/xpress-9.4.0-py311hb01d3b7_0.tar.bz2" + sha256 = "a5099fb71877cbba9a3da8bd235ad99e64d2093b16e04e447512a84c85d90f3f" + url = "https://anaconda.org/fico-xpress/xpress/9.4.1/download/win-64/xpress-9.4.1-py311hccbcb6a_1716202152.tar.bz2" diff --git a/Project.toml b/Project.toml index 2860f48..e60a996 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "Xpress_jll" uuid = "308bddfa-7f95-4fa6-a557-f2c7addc1869" authors = ["odow "] -version = "9.4.0" +version = "9.4.1" [deps] Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" diff --git a/scripts/update_artifacts.jl b/scripts/update_artifacts.jl index f792440..3ace420 100644 --- a/scripts/update_artifacts.jl +++ b/scripts/update_artifacts.jl @@ -21,12 +21,13 @@ function get_artifact(data; version::String) return ret end -function main(; version = "9.3.0") +function main(; version = "9.4.1") platforms = [ - (os = "linux", arch = "x86_64", conda = "linux-64", pyversion = "py311hd54f6e1_0"), - (os = "macos", arch = "x86_64", conda = "osx-64", pyversion = "py311hd5f4a35_0"), - (os = "macos", arch = "aarch64", conda = "osx-arm64", pyversion = "py311hb8ed652_0"), - (os = "windows", arch = "x86_64", conda = "win-64", pyversion = "py311hb01d3b7_0"), + (os = "linux", arch = "aarch64", conda = "linux-aarch64", pyversion = "py311ha86f405_1716201308"), + (os = "linux", arch = "x86_64", conda = "linux-64", pyversion = "py311hcb34f93_1716205343"), + (os = "macos", arch = "x86_64", conda = "osx-64", pyversion = "py311h2222352_1716216153"), + (os = "macos", arch = "aarch64", conda = "osx-arm64", pyversion = "py311h5c123a4_1716198148"), + (os = "windows", arch = "x86_64", conda = "win-64", pyversion = "py311hccbcb6a_1716202152"), ] output = Dict("Xpress" => get_artifact.(platforms; version)) open(joinpath(dirname(@__DIR__), "Artifacts.toml"), "w") do io diff --git a/src/wrappers/aarch64-linux-gnu.jl b/src/wrappers/aarch64-linux-gnu.jl new file mode 100644 index 0000000..ca8b19e --- /dev/null +++ b/src/wrappers/aarch64-linux-gnu.jl @@ -0,0 +1,15 @@ +export libxprs + +JLLWrappers.@generate_wrapper_header("Xpress") + +JLLWrappers.@declare_library_product(libxprs, "libxprs.so.43") + +function __init__() + JLLWrappers.@generate_init_header() + JLLWrappers.@init_library_product( + libxprs, + "lib/python3.11/site-packages/xpress/lib/libxprs.so.43", + RTLD_LAZY | RTLD_DEEPBIND, + ) + JLLWrappers.@generate_init_footer() +end # __init__()