ASCEE/lasp
ASCEE/lasp
5
1
Fork 0
Code Issues 5 Pull Requests Actions Releases 14 Activity

Bla

Browse Source
This commit is contained in:
Anne de Jong 2023-07-18 17:12:34 +02:00
parent 914da89819
commit 9f81db8eeb
4 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cpp_src/lasp_config.h.in
View File

@ -9,9 +9,6 @@
#ifndef LASP_CONFIG_H #ifndef LASP_CONFIG_H
#define LASP_CONFIG_H #define LASP_CONFIG_H
const int LASP_VERSION_MAJOR = @CMAKE_PROJECT_VERSION_MAJOR@;
const int LASP_VERSION_MINOR = @CMAKE_PROJECT_VERSION_MINOR@;
/* Debug flag */ /* Debug flag */
#cmakedefine01 LASP_DEBUG #cmakedefine01 LASP_DEBUG

7
cpp_src/lasp_cpp.cpp
View File

@ -52,12 +52,5 @@ PYBIND11_MODULE(lasp_cpp, m) {
init_datahandler(m); init_datahandler(m);
init_siggen(m); init_siggen(m);
// We store the version number of the code via CMake, and create an
// attribute in the C++ code.
m.attr("__version__") = std::to_string(LASP_VERSION_MAJOR) + "." +
std::to_string(LASP_VERSION_MINOR);
m.attr("LASP_VERSION_MAJOR") = LASP_VERSION_MAJOR;
m.attr("LASP_VERSION_MINOR") = LASP_VERSION_MINOR;
} }
/** @} */ /** @} */

12
pyproject.toml
View File

@ -5,7 +5,7 @@ requires-python = ">=3.10"
description = "Library for Acoustic Signal Processing" description = "Library for Acoustic Signal Processing"
license = { "file" = "LICENSE" } license = { "file" = "LICENSE" }
authors = [{ "name" = "J.A. de Jong", "email" = "j.a.dejong@ascee.nl" }] authors = [{ "name" = "J.A. de Jong", "email" = "j.a.dejong@ascee.nl" }]
dynamic = ["version"] version = "1.0"
keywords = ["DSP", "DAQ", "Signal processing"] keywords = ["DSP", "DAQ", "Signal processing"]
@ -26,7 +26,7 @@ dependencies = ["scipy", "numpy", "matplotlib", "appdirs", "dataclasses_json",
"h5py", "pybind11"] "h5py", "pybind11"]
[build-system] # How pip and other frontends should build this project [build-system] # How pip and other frontends should build this project
requires = ["py-build-cmake~=0.1.8", "setuptools_scm[toml]>=6.2"] requires = ["py-build-cmake~=0.1.8" ]
build-backend = "py_build_cmake.build" build-backend = "py_build_cmake.build"
[tool.py-build-cmake.module] # Where to find the Python module to package [tool.py-build-cmake.module] # Where to find the Python module to package
@ -42,5 +42,9 @@ source_path = "."
build_args = ["-j"] build_args = ["-j"]
install_components = ["python_modules"] install_components = ["python_modules"]
[tool.setuptools_scm] [tool.commitizen]
version_file = ["python_src/lasp/_version.py" , "cpp_src/_version.txt"] name = "cz_conventional_commits"
tag_format = "v$version"
version_scheme = "semver"
version_provider = "pep621"
update_changelog_on_bump = true

7
python_src/lasp/__init__.py
View File

@ -2,9 +2,12 @@
LASP: Library for Acoustic Signal Processing LASP: Library for Acoustic Signal Processing
""" """
from ._version import *
from .lasp_cpp import * from .lasp_cpp import *
import lasp.lasp_cpp from ._version import __version__, __version_tuple__
LASP_VERSION_MAJOR = __version_tuple__[0]
LASP_VERSION_MINOR = __version_tuple__[1]
from .lasp_common import * from .lasp_common import *
# from .lasp_imptube import * # TwoMicImpedanceTube # from .lasp_imptube import * # TwoMicImpedanceTube