From a3f3b5a4602f5c7b54c4c58dab07569645479de0 Mon Sep 17 00:00:00 2001 From: joaquimg Date: Sat, 23 Nov 2024 14:10:19 -0300 Subject: [PATCH 1/2] Improve readme --- README.md | 9 +++++++++ src/Xpress.jl | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 43f443bf..e2fd8a03 100644 --- a/README.md +++ b/README.md @@ -96,6 +96,15 @@ If you plan to use Xpress_jll, `Pkg.add("Xpress")` will fail because it cannot find a local installation of Xpress. Therefore, you should set `XPRESS_JL_SKIP_LIB_CHECK` before installing. +To add a specific version of Xpress with `Xpress_jll` do: + +```julia +import Pkg +Pkg.add(name = "Xpress_jll", rev = "v8.14.0") +``` + +If the version is not found, please open and issue at https://github.com/jump-dev/Xpress_jll.jl + ## Use with JuMP To use Xpress with JuMP, use: diff --git a/src/Xpress.jl b/src/Xpress.jl index cacafea8..3d4cada4 100644 --- a/src/Xpress.jl +++ b/src/Xpress.jl @@ -73,7 +73,7 @@ function __init__() error("XPRESS cannot be loaded. Please run Pkg.build(\"Xpress\").") end if !haskey(ENV, "XPRESS_JL_NO_AUTO_INIT") && - get(ENV, "JULIA_REGISTRYCI_AUTOMERGE", "false") != "true" + get(ENV, "JULIA_REGISTRYCI_AUTOMERGE", "false") != "true" initialize() end return From 521fad5c4c0acac1862d8498791ee426b60d788f Mon Sep 17 00:00:00 2001 From: joaquimg Date: Sat, 23 Nov 2024 14:15:47 -0300 Subject: [PATCH 2/2] format --- src/Xpress.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Xpress.jl b/src/Xpress.jl index 3d4cada4..cacafea8 100644 --- a/src/Xpress.jl +++ b/src/Xpress.jl @@ -73,7 +73,7 @@ function __init__() error("XPRESS cannot be loaded. Please run Pkg.build(\"Xpress\").") end if !haskey(ENV, "XPRESS_JL_NO_AUTO_INIT") && - get(ENV, "JULIA_REGISTRYCI_AUTOMERGE", "false") != "true" + get(ENV, "JULIA_REGISTRYCI_AUTOMERGE", "false") != "true" initialize() end return