.gitignore

@@ -6,6 +6,9 @@
 .ninja*
 build.ninja
 dist
+src/lasp.egg-info
+test/.ipynb_checkpoints
+src/lasp/lasp_config.h
 _deps
 compile_commands.json
 CMakeFiles
@@ -20,4 +23,3 @@ doc
 acme_log.log
 .venv
 .py-build-cmake_cache
-cpp_src/lasp_config.h

README.md

@@ -1,5 +1,8 @@
 # Library for Acoustic Signal Processing
 
+- Master branch: [![Build Status](https://drone.ascee.nl/api/badges/ASCEE/lasp/status.svg?ref=refs/heads/master)](https://drone.ascee.nl/ASCEE/lasp)
+- Develop branch: [![Build Status](https://drone.ascee.nl/api/badges/ASCEE/lasp/status.svg?ref=refs/heads/develop)](https://drone.ascee.nl/ASCEE/lasp)
+
 
 Welcome to LASP: Library for Acoustic Signal Processing. LASP is a C++ library
 with a Python interface which is supposed to acquire and process (multi) sensor data in real time on a PC and output results.
@@ -43,48 +46,41 @@ in a sister repository [lasp-doc](https://code.ascee.nl/ascee/lasp-doc).
 
 If you have any question(s), please feel free to contact us: [email](info@ascee.nl).
 
-# Installation - Linux (Ubuntu-based)
+# Installation - Linux (Debian-based)
 
-## From wheel (recommended for non-developers)
+## Dependencies
 
-### Prerequisites
+One-liner:
 
-Run the following on the command line to install all prerequisites on
-Debian-based Linux:
+- `$ sudo apt install python3-pybind11 libopenblas-dev python3-pip python3-scipy libusb-1.0-0-dev libpulse-dev cmake-curses-gui python3-h5py python3-dataclasses-json python3-matplotlib python3-appdirs`
 
-- `sudo apt install python3-pip libfftw3-3 libopenblas-base libusb-1.0-0
-  libpulse0`
-
-### Download and install LASP
-
-Go to: [LASP releases](https://code.ascee.nl/ASCEE/lasp/releases/latest/) and
-download the latest `.whl`. Then run:
-
-- `pip install lasp-*-linux_x86_64.whl`
-
-## From source (Ubuntu-based)
-
-### Prerequisites
-
-Run the following one-liner:
-
-- `sudo apt install -y git python3 python3-virtualenv python3-venv libopenblas-dev python3-pip libfftw3-dev libusb-1.0-0-dev libpulse-dev python3-build`
 
 If building RtAudio with the ALSA backend, you will also require the following packages:
 
-- `sudo apt install libclalsadrv-dev`
+- libclalsadrv-dev
 
 If building RtAudio with the Jack Audio Connection Kit (JACK) backend, you will also require the following packages:
 
-- `sudo apt install libjack-jackd2-dev`
+- libjack-jackd2-dev
 
-### Download & build
+## Download & build
 
 - `$ git clone --recursive https://code.ascee.nl/ASCEE/lasp.git`
 - `$ cd lasp`
-- `pip install -e .`
 
-# Installation - (x86_64) Windows (with WinPython), build with MSYS2 (NOT YET UPDATED!!)
+For a release build:
+
+- `$ cmake .`
+
+or optionally for a custom build:
+
+- `$ ccmake .`
+
+Configure and run:
+
+- `$ make -j`
+
+# Installation - (x86_64) Windows (with WinPython), build with MSYS2
 
 ## Prerequisites
 
@@ -117,11 +113,7 @@ If building RtAudio with the Jack Audio Connection Kit (JACK) backend, you will
 
 # Documentation
 
-## Online
-
-[Online LASP documentation](https://lasp.ascee.nl/).
-
-## In directory
+In directory:
 
 `$ sudo apt install doxygen graphviz`
 `$ pip install doxypypy`
@@ -134,7 +126,21 @@ This will build the documentation. It can be read by:
 
 `$ <YOUR-BROWSER> doc/html/index.html`
 
-# Usage
+Or via docker:
+
+`$ docker build -t lasp_ascee_nl:latest .`
+
+## Install
+
+For an editable install (while developing):
+
+- `$ pip3 install --prefix=$HOME/.local -e .`
+
+To install locally, for a fixed version:
+
+- `$ pip3 install --prefix=$HOME/.local`
+
+## Usage
 
 - See examples directories for IPython notebooks.
 - Please refer to the [documentation](https://lasp.ascee.nl/) for features.

pyproject.toml

@@ -22,8 +22,8 @@ classifiers = [
 ]
 urls = { "Documentation" = "https://lasp.ascee.nl" }
 
-dependencies = ["scipy", "numpy", "matplotlib>=3.7.2", "appdirs",
-                "dataclasses_json", "h5py"]
+dependencies = ["scipy", "numpy", "matplotlib>=3.7.2", "appdirs", "dataclasses_json",
+                "h5py", "pybind11"]
 
 [build-system] # How pip and other frontends should build this project
 requires = ["py-build-cmake~=0.1.8", "pybind11" ]

python_src/lasp/__init__.py

@@ -3,10 +3,6 @@ LASP: Library for Acoustic Signal Processing
 
 """
 
-# Error with dbm in Pyinstaller
-# https://stackoverflow.com/questions/45670104/how-to-fix-the-no-dbm-clone-found-error-in-pyinstaller
-import dbm.dump
-
 
 from .lasp_version import __version__
 from .lasp_common import *

third_party/armadillo-code

@@ -1 +1 @@
-Subproject commit b6e810f2d33bcc234d67db5277d027949fec82f8
+Subproject commit 3865a0520d577ac293d88c4fd726a41bda949869