Merge pull request #2842 from ERGO-Code/latest

Latest in master

Author: galabovaa

.github/workflows/build-nuget-package.yml

@@ -184,7 +184,7 @@ jobs:
 
       - name: Dotnet pack
         working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
-        run: dotnet pack -c Release /p:Version=1.13.0
+        run: dotnet pack -c Release /p:Version=1.13.1
 
       - uses: actions/upload-artifact@v4
         with:

.github/workflows/test-nuget-macos.yml

@@ -34,7 +34,7 @@ jobs:
 
       - name: Dotnet pack
         working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
-        run: dotnet pack -c Release /p:Version=1.13.0
+        run: dotnet pack -c Release /p:Version=1.13.1
 
       - name: Add local feed
         run: dotnet nuget add source ${{runner.workspace}}/nugets
@@ -78,7 +78,7 @@ jobs:
 
       - name: Dotnet pack
         working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
-        run: dotnet pack -c Release /p:Version=1.13.0
+        run: dotnet pack -c Release /p:Version=1.13.1
 
       - name: Add local feed
         run: dotnet nuget add source ${{runner.workspace}}/nugets

.github/workflows/test-nuget-package.yml

@@ -34,7 +34,7 @@ jobs:
 
       - name: Dotnet pack
         working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
-        run: dotnet pack -c Release /p:Version=1.13.0
+        run: dotnet pack -c Release /p:Version=1.13.1
 
       - name: Add local feed
         run: dotnet nuget add source ${{runner.workspace}}/nugets
@@ -77,7 +77,7 @@ jobs:
 
       - name: Dotnet pack
         working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
-        run: dotnet pack -c Release /p:Version=1.13.0
+        run: dotnet pack -c Release /p:Version=1.13.1
 
       - name: Add local feed
         run: dotnet nuget add source ${{runner.workspace}}/nugets
@@ -121,7 +121,7 @@ jobs:
 
       - name: Dotnet pack
         working-directory: /__w/HiGHS/HiGHS/build/dotnet/Highs.Native
-        run: dotnet pack -c Release /p:Version=1.13.0
+        run: dotnet pack -c Release /p:Version=1.13.1
 
       - name: Add local feed
         run: dotnet nuget add source /__w/HiGHS/HiGHS/nugets
@@ -165,7 +165,7 @@ jobs:
 
       - name: Dotnet pack
         working-directory: /__w/HiGHS/HiGHS/build/dotnet/Highs.Native
-        run: dotnet pack -c Release /p:Version=1.13.0
+        run: dotnet pack -c Release /p:Version=1.13.1
 
       - name: Add local feed
         run: dotnet nuget add source /__w/HiGHS/HiGHS/nugets
@@ -210,7 +210,7 @@ jobs:
 
       - name: Dotnet pack
         working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
-        run: dotnet pack -c Release /p:Version=1.13.0
+        run: dotnet pack -c Release /p:Version=1.13.1
 
       - name: Add local feed
         run: dotnet nuget add source -n name ${{runner.workspace}}\nugets
@@ -226,5 +226,5 @@ jobs:
           dotnet new console
           rm Program.cs
           cp ${{runner.workspace}}\HiGHS\examples\call_highs_from_csharp.cs .
-          dotnet add package Highs.Native -v 1.13.0 -s ${{runner.workspace}}\nugets
+          dotnet add package Highs.Native -v 1.13.1 -s ${{runner.workspace}}\nugets
           dotnet run

.github/workflows/test-nuget-ubuntu.yml

@@ -32,7 +32,7 @@ jobs:
 
       - name: Dotnet pack
         working-directory: /__w/HiGHS/HiGHS/build/dotnet/Highs.Native
-        run: dotnet pack -c Release /p:Version=1.13.0
+        run: dotnet pack -c Release /p:Version=1.13.1
 
       - name: Add local feed
         run: dotnet nuget add source /__w/HiGHS/HiGHS/nugets
@@ -76,7 +76,7 @@ jobs:
 
       - name: Dotnet pack
         working-directory: /__w/HiGHS/HiGHS/build/dotnet/Highs.Native
-        run: dotnet pack -c Release /p:Version=1.13.0
+        run: dotnet pack -c Release /p:Version=1.13.1
 
       - name: Add local feed
         run: dotnet nuget add source /__w/HiGHS/HiGHS/nugets

.github/workflows/test-nuget-win.yml

@@ -33,7 +33,7 @@ jobs:
 
       - name: Dotnet pack
         working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
-        run: dotnet pack -c Release /p:Version=1.13.0
+        run: dotnet pack -c Release /p:Version=1.13.1
 
       - name: Add local feed
         run: dotnet nuget add source -n name ${{runner.workspace}}\nugets 
@@ -49,5 +49,5 @@ jobs:
           dotnet new console
           rm Program.cs
           cp ${{runner.workspace}}\HiGHS\examples\call_highs_from_csharp.cs . 
-          dotnet add package Highs.Native -v 1.13.0 -s ${{runner.workspace}}\nugets 
+          dotnet add package Highs.Native -v 1.13.1 -s ${{runner.workspace}}\nugets 
           dotnet run

CITATION.cff

@@ -7,9 +7,9 @@ authors:
 - given-names: Ivet
   family-names: Galabova
 title: "HiGHS"
-version: 1.13.0
+version: 1.13.1
 date-released: 2022-04-18
-url: "https://github.com/ERGO-Code/HiGHS/releases/tag/v1.13.0"
+url: "https://github.com/ERGO-Code/HiGHS/releases/tag/v1.13.1"
 preferred-citation:
   type: article
   authors:

CMakeLists.txt

@@ -121,6 +121,9 @@ if (PYTHON_BUILD_SETUP)
   set(ZLIB OFF)
 endif()
 
+option(BUILD_EXAMPLES "Build examples" ON)
+message(STATUS "Build examples: ${BUILD_EXAMPLES}")
+
 option(HIGHS_COVERAGE "Activate the code coverage compilation" OFF)
 
 # Address | Thread | Leak
@@ -562,7 +565,23 @@ if(ZLIB AND NOT TARGET ZLIB::ZLIB)
   find_package(ZLIB 1.2.3)
 endif()
 
-install(FILES README.md LICENSE.txt THIRD_PARTY_NOTICES.md DESTINATION .)
+if (PYTHON_BUILD_SETUP OR CMAKE_INSTALL_DOCDIR STREQUAL "" OR NOT BUILD_CXX)
+  install(FILES
+      README.md
+      LICENSE.txt
+      THIRD_PARTY_NOTICES.md
+      DESTINATION .)
+else()
+  install(FILES
+      README.md
+      LICENSE.txt
+      AUTHORS
+      CITATION.cff
+      CODE_OF_CONDUCT.md
+      CONTRIBUTING.md
+      FEATURES.md
+      DESTINATION ${CMAKE_INSTALL_DOCDIR})
+endif()
 
 # Set default generator based on platform
 if(WIN32)
@@ -830,8 +849,6 @@ if(NOT FAST_BUILD)
 else(FAST_BUILD)
   message(STATUS "FAST_BUILD set to on.")
 
-  option(BUILD_EXAMPLES "Build examples" ON)
-  message(STATUS "Build examples: ${BUILD_EXAMPLES}")
 
   CMAKE_DEPENDENT_OPTION(BUILD_CXX_EXAMPLE "Build cxx example" ON "BUILD_EXAMPLES;BUILD_CXX" OFF)
   message(STATUS "Build C++ example: ${BUILD_CXX_EXAMPLE}")

FEATURES.md

@@ -1,4 +1,30 @@
 ## Code changes
 
+Following PR [#2812](https://github.com/ERGO-Code/HiGHS/pull/2812),
+HiGHS can read LP files with keywords as constraint names.
+
+Following PR [#2818](https://github.com/ERGO-Code/HiGHS/pull/2818), a
+potential data race in the HiGHS multithreading system has been fixed
+
+Following PR [#2825](https://github.com/ERGO-Code/HiGHS/pull/2825),
+potential conflict with METIS symbols has been eliminated.
+
+Following PR [#2832](https://github.com/ERGO-Code/HiGHS/pull/2832),
+potential conflict with AMD and RCM symbols has been eliminated.
+
+Following PR [#2834](https://github.com/ERGO-Code/HiGHS/pull/2834),
+there is some minimal documentation of the `highspy`modelling
+language.
+
+Following PR [#2837](https://github.com/ERGO-Code/HiGHS/pull/2837),
+the use of the logging callback is independent to the settings of the
+`output_flag`, `log_to_console` and `output_flag` options.
+
 ## Build changes
 
+Following PR [#2836](https://github.com/ERGO-Code/HiGHS/pull/2836), it is
+now possible to build a static library with HiPO, without the requirement
+for blas to be specified at compile time.
+
+Following PR [#2839](https://github.com/ERGO-Code/HiGHS/pull/2839), files
+like README.md and LICENSE.txt are installed in the proper location.

README.md

@@ -136,7 +136,7 @@ _The nix build files are provided by the community and are not officially suppor
 
 ### Precompiled binaries
 
-From v1.13.0 onwards, precompiled static binaries are available at https://github.com/ERGO-Code/HiGHS/releases.
+Precompiled static binaries are available at https://github.com/ERGO-Code/HiGHS/releases.
 
 Additionally, there is one package containing shared libraries for Windows x64.
 
@@ -248,7 +248,7 @@ The nuget package Highs.Native is on https://www.nuget.org, at https://www.nuget
 It can be added to your C# project with `dotnet`
 
 ```shell
-dotnet add package Highs.Native --version 1.13.0
+dotnet add package Highs.Native --version 1.13.1
 ```
 
 The nuget package contains runtime libraries for

Version.txt

@@ -1,4 +1,4 @@
 HIGHS_MAJOR=1
 HIGHS_MINOR=13
-HIGHS_PATCH=0
+HIGHS_PATCH=1
 #PRE_RELEASE=YES