From 3766560f66bf7abc23c0bf7e2bb6a5c2c8ce37fc Mon Sep 17 00:00:00 2001 From: Mark Piper Date: Tue, 11 Feb 2025 19:27:16 -0700 Subject: [PATCH 1/2] Use project_name functions --- meson.build | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/meson.build b/meson.build index bdf3d26..2aff652 100644 --- a/meson.build +++ b/meson.build @@ -18,7 +18,7 @@ numpy_inc = run_command( ).stdout().strip() incs = include_directories( [ - 'pymt_heatf/lib', + meson.project_name() / 'lib', python_inc, numpy_inc, ] @@ -36,31 +36,31 @@ deps = [ ] srcs = [ - 'pymt_heatf/lib/bmi_interoperability.f90', - 'pymt_heatf/lib/heatmodelf.pyx', + meson.project_name() / 'lib/bmi_interoperability.f90', + meson.project_name() / 'lib/heatmodelf.pyx', ] # Files get copied to /site-packages/ install_pkg_srcs = [ - 'pymt_heatf/__init__.py', - 'pymt_heatf/_bmi.py', + meson.project_name() / '__init__.py', + meson.project_name() / '_bmi.py', ] py.install_sources( install_pkg_srcs, - subdir: 'pymt_heatf', + subdir: meson.project_name(), ) install_lib_srcs = [ - 'pymt_heatf/lib/__init__.py', - 'pymt_heatf/lib/heatmodelf.pyx', + meson.project_name() / 'lib/__init__.py', + meson.project_name() / 'lib/heatmodelf.pyx', ] py.install_sources( install_lib_srcs, - subdir: 'pymt_heatf/lib', + subdir: meson.project_name() / 'lib', ) install_subdir( 'meta/HeatModelF', - install_dir: py.get_install_dir() / 'pymt_heatf/data', + install_dir: py.get_install_dir() / meson.project_name() / 'data', ) py.extension_module( @@ -69,8 +69,8 @@ py.extension_module( dependencies: deps, include_directories: incs, install: true, - subdir: 'pymt_heatf/lib', + subdir: meson.project_name() / 'lib', ) # This is a temporary fix for editable installs. -run_command('cp', '-r', 'pymt_heatf/data', 'build', check: false) +run_command('cp', '-r', meson.project_name() / 'data', 'build', check: false) From 6f7e532ea9900ff55363df05884c0ac315a9bd21 Mon Sep 17 00:00:00 2001 From: Mark Piper Date: Tue, 11 Feb 2025 19:44:03 -0700 Subject: [PATCH 2/2] Update changelog [skip ci] --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 36f1f4b..f115ac2 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,6 +2,7 @@ ## 3.3 (unreleased) +- Use the project_name function (#15) - Set up a monthly build (#13) ## 3.2 (2024-12-20)