From 86be9697295e1b8930410e042d3343f9bf62c96b Mon Sep 17 00:00:00 2001 From: Emily Boudreaux Date: Fri, 28 Nov 2025 11:46:39 -0500 Subject: [PATCH] fix(unity): brought version of libcomposition which works with unity builds Note that openssl is incompatible with unity builds. This means that fourdst can only be built as a unity build if libplugin (which is what brings in openssl) is not build. Generally this will happen when building only the python bindings which do not depend on openssl or libplugin --- meson.build | 2 +- pyproject.toml | 2 +- src-pybind/fourdst/__init__.py | 2 +- subprojects/libcomposition.wrap | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 5257b76..31b57fe 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('fourdst', 'cpp', version: 'v0.9.10', default_options: ['cpp_std=c++23'], meson_version: '>=1.5.0') +project('fourdst', 'cpp', version: 'v0.9.11', default_options: ['cpp_std=c++23'], meson_version: '>=1.5.0') add_project_arguments('-fvisibility=default', language: 'cpp') diff --git a/pyproject.toml b/pyproject.toml index a068d71..d1c15d5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ build-backend = "mesonpy" [project] name = "fourdst" # Choose your Python package name -version = "0.8.5" # Your project's version +version = "v0.9.11" # Your project's version description = "Python interface to the utility fourdst modules from the 4D-STAR project" readme = "readme.md" license = { file = "LICENSE.txt" } # Reference your license file [cite: 2] diff --git a/src-pybind/fourdst/__init__.py b/src-pybind/fourdst/__init__.py index 2e367ad..31dfa55 100644 --- a/src-pybind/fourdst/__init__.py +++ b/src-pybind/fourdst/__init__.py @@ -11,4 +11,4 @@ sys.modules['fourdst.config'] = config __all__ = ['atomic', 'composition', 'constants', 'config', 'core', 'cli'] -__version__ = 'v0.9.6' \ No newline at end of file +__version__ = 'v0.9.11' \ No newline at end of file diff --git a/subprojects/libcomposition.wrap b/subprojects/libcomposition.wrap index af9ba14..5a283f4 100644 --- a/subprojects/libcomposition.wrap +++ b/subprojects/libcomposition.wrap @@ -1,4 +1,4 @@ [wrap-git] url = https://github.com/4D-STAR/libcomposition.git -revision = v2.2.1 +revision = v2.2.2 depth = 1