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.

Sign up for GitHub

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

Jump to bottom

Prep for v9.4.1 #8

Merged
merged 4 commits into from
Jun 22, 2024
Merged

Prep for v9.4.1 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
55f15c2
Prep for v9.4.1
odow Jun 22, 2024
d270db3
Update
odow Jun 22, 2024
c81819c
Update
odow Jun 22, 2024
cb56df6
Update
odow Jun 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 20 additions & 12 deletions Artifacts.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,40 @@
[[Xpress]]
git-tree-sha1 = "76b5ff1036e610191b8e9fe97cc50317bde52bf0"
git-tree-sha1 = "66559bdb1036af9f67554c4989f1d1905b7b09ef"
arch = "aarch64"
os = "linux"

[[Xpress.download]]
sha256 = "186079bdf9dbc646c2898598cbd8eaf1b0f86738d841d314bf2b0b06119e05b7"
url = "https://anaconda.org/fico-xpress/xpresslibs/9.4.1/download/linux-aarch64/xpresslibs-9.4.1-ha4362f7_1716201091.tar.bz2"
[[Xpress]]
git-tree-sha1 = "9f2771f5cf2dddba8661cae7c4a2f6ea5d8e633b"
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 = "fb4741b9f060574befc30c106da987c2e1ec3c027c94b7d9be1926c5bb38d04e"
url = "https://anaconda.org/fico-xpress/xpresslibs/9.4.1/download/linux-64/xpresslibs-9.4.1-he969ceb_1716204914.tar.bz2"
[[Xpress]]
git-tree-sha1 = "5fe7bfcec61b06c39e2cacc1b7d0b13cd853e1ab"
git-tree-sha1 = "46d4e051ac58f6424172f9d465f8e07fdc934828"
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 = "e8f05dc1d30653d580e98f6818e2eda2ca21bb69f91cd0e3702edcf15226c9ed"
url = "https://anaconda.org/fico-xpress/xpresslibs/9.4.1/download/osx-64/xpresslibs-9.4.1-h24e2b0f_1716215669.tar.bz2"
[[Xpress]]
git-tree-sha1 = "4c726b3f9071305f4743d280590a0ded3f1a3aa7"
git-tree-sha1 = "1c20a7e68a361d6d2caa9ce4a588de8cd77316bc"
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 = "5169834be43384b5d2d1ef856c2b2043617fc80f4391ed2840c88c4ac2109442"
url = "https://anaconda.org/fico-xpress/xpresslibs/9.4.1/download/osx-arm64/xpresslibs-9.4.1-hce214f3_1716198001.tar.bz2"
[[Xpress]]
git-tree-sha1 = "da330e1ab56307f884b4cdb6d8d46697a81527a6"
git-tree-sha1 = "6a80184f96d5513048bb4e587e787602559f51aa"
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 = "2a0b6129f64e220adbd8c42b497dcaff0e701bec89495a16a9a936ea272b24cd"
url = "https://anaconda.org/fico-xpress/xpresslibs/9.4.1/download/win-64/xpresslibs-9.4.1-hccc4542_1716201567.tar.bz2"
2 changes: 1 addition & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "Xpress_jll"
uuid = "308bddfa-7f95-4fa6-a557-f2c7addc1869"
authors = ["odow <[email protected]>"]
version = "9.4.0"
version = "9.4.1"

[deps]
Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
Expand Down
15 changes: 8 additions & 7 deletions scripts/update_artifacts.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
using Tar, Inflate, SHA, TOML

function get_artifact(data; version::String)
filename = "xpress-$version-$(data.pyversion).tar.bz2"
url = "https://anaconda.org/fico-xpress/xpress/$version/download/$(data.conda)/$filename"
filename = "xpresslibs-$version-$(data.pyversion).tar.bz2"
url = "https://anaconda.org/fico-xpress/xpresslibs/$version/download/$(data.conda)/$filename"
run(`wget $url`)
ret = Dict(
"git-tree-sha1" => Tar.tree_hash(`gzcat $filename`),
Expand All @@ -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 = "ha4362f7_1716201091"),
(os = "linux", arch = "x86_64", conda = "linux-64", pyversion = "he969ceb_1716204914"),
(os = "macos", arch = "x86_64", conda = "osx-64", pyversion = "h24e2b0f_1716215669"),
(os = "macos", arch = "aarch64", conda = "osx-arm64", pyversion = "hce214f3_1716198001"),
(os = "windows", arch = "x86_64", conda = "win-64", pyversion = "hccc4542_1716201567"),
]
output = Dict("Xpress" => get_artifact.(platforms; version))
open(joinpath(dirname(@__DIR__), "Artifacts.toml"), "w") do io
Expand Down
2 changes: 1 addition & 1 deletion src/wrappers/aarch64-apple-darwin.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ function __init__()
JLLWrappers.@generate_init_header()
JLLWrappers.@init_library_product(
libxprs,
"lib/python3.11/site-packages/xpress/lib/libxprs.dylib",
"lib/libxprs.dylib",
RTLD_LAZY | RTLD_DEEPBIND,
)
JLLWrappers.@generate_init_footer()
Expand Down
15 changes: 15 additions & 0 deletions src/wrappers/aarch64-linux-gnu.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/libxprs.so.43",
RTLD_LAZY | RTLD_DEEPBIND,
)
JLLWrappers.@generate_init_footer()
end # __init__()
2 changes: 1 addition & 1 deletion src/wrappers/x86_64-apple-darwin.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ function __init__()
JLLWrappers.@generate_init_header()
JLLWrappers.@init_library_product(
libxprs,
"lib/python3.11/site-packages/xpress/lib/libxprs.dylib",
"lib/libxprs.dylib",
RTLD_LAZY | RTLD_DEEPBIND,
)
JLLWrappers.@generate_init_footer()
Expand Down
2 changes: 1 addition & 1 deletion src/wrappers/x86_64-linux-gnu.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ function __init__()
JLLWrappers.@generate_init_header()
JLLWrappers.@init_library_product(
libxprs,
"lib/python3.11/site-packages/xpress/lib/libxprs.so.43",
"lib/libxprs.so.43",
RTLD_LAZY | RTLD_DEEPBIND,
)
JLLWrappers.@generate_init_footer()
Expand Down
2 changes: 1 addition & 1 deletion src/wrappers/x86_64-w64-mingw32.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function __init__()
end
JLLWrappers.@init_library_product(
libxprs,
"Lib\\site-packages\\xpress\\lib\\xprs.dll",
"Library\\bin\\xprs.dll",
RTLD_LAZY | RTLD_DEEPBIND,
)
JLLWrappers.@generate_init_footer()
Expand Down
2 changes: 1 addition & 1 deletion test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ end
p = pointer(buffer)
r = @ccall libxprs.XPRSgetversion(p::Ptr{Cchar})::Cint
@test r == 0
@test unsafe_string(p) == "43.01.01"
@test unsafe_string(p) == "43.01.02"
end
end

Expand Down
Loading