Skip to content

Commit

Permalink
Prep for v8.14.0 (#9)
Browse files Browse the repository at this point in the history
  • Loading branch information
@odow
odow authored Jun 23, 2024
1 parent 61999cc commit e3291e9
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 16 deletions.
18 changes: 9 additions & 9 deletions Artifacts.toml
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
[[Xpress]]
git-tree-sha1 = "d07eebd06799abe18219e02d0783c0695ec5407d"
git-tree-sha1 = "c66ac2630a470ed8fd6c46134e00800c3005d47a"
arch = "x86_64"
os = "linux"

[[Xpress.download]]
sha256 = "60fbd7fe29ce4ca8b5ca06bd69b9c3b2c3115baaba772dcfcd656ccfff580f8b"
url = "https://anaconda.org/fico-xpress/xpress/8.13.4/download/linux-64/xpress-8.13.4-py39_0.tar.bz2"
sha256 = "2554bd3723542078c6e333d4eca043e221ff2f4c68f79a25648a31a56b2dc85f"
url = "https://anaconda.org/fico-xpress/xpress/8.14.0/download/linux-64/xpress-8.14.0-py39_0.tar.bz2"
[[Xpress]]
git-tree-sha1 = "f5db92393b6336df0f787b592d83f5978ebe98a2"
git-tree-sha1 = "fcab3a2a776608ee9f58177b34d75d9d723c4be4"
arch = "x86_64"
os = "macos"

[[Xpress.download]]
sha256 = "e104793d4860bbfcabd1695a45e40ae49647943d4cc6444ddecdd5207a8fe4bf"
url = "https://anaconda.org/fico-xpress/xpress/8.13.4/download/osx-64/xpress-8.13.4-py39_0.tar.bz2"
sha256 = "2c7198b7ef697030b3731e52d459524798bf90b1a29cc089127b2a011fcb86cb"
url = "https://anaconda.org/fico-xpress/xpress/8.14.0/download/osx-64/xpress-8.14.0-py39_0.tar.bz2"
[[Xpress]]
git-tree-sha1 = "6179c51500d1c7b5ce3bd7105fc810265504423c"
git-tree-sha1 = "94967738505737fd4a008552cdfd4529332b266f"
arch = "x86_64"
os = "windows"

[[Xpress.download]]
sha256 = "cf43d08104659505120734b29aeff6b7ff46aac28cb6345f79de8817c9a033cd"
url = "https://anaconda.org/fico-xpress/xpress/8.13.4/download/win-64/xpress-8.13.4-py39_0.tar.bz2"
sha256 = "8c10027dd6e770822e346679a9f515937b190dfc5106a62c42442cea07ec9045"
url = "https://anaconda.org/fico-xpress/xpress/8.14.0/download/win-64/xpress-8.14.0-py39_0.tar.bz2"
2 changes: 1 addition & 1 deletion Project.toml
View file
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 = "8.13.4"
version = "8.14.0"

[deps]
Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
Expand Down
2 changes: 1 addition & 1 deletion scripts/update_artifacts.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function get_artifact(data; version::String)
return ret
end

function main(; version = "8.13.4")
function main(; version = "8.14.0")
platforms = [
(os = "linux", arch = "x86_64", conda = "linux-64", pyversion = "py39_0"),
(os = "macos", arch = "x86_64", conda = "osx-64", pyversion = "py39_0"),
Expand Down
6 changes: 5 additions & 1 deletion src/Xpress_jll.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@ Print the Shrinkwrap License Agreement that governs the usage of the Xpress
artifacts.
"""
function print_shrinkwrap_license(io = stdout)
license = joinpath(artifact_dir, "info", "LICENSE.txt")
license = if Sys.islinux()
joinpath(artifact_dir, "info", "licenses", "LICENSE.txt")
else
joinpath(artifact_dir, "info", "LICENSE.txt")
end
print(io, read(license, String))
return
end
Expand Down
4 changes: 2 additions & 2 deletions src/wrappers/x86_64-linux-gnu.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ export libxprs

JLLWrappers.@generate_wrapper_header("Xpress")

JLLWrappers.@declare_library_product(libxprs, "libxprs.so.39.01")
JLLWrappers.@declare_library_product(libxprs, "libxprs.so.40")

function __init__()
JLLWrappers.@generate_init_header()
JLLWrappers.@init_library_product(
libxprs,
"lib/python3.9/site-packages/xpress/lib/libxprs.so.39.01",
"lib/python3.9/site-packages/xpress/lib/libxprs.so.40",
RTLD_LAZY | RTLD_DEEPBIND,
)
JLLWrappers.@generate_init_footer()
Expand Down
4 changes: 3 additions & 1 deletion src/wrappers/x86_64-w64-mingw32.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ JLLWrappers.@declare_library_product(libxprs, "xprs.dll")
function __init__()
JLLWrappers.@generate_init_header()
# There's a permission error with the conda binaries
chmod(dirname(dirname(artifact_dir)), 0o755; recursive = true)
if (stat(artifact_dir).mode & 0o777) != 0o755
chmod(artifact_dir, 0o755; recursive = true)
end
JLLWrappers.@init_library_product(
libxprs,
"Lib\\site-packages\\xpress\\lib\\xprs.dll",
Expand Down
2 changes: 1 addition & 1 deletion test/runtests.jl
View file
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) == "39.01.05"
@test unsafe_string(p) == "40.01.01"
end
end

Expand Down

2 comments on commit e3291e9

@odow
Copy link
Member Author

@odow odow commented on e3291e9 Jun 23, 2024

Choose a reason for hiding this comment

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

@JuliaRegistrator register

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

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

Registration pull request created: JuliaRegistries/General/109628

Tip: Release Notes

Did you know you can add release notes too? Just add markdown formatted text underneath the comment after the text
"Release notes:" and it will be added to the registry PR, and if TagBot is installed it will also be added to the
release that TagBot creates. i.e.

@JuliaRegistrator register

Release notes:

## Breaking changes

- blah

To add them here just re-invoke and the PR will be updated.

Tagging

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v8.14.0 -m "<description of version>" e3291e9e42511c930e47cfde0f86f7e9d0516dee
git push origin v8.14.0

Please sign in to comment.