Create release v0.6.2.

cellml · Oct 29, 2024 · 13f7d66 · 13f7d66
1 parent 57dc904
commit 13f7d66
Show file tree

Hide file tree

Showing 195 changed files with 359 additions and 323 deletions.
diff --git a/.github/workflows/deploy-on-release.yml b/.github/workflows/deploy-on-release.yml
@@ -8,7 +8,7 @@ on:
 
 env:
   BUILD_TYPE: Release
-  MACOSX_DEPLOYMENT_TARGET: 10.15
+  ARTIFACT_RETENTION_DAYS: 7
 
 jobs:
   setup-jobs:
@@ -275,12 +275,11 @@ jobs:
       with:
         path: ./build/dist/*
         name: ${{ matrix.config.os }}
+        retention-days: ${{ env.ARTIFACT_RETENTION_DAYS }}
 
   wheels:
     needs: setup-jobs
     if: needs.setup-jobs.outputs.allowed-jobs == 'Wheels' || needs.setup-jobs.outputs.allowed-jobs == 'All'
-    permissions:
-      id-token: write
     name: ${{ matrix.name }} ${{ matrix.py }} wheel
     runs-on: ${{ matrix.os }}
     strategy:
@@ -363,14 +362,33 @@ jobs:
           package-dir: src/bindings/python/
 
       - name: Upload Python wheels as artifacts
-        if: needs.setup-jobs.outputs.binaries-destination == 'Artifact'
         uses: actions/upload-artifact@v4
         with:
           path: ./wheelhouse/*.whl
           name: ${{ matrix.name }}-${{ matrix.py }}-wheel
+          retention-days: ${{ env.ARTIFACT_RETENTION_DAYS }}
+
+  publish-wheels:
+    if: needs.setup-jobs.outputs.binaries-destination == 'Publish'
+    needs: wheels
+    runs-on: ubuntu-22.04
+    timeout-minutes: 5  # Docker+network are slow sometimes.
+    permissions:
+      id-token: write
+    name: Publish Wheels
+    steps:
+      - name: Download Python wheel artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: wheelhouse/
+          pattern: '*-wheel'
+          merge-multiple: true
+
+      - name: Display downloaded wheels
+        run: |
+          ls wheelhouse
 
       - name: Publish Python wheels
-        if: needs.setup-jobs.outputs.binaries-destination == 'Publish'
         env:
           name: pypi
           url: https://pypi.org/p/libcellml
@@ -448,6 +466,7 @@ jobs:
         with:
           path: ${{ steps.package-javascript.outputs.files }}
           name: libcellml.js
+          retention-days: ${{ env.ARTIFACT_RETENTION_DAYS }}
 
       - name: Publish libcellml.js
         if: needs.setup-jobs.outputs.binaries-destination == 'Publish'

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,7 +18,7 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15 CACHE STRING "Minimum OS X deployment vers
 
 set(PROJECT_NAME libCellML)
 set(PROJECT_URL https://libcellml.org)
-set(_PROJECT_VERSION 0.6.1)
+set(_PROJECT_VERSION 0.6.2)
 set(PROJECT_DEVELOPER_VERSION )
 project(${PROJECT_NAME} VERSION ${_PROJECT_VERSION} LANGUAGES CXX)
 

diff --git a/docs/changelogs/changelog_v0.6.1.rst → docs/changelogs/changelog_v0.6.1-rc.3.rst b/docs/changelogs/changelog_v0.6.1.rst → docs/changelogs/changelog_v0.6.1-rc.3.rst
@@ -1,5 +1,5 @@
-libCellML v0.6.1 Changelog
-==========================
+libCellML v0.6.1-rc.3 Changelog
+===============================
 
 Infrastructure
 --------------

diff --git a/docs/changelogs/changelog_v0.6.2.rst b/docs/changelogs/changelog_v0.6.2.rst
@@ -0,0 +1,15 @@
+libCellML v0.6.2 Changelog
+==========================
+
+Infrastructure
+--------------
+
+* Fix publishing of PyPI wheels by `@hsorby <https://github.com/hsorby>`_ [`#1284 <https://github.com/cellml/libcellml/pull/1284>`_].
+
+Contributors
+------------
+
+.. image:: https://avatars.githubusercontent.com/u/778048?v=4
+   :target: https://github.com/hsorby
+   :height: 32
+   :width: 32
diff --git a/docs/changelogs/index.rst b/docs/changelogs/index.rst
@@ -4,7 +4,8 @@ Changelogs
 
 .. toctree::
 
-   changelog_v0.6.1
+   changelog_v0.6.2
+   changelog_v0.6.1-rc.3
    changelog_v0.6.0
    changelog_v0.5.0
    changelog_v0.4.0

diff --git a/docs/index.rst b/docs/index.rst
@@ -39,7 +39,8 @@ Changelogs
 
 .. toctree::
 
-   changelogs/changelog_v0.6.1
+   changelogs/changelog_v0.6.2
+   changelogs/changelog_v0.6.1-rc.3
    changelogs/changelog_v0.6.0
    changelogs/changelog_v0.5.0
    changelogs/changelog_v0.4.0

diff --git a/tests/bindings/javascript/version.test.js b/tests/bindings/javascript/version.test.js
@@ -22,6 +22,6 @@ describe("Version tests", () => {
     libcellml = await libCellMLModule();
   });
   test('Checking version string.', () => {
-    expect(libcellml.versionString()).toBe('0.6.1');
+    expect(libcellml.versionString()).toBe('0.6.2');
   });
 })
diff --git a/tests/resources/coverage/generator/model.c b/tests/resources/coverage/generator/model.c
@@ -1,12 +1,12 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.1. */
+/* The content of this file was generated using the C profile of libCellML 0.6.2. */
 
 #include "model.h"
 
 #include <math.h>
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.1";
+const char LIBCELLML_VERSION[] = "0.6.2";
 
 const size_t STATE_COUNT = 1;
 const size_t VARIABLE_COUNT = 209;

diff --git a/tests/resources/coverage/generator/model.h b/tests/resources/coverage/generator/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.1. */
+/* The content of this file was generated using the C profile of libCellML 0.6.2. */
 
 #pragma once
 

diff --git a/tests/resources/coverage/generator/model.implementation.out b/tests/resources/coverage/generator/model.implementation.out
@@ -1,4 +1,4 @@
-/* The content of this file was generated using a modified C profile of libCellML 0.6.1. */
+/* The content of this file was generated using a modified C profile of libCellML 0.6.2. */
 
 double xor(double x, double y)
 {

diff --git a/tests/resources/coverage/generator/model.interface.out b/tests/resources/coverage/generator/model.interface.out
@@ -1,4 +1,4 @@
-/* The content of this file was generated using a modified C profile of libCellML 0.6.1. */
+/* The content of this file was generated using a modified C profile of libCellML 0.6.2. */
 
 #pragma once
 

diff --git a/tests/resources/coverage/generator/model.modified.profile.c b/tests/resources/coverage/generator/model.modified.profile.c
@@ -1,12 +1,12 @@
-/* The content of this file was generated using a modified C profile of libCellML 0.6.1. */
+/* The content of this file was generated using a modified C profile of libCellML 0.6.2. */
 
 #include "model.h"
 
 #include <math.h>
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0.post0";
-const char LIBCELLML_VERSION[] = "0.6.1";
+const char LIBCELLML_VERSION[] = "0.6.2";
 
 const size_t STATE_COUNT = 1;
 const size_t VARIABLE_COUNT = 209;

diff --git a/tests/resources/coverage/generator/model.modified.profile.h b/tests/resources/coverage/generator/model.modified.profile.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using a modified C profile of libCellML 0.6.1. */
+/* The content of this file was generated using a modified C profile of libCellML 0.6.2. */
 
 #pragma once
 

diff --git a/tests/resources/coverage/generator/model.modified.profile.py b/tests/resources/coverage/generator/model.modified.profile.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using a modified Python profile of libCellML 0.6.1.
+# The content of this file was generated using a modified Python profile of libCellML 0.6.2.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0.post0"
-LIBCELLML_VERSION = "0.6.1"
+LIBCELLML_VERSION = "0.6.2"
 
 STATE_COUNT = 1
 VARIABLE_COUNT = 209

diff --git a/tests/resources/coverage/generator/model.out b/tests/resources/coverage/generator/model.out
@@ -1,4 +1,4 @@
-/* The content of this file was generated using a modified C profile of libCellML 0.6.1. */
+/* The content of this file was generated using a modified C profile of libCellML 0.6.2. */
 
 #include "customheaderfile.h"
 

diff --git a/tests/resources/coverage/generator/model.py b/tests/resources/coverage/generator/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.1.
+# The content of this file was generated using the Python profile of libCellML 0.6.2.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.1"
+LIBCELLML_VERSION = "0.6.2"
 
 STATE_COUNT = 1
 VARIABLE_COUNT = 209

diff --git a/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.c b/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.c
@@ -1,12 +1,12 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.1. */
+/* The content of this file was generated using the C profile of libCellML 0.6.2. */
 
 #include "model.h"
 
 #include <math.h>
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.1";
+const char LIBCELLML_VERSION[] = "0.6.2";
 
 const size_t VARIABLE_COUNT = 2;
 

diff --git a/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.external.c b/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.external.c
@@ -1,12 +1,12 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.1. */
+/* The content of this file was generated using the C profile of libCellML 0.6.2. */
 
 #include "model.external.h"
 
 #include <math.h>
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.1";
+const char LIBCELLML_VERSION[] = "0.6.2";
 
 const size_t VARIABLE_COUNT = 2;
 

diff --git a/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.external.h b/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.external.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.1. */
+/* The content of this file was generated using the C profile of libCellML 0.6.2. */
 
 #pragma once
 

diff --git a/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.external.py b/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.external.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.1.
+# The content of this file was generated using the Python profile of libCellML 0.6.2.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.1"
+LIBCELLML_VERSION = "0.6.2"
 
 VARIABLE_COUNT = 2
 

diff --git a/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.h b/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.1. */
+/* The content of this file was generated using the C profile of libCellML 0.6.2. */
 
 #pragma once
 

diff --git a/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.py b/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.1.
+# The content of this file was generated using the Python profile of libCellML 0.6.2.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.1"
+LIBCELLML_VERSION = "0.6.2"
 
 VARIABLE_COUNT = 2
 

diff --git a/tests/resources/generator/algebraic_eqn_const_var_on_rhs/model.c b/tests/resources/generator/algebraic_eqn_const_var_on_rhs/model.c
@@ -1,12 +1,12 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.1. */
+/* The content of this file was generated using the C profile of libCellML 0.6.2. */
 
 #include "model.h"
 
 #include <math.h>
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.1";
+const char LIBCELLML_VERSION[] = "0.6.2";
 
 const size_t VARIABLE_COUNT = 2;
 

diff --git a/tests/resources/generator/algebraic_eqn_const_var_on_rhs/model.h b/tests/resources/generator/algebraic_eqn_const_var_on_rhs/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.1. */
+/* The content of this file was generated using the C profile of libCellML 0.6.2. */
 
 #pragma once
 

diff --git a/tests/resources/generator/algebraic_eqn_const_var_on_rhs/model.py b/tests/resources/generator/algebraic_eqn_const_var_on_rhs/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.1.
+# The content of this file was generated using the Python profile of libCellML 0.6.2.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.1"
+LIBCELLML_VERSION = "0.6.2"
 
 VARIABLE_COUNT = 2
 

diff --git a/tests/resources/generator/algebraic_eqn_constant_on_rhs/model.c b/tests/resources/generator/algebraic_eqn_constant_on_rhs/model.c
@@ -1,12 +1,12 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.1. */
+/* The content of this file was generated using the C profile of libCellML 0.6.2. */
 
 #include "model.h"
 
 #include <math.h>
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.1";
+const char LIBCELLML_VERSION[] = "0.6.2";
 
 const size_t VARIABLE_COUNT = 1;
 

diff --git a/tests/resources/generator/algebraic_eqn_constant_on_rhs/model.h b/tests/resources/generator/algebraic_eqn_constant_on_rhs/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.1. */
+/* The content of this file was generated using the C profile of libCellML 0.6.2. */
 
 #pragma once
 

diff --git a/tests/resources/generator/algebraic_eqn_constant_on_rhs/model.py b/tests/resources/generator/algebraic_eqn_constant_on_rhs/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.1.
+# The content of this file was generated using the Python profile of libCellML 0.6.2.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.1"
+LIBCELLML_VERSION = "0.6.2"
 
 VARIABLE_COUNT = 1
 

diff --git a/tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.c b/tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.c
@@ -1,12 +1,12 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.1. */
+/* The content of this file was generated using the C profile of libCellML 0.6.2. */
 
 #include "model.h"
 
 #include <math.h>
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.1";
+const char LIBCELLML_VERSION[] = "0.6.2";
 
 const size_t STATE_COUNT = 1;
 const size_t VARIABLE_COUNT = 2;

diff --git a/tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.h b/tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.1. */
+/* The content of this file was generated using the C profile of libCellML 0.6.2. */
 
 #pragma once
 

diff --git a/tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.py b/tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.1.
+# The content of this file was generated using the Python profile of libCellML 0.6.2.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.1"
+LIBCELLML_VERSION = "0.6.2"
 
 STATE_COUNT = 1
 VARIABLE_COUNT = 2