From 968db8be5254ae3e8857c76193d7f6c2a6c61f8b Mon Sep 17 00:00:00 2001 From: "Frank T. Bergmann" Date: Wed, 7 Aug 2024 08:40:34 +0200 Subject: [PATCH 1/4] - bump version --- VERSION.txt | 2 +- configure | 18 +++++++++--------- src/sbml/common/libsbml-version.h | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 04f164709..c523b9689 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.20.2 +5.20.4 diff --git a/configure b/configure index 1c89d1566..f554af045 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh # From configure.ac Revision. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for libSBML 5.20.2. +# Generated by GNU Autoconf 2.71 for libSBML 5.20.4. # # Report bugs to . # @@ -766,8 +766,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libSBML' PACKAGE_TARNAME='libsbml' -PACKAGE_VERSION='5.20.2' -PACKAGE_STRING='libSBML 5.20.2' +PACKAGE_VERSION='5.20.4' +PACKAGE_STRING='libSBML 5.20.4' PACKAGE_BUGREPORT='libsbml-team@googlegroups.com' PACKAGE_URL='http://sbml.org/Software/libSBML' @@ -1662,7 +1662,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libSBML 5.20.2 to adapt to many kinds of systems. +\`configure' configures libSBML 5.20.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1728,7 +1728,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libSBML 5.20.2:";; + short | recursive ) echo "Configuration of libSBML 5.20.4:";; esac cat <<\_ACEOF @@ -1885,7 +1885,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libSBML configure 5.20.2 +libSBML configure 5.20.4 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2484,7 +2484,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libSBML $as_me 5.20.2, which was +It was created by libSBML $as_me 5.20.4, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -28902,7 +28902,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libSBML $as_me 5.20.2, which was +This file was extended by libSBML $as_me 5.20.4, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -28967,7 +28967,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -libSBML config.status 5.20.2 +libSBML config.status 5.20.4 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/src/sbml/common/libsbml-version.h b/src/sbml/common/libsbml-version.h index 10c351a8f..285f111d7 100644 --- a/src/sbml/common/libsbml-version.h +++ b/src/sbml/common/libsbml-version.h @@ -51,7 +51,7 @@ * * A version string of the form "1.2.3". */ -#define LIBSBML_DOTTED_VERSION "5.20.2" +#define LIBSBML_DOTTED_VERSION "5.20.4" /** From b08827e658028e7f43e41dc91b3e21379bdc1143 Mon Sep 17 00:00:00 2001 From: "Frank T. Bergmann" Date: Wed, 7 Aug 2024 08:50:37 +0200 Subject: [PATCH 2/4] - skip running csharp tests on macos --- .github/workflows/brief.yml | 8 ++++++++ .github/workflows/extensive.yml | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/.github/workflows/brief.yml b/.github/workflows/brief.yml index 0b1b0b1cb..8c5d12f4c 100644 --- a/.github/workflows/brief.yml +++ b/.github/workflows/brief.yml @@ -157,9 +157,17 @@ jobs: ### run tests ### - name: Test + if: matrix.platform == 'macos-latest' + working-directory: ${{runner.workspace}}/build + shell: bash + run: ctest -V -C $BUILD_TYPE -E csharp + + - name: Test + if: matrix.platform != 'macos-latest' working-directory: ${{runner.workspace}}/build shell: bash run: ctest -V -C $BUILD_TYPE + manylinuxbuild: name: ${{ matrix.container }}, Parser option ${{ matrix.xml_parser_option }}, diff --git a/.github/workflows/extensive.yml b/.github/workflows/extensive.yml index abe490d11..38023dd2a 100644 --- a/.github/workflows/extensive.yml +++ b/.github/workflows/extensive.yml @@ -257,6 +257,13 @@ jobs: ### run tests ### - name: Test + if: matrix.platform == 'macos-latest' + working-directory: ${{runner.workspace}}/build + shell: bash + run: ctest -V -C $BUILD_TYPE -E csharp + + - name: Test + if: matrix.platform != 'macos-latest' working-directory: ${{runner.workspace}}/build shell: bash run: ctest -V -C $BUILD_TYPE From 8005833eeb629cfcaef6312d67a704f4712879d1 Mon Sep 17 00:00:00 2001 From: "Frank T. Bergmann" Date: Wed, 7 Aug 2024 09:09:54 +0200 Subject: [PATCH 3/4] update cs test some tests are called test_cs_ the main ones test_csharp --- .github/workflows/brief.yml | 2 +- .github/workflows/extensive.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/brief.yml b/.github/workflows/brief.yml index 8c5d12f4c..5a0b39a09 100644 --- a/.github/workflows/brief.yml +++ b/.github/workflows/brief.yml @@ -160,7 +160,7 @@ jobs: if: matrix.platform == 'macos-latest' working-directory: ${{runner.workspace}}/build shell: bash - run: ctest -V -C $BUILD_TYPE -E csharp + run: ctest -V -C $BUILD_TYPE -E test_cs - name: Test if: matrix.platform != 'macos-latest' diff --git a/.github/workflows/extensive.yml b/.github/workflows/extensive.yml index 38023dd2a..8053c8e2d 100644 --- a/.github/workflows/extensive.yml +++ b/.github/workflows/extensive.yml @@ -260,7 +260,7 @@ jobs: if: matrix.platform == 'macos-latest' working-directory: ${{runner.workspace}}/build shell: bash - run: ctest -V -C $BUILD_TYPE -E csharp + run: ctest -V -C $BUILD_TYPE -E test_cs - name: Test if: matrix.platform != 'macos-latest' From fd77d46d0aed1bdd8af23255042a8df387425bfb Mon Sep 17 00:00:00 2001 From: "Frank T. Bergmann" Date: Wed, 7 Aug 2024 09:59:49 +0200 Subject: [PATCH 4/4] update news --- NEWS.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/NEWS.txt b/NEWS.txt index fd54af1c1..86da2c0c5 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -1,5 +1,17 @@  libSBML NEWS -- History of user-visible changes +==================================================================== +5.20.4 +==================================================================== + +This is mostly a bug fix release enhancing stability and improving +performance when validating models. Main points: + +* support compilation when using libxml 2.12.0 and later +* improved performance when testing for assignment cycles +* cmake build system honors the BUILD_SHARED_LIB flag if defined + + ==================================================================== 5.20.2 ====================================================================