Skip to content

Commit

Permalink
Merge branch 'main' into issue1243
Browse files Browse the repository at this point in the history
  • Loading branch information
agarny authored Oct 26, 2024
2 parents 8fda60d + ac72026 commit 315a007
Show file tree
Hide file tree
Showing 5 changed files with 71 additions and 3 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/deploy-on-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
project(${PROJECT_NAME} VERSION ${_PROJECT_VERSION} LANGUAGES CXX)

# Set policies that affect the build.
Expand Down
63 changes: 63 additions & 0 deletions docs/changelogs/changelog_v0.6.0.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
libCellML v0.6.0 Changelog
==========================

Analyser
--------

* Analyser: improve the reporting of unit-related issues with the pow() function by `@agarny <https://github.com/agarny>`_ [`#1212 <https://github.com/cellml/libcellml/pull/1212>`_].

Coverage
--------

* Python docstrings tests: don't test for CellmlElementType by `@agarny <https://github.com/agarny>`_ [`#1246 <https://github.com/cellml/libcellml/pull/1246>`_].

Documentation
-------------

* Code of conduct by `@hsorby <https://github.com/hsorby>`_ [`#1232 <https://github.com/cellml/libcellml/pull/1232>`_].
* Fix some of the links in the documentation by `@hsorby <https://github.com/hsorby>`_ [`#1192 <https://github.com/cellml/libcellml/pull/1192>`_].

Generator
---------

* Code generation: unit scaling for rate computation is the other way round by `@agarny <https://github.com/agarny>`_ [`#1241 <https://github.com/cellml/libcellml/pull/1241>`_].
* Generator: `computeComputedConstants()` may not generate some dependencies in the right place by `@agarny <https://github.com/agarny>`_ [`#1217 <https://github.com/cellml/libcellml/pull/1217>`_].
* Generator: use `size_t` rather than `int` in `nlaSolve()` by `@agarny <https://github.com/agarny>`_ [`#1202 <https://github.com/cellml/libcellml/pull/1202>`_].

Imports
-------

* Fix the segfault when resolving imports by `@hsorby <https://github.com/hsorby>`_ [`#1204 <https://github.com/cellml/libcellml/pull/1204>`_].

Infrastructure
--------------

* CI build fixes by `@hsorby <https://github.com/hsorby>`_ [`#1268 <https://github.com/cellml/libcellml/pull/1268>`_].
* Update `cibuildwheel` by `@hsorby <https://github.com/hsorby>`_ [`#1264 <https://github.com/cellml/libcellml/pull/1264>`_].
* Add Codespell GitHub action by `@hsorby <https://github.com/hsorby>`_ [`#1234 <https://github.com/cellml/libcellml/pull/1234>`_].
* Remove FindPython* files by `@hsorby <https://github.com/hsorby>`_ [`#1236 <https://github.com/cellml/libcellml/pull/1236>`_].
* Update GitHub actions action to newer versions by `@hsorby <https://github.com/hsorby>`_ [`#1224 <https://github.com/cellml/libcellml/pull/1224>`_].
* Switch to using Here document by `@hsorby <https://github.com/hsorby>`_ [`#1200 <https://github.com/cellml/libcellml/pull/1200>`_].

Python bindings
---------------

* Protect against empty classifiers in Python bindings by `@hsorby <https://github.com/hsorby>`_ [`#1215 <https://github.com/cellml/libcellml/pull/1215>`_].
* Produce python wheels for Python 3.12 by `@hsorby <https://github.com/hsorby>`_ [`#1209 <https://github.com/cellml/libcellml/pull/1209>`_].

Validation
----------

* Update the validation by `@hsorby <https://github.com/hsorby>`_ [`#1225 <https://github.com/cellml/libcellml/pull/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
1 change: 1 addition & 0 deletions docs/changelogs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Changelogs

.. toctree::

changelog_v0.6.0
changelog_v0.5.0
changelog_v0.4.0
changelog_v0.3.104
Expand Down
1 change: 1 addition & 0 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ Changelogs

.. toctree::

changelogs/changelog_v0.6.0
changelogs/changelog_v0.5.0
changelogs/changelog_v0.4.0
changelogs/changelog_v0.3.104
Expand Down

0 comments on commit 315a007

Please sign in to comment.