From 192e945eb6327e71729162e67504110aeae5e40d Mon Sep 17 00:00:00 2001 From: abi-git-user Date: Thu, 24 Oct 2024 11:46:40 +1300 Subject: [PATCH 1/7] Changing version to: 0.6.0-rc.2 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1dd1554065..874fbef055 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,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.0) -set(PROJECT_DEVELOPER_VERSION -rc.1) +set(PROJECT_DEVELOPER_VERSION -rc.2) project(${PROJECT_NAME} VERSION ${_PROJECT_VERSION} LANGUAGES CXX) # Set policies that affect the build. From 366051db5a01c5f69374d11cfcf71a78500d4cc3 Mon Sep 17 00:00:00 2001 From: Hugh Sorby Date: Thu, 24 Oct 2024 12:40:24 +1300 Subject: [PATCH 2/7] Add name property to actions/upload-artifact@v4. --- .github/workflows/deploy-on-release.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-on-release.yml b/.github/workflows/deploy-on-release.yml index ab4e0573ca..7697388d0a 100644 --- a/.github/workflows/deploy-on-release.yml +++ b/.github/workflows/deploy-on-release.yml @@ -118,7 +118,7 @@ jobs: ref: v2.9.10 - name: Add msbuild to PATH - uses: microsoft/setup-msbuild@v1.3.1 + uses: microsoft/setup-msbuild@v2 if: runner.os == 'Windows' - name: Prepare Windows environment @@ -269,11 +269,12 @@ jobs: uses: actions/upload-artifact@v4 with: path: ./build/dist/* + name: ${{ matrix.config.os }} wheels: needs: setup-jobs if: needs.setup-jobs.outputs.allowed-jobs == 'Wheels' || needs.setup-jobs.outputs.allowed-jobs == 'All' - name: ${{ matrix.name }} ${{ matrix.py }} wheels + name: ${{ matrix.name }} ${{ matrix.py }} wheel runs-on: ${{ matrix.os }} strategy: fail-fast: false @@ -359,6 +360,7 @@ jobs: uses: actions/upload-artifact@v4 with: path: ./wheelhouse/*.whl + name: ${{ matrix.name }}-${{ matrix.py }}-wheel - name: Publish Python wheels if: needs.setup-jobs.outputs.binaries-destination == 'Publish' @@ -440,6 +442,7 @@ jobs: uses: actions/upload-artifact@v4 with: path: ${{ steps.package-javascript.outputs.files }} + name: libcellml.js - name: Publish libcellml.js if: needs.setup-jobs.outputs.binaries-destination == 'Publish' From 43c56379a69a4759e16781837dcac5131a049a6d Mon Sep 17 00:00:00 2001 From: abi-git-user Date: Thu, 24 Oct 2024 12:57:33 +1300 Subject: [PATCH 3/7] Changing version to: 0.6.0-rc.3 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 874fbef055..36e345d4e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,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.0) -set(PROJECT_DEVELOPER_VERSION -rc.2) +set(PROJECT_DEVELOPER_VERSION -rc.3) project(${PROJECT_NAME} VERSION ${_PROJECT_VERSION} LANGUAGES CXX) # Set policies that affect the build. From 73179099479e3d8f681c0ff211fab8c2c59e0928 Mon Sep 17 00:00:00 2001 From: abi-git-user Date: Thu, 24 Oct 2024 13:02:49 +1300 Subject: [PATCH 4/7] Adding changelog changelog_v0.6.0-rc.3.rst. Updating changelog table of contents. --- docs/changelogs/changelog_v0.6.0-rc.3.rst | 67 +++++++++++++++++++++++ docs/changelogs/index.rst | 1 + docs/index.rst | 1 + 3 files changed, 69 insertions(+) create mode 100644 docs/changelogs/changelog_v0.6.0-rc.3.rst diff --git a/docs/changelogs/changelog_v0.6.0-rc.3.rst b/docs/changelogs/changelog_v0.6.0-rc.3.rst new file mode 100644 index 0000000000..cfd4ed2465 --- /dev/null +++ b/docs/changelogs/changelog_v0.6.0-rc.3.rst @@ -0,0 +1,67 @@ +libCellML v0.6.0-rc.3 Changelog +=============================== + +Analyser +-------- + +* Analyser: improve the reporting of unit-related issues with the pow() function by `@agarny `_ [`#1212 `_]. + +Coverage +-------- + +* Python docstrings tests: don't test for CellmlElementType by `@agarny `_ [`#1246 `_]. + +Documentation +------------- + +* Code of conduct by `@hsorby `_ [`#1232 `_]. +* Fix some of the links in the documentation by `@hsorby `_ [`#1192 `_]. + +Generator +--------- + +* Code generation: unit scaling for rate computation is the other way round by `@agarny `_ [`#1241 `_]. + +Imports +------- + +* Fix the segfault when resolving imports by `@hsorby `_ [`#1204 `_]. + +Infrastructure +-------------- + +* Update `cibuildwheel` by `@hsorby `_ [`#1264 `_]. +* Add Codespell GitHub action by `@hsorby `_ [`#1234 `_]. +* Remove FindPython* files by `@hsorby `_ [`#1236 `_]. +* Update GitHub actions action to newer versions by `@hsorby `_ [`#1224 `_]. +* Switch to using Here document by `@hsorby `_ [`#1200 `_]. + +No category +----------- + +* CI build fixes by `@hsorby `_ [`#1268 `_]. +* Generator: `computeComputedConstants()` may not generate some dependencies in the right place by `@agarny `_ [`#1217 `_]. +* Generator: use `size_t` rather than `int` in `nlaSolve()` by `@agarny `_ [`#1202 `_]. + +Python bindings +--------------- + +* Protect against empty classifiers in Python bindings by `@hsorby `_ [`#1215 `_]. +* Produce python wheels for Python 3.12 by `@hsorby `_ [`#1209 `_]. + +Validation +---------- + +* Update the validation by `@hsorby `_ [`#1225 `_]. + +Contributors +------------ + +.. image:: https://avatars.githubusercontent.com/u/778048?v=4 + :target: https://github.com/hsorby + :height: 32 + :width: 32 +.. image:: https://avatars.githubusercontent.com/u/602265?v=4 + :target: https://github.com/agarny + :height: 32 + :width: 32 diff --git a/docs/changelogs/index.rst b/docs/changelogs/index.rst index 69bfa08455..ef6df5d2e6 100644 --- a/docs/changelogs/index.rst +++ b/docs/changelogs/index.rst @@ -4,6 +4,7 @@ Changelogs .. toctree:: + changelog_v0.6.0-rc.3 changelog_v0.5.0 changelog_v0.4.0 changelog_v0.3.104 diff --git a/docs/index.rst b/docs/index.rst index cfafd1d463..dd71a0a95e 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -39,6 +39,7 @@ Changelogs .. toctree:: + changelogs/changelog_v0.6.0-rc.3 changelogs/changelog_v0.5.0 changelogs/changelog_v0.4.0 changelogs/changelog_v0.3.104 From 62b210a6656c7f33c5ae859c2898eea0d1f80b9a Mon Sep 17 00:00:00 2001 From: abi-git-user Date: Thu, 24 Oct 2024 15:15:24 +1300 Subject: [PATCH 5/7] Changing version to: 0.6.0 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 36e345d4e2..d44995ad1a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,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.0) -set(PROJECT_DEVELOPER_VERSION -rc.3) +set(PROJECT_DEVELOPER_VERSION ) project(${PROJECT_NAME} VERSION ${_PROJECT_VERSION} LANGUAGES CXX) # Set policies that affect the build. From 7f9acdae2416425673935972f83ddb3798b58a1d Mon Sep 17 00:00:00 2001 From: abi-git-user Date: Thu, 24 Oct 2024 15:20:50 +1300 Subject: [PATCH 6/7] Adding changelog changelog_v0.6.0.rst. Updating changelog table of contents. --- .../{changelog_v0.6.0-rc.3.rst => changelog_v0.6.0.rst} | 4 ++-- docs/changelogs/index.rst | 2 +- docs/index.rst | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename docs/changelogs/{changelog_v0.6.0-rc.3.rst => changelog_v0.6.0.rst} (97%) diff --git a/docs/changelogs/changelog_v0.6.0-rc.3.rst b/docs/changelogs/changelog_v0.6.0.rst similarity index 97% rename from docs/changelogs/changelog_v0.6.0-rc.3.rst rename to docs/changelogs/changelog_v0.6.0.rst index cfd4ed2465..4d049c5511 100644 --- a/docs/changelogs/changelog_v0.6.0-rc.3.rst +++ b/docs/changelogs/changelog_v0.6.0.rst @@ -1,5 +1,5 @@ -libCellML v0.6.0-rc.3 Changelog -=============================== +libCellML v0.6.0 Changelog +========================== Analyser -------- diff --git a/docs/changelogs/index.rst b/docs/changelogs/index.rst index ef6df5d2e6..333664acf7 100644 --- a/docs/changelogs/index.rst +++ b/docs/changelogs/index.rst @@ -4,7 +4,7 @@ Changelogs .. toctree:: - changelog_v0.6.0-rc.3 + changelog_v0.6.0 changelog_v0.5.0 changelog_v0.4.0 changelog_v0.3.104 diff --git a/docs/index.rst b/docs/index.rst index dd71a0a95e..04a49c7496 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -39,7 +39,7 @@ Changelogs .. toctree:: - changelogs/changelog_v0.6.0-rc.3 + changelogs/changelog_v0.6.0 changelogs/changelog_v0.5.0 changelogs/changelog_v0.4.0 changelogs/changelog_v0.3.104 From ac72026a1543b0a36ff544d3aa9ef28724770653 Mon Sep 17 00:00:00 2001 From: Hugh Sorby Date: Thu, 24 Oct 2024 15:23:06 +1300 Subject: [PATCH 7/7] Update changelog_v0.6.0.rst --- docs/changelogs/changelog_v0.6.0.rst | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/docs/changelogs/changelog_v0.6.0.rst b/docs/changelogs/changelog_v0.6.0.rst index 4d049c5511..300829e4d9 100644 --- a/docs/changelogs/changelog_v0.6.0.rst +++ b/docs/changelogs/changelog_v0.6.0.rst @@ -21,6 +21,8 @@ Generator --------- * Code generation: unit scaling for rate computation is the other way round by `@agarny `_ [`#1241 `_]. +* Generator: `computeComputedConstants()` may not generate some dependencies in the right place by `@agarny `_ [`#1217 `_]. +* Generator: use `size_t` rather than `int` in `nlaSolve()` by `@agarny `_ [`#1202 `_]. Imports ------- @@ -30,19 +32,13 @@ Imports Infrastructure -------------- +* CI build fixes by `@hsorby `_ [`#1268 `_]. * Update `cibuildwheel` by `@hsorby `_ [`#1264 `_]. * Add Codespell GitHub action by `@hsorby `_ [`#1234 `_]. * Remove FindPython* files by `@hsorby `_ [`#1236 `_]. * Update GitHub actions action to newer versions by `@hsorby `_ [`#1224 `_]. * Switch to using Here document by `@hsorby `_ [`#1200 `_]. -No category ------------ - -* CI build fixes by `@hsorby `_ [`#1268 `_]. -* Generator: `computeComputedConstants()` may not generate some dependencies in the right place by `@agarny `_ [`#1217 `_]. -* Generator: use `size_t` rather than `int` in `nlaSolve()` by `@agarny `_ [`#1202 `_]. - Python bindings ---------------