From c6316a96d91bd2440a2d72de189919e5fab15c50 Mon Sep 17 00:00:00 2001 From: David Huggins-Daines Date: Fri, 10 Jan 2025 09:14:13 -0500 Subject: [PATCH 1/3] chore: update all version numbers for a 5.0.4 release --- .gitignore | 6 ++++++ CMakeLists.txt | 2 +- README.md | 2 +- cython/README.md | 2 +- docs/source/conf.py | 2 +- doxygen/CMakeLists.txt | 2 +- include/pocketsphinx.h | 4 ++-- pyproject.toml | 3 ++- release-checklist.md | 2 +- tox.ini | 2 +- 10 files changed, 17 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index b07826f89..8d7f9240a 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,9 @@ DartConfiguration.tcl cmake_install.cmake venv/ .tox +Makefile +config.h +include/pocketsphinx/sphinx_config.h +pocketsphinx.pc +test/testfuncs.sh +test/unit/test_macros.h diff --git a/CMakeLists.txt b/CMakeLists.txt index ce7eb35eb..6ab72a248 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.14) # I like pie -project(PocketSphinx VERSION 5.0.3 +project(PocketSphinx VERSION 5.0.4 DESCRIPTION "A small speech recognizer" HOMEPAGE_URL "https://github.com/cmusphinx/pocketsphinx" LANGUAGES C) diff --git a/README.md b/README.md index d2dd3c5c5..d1b1e92b0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -PocketSphinx 5.0.3 +PocketSphinx 5.0.4 ================== This is PocketSphinx, one of Carnegie Mellon University's open source large diff --git a/cython/README.md b/cython/README.md index bc390f927..3ee77f4e8 100644 --- a/cython/README.md +++ b/cython/README.md @@ -1,4 +1,4 @@ -PocketSphinx 5.0.3 +PocketSphinx 5.0.4 ================== This is PocketSphinx, one of Carnegie Mellon University's open source large diff --git a/docs/source/conf.py b/docs/source/conf.py index 1626c76f2..ce8be7f9c 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -22,7 +22,7 @@ author = 'David Huggins-Daines' # The full version, including alpha/beta/rc tags -release = '5.0.3' +release = '5.0.4' # -- General configuration --------------------------------------------------- diff --git a/doxygen/CMakeLists.txt b/doxygen/CMakeLists.txt index c392af12e..e7e2f5c45 100644 --- a/doxygen/CMakeLists.txt +++ b/doxygen/CMakeLists.txt @@ -1,6 +1,6 @@ find_package(Doxygen) if(DOXYGEN_FOUND) - set(DOXYGEN_PROJECT_NUMBER 5.0.3) + set(DOXYGEN_PROJECT_NUMBER 5.0.4) set(DOXYGEN_EXAMPLE_PATH ${CMAKE_SOURCE_DIR}/examples) set(DOXYGEN_SORT_MEMBER_DOCS NO) set(DOXYGEN_USE_MATHJAX YES) diff --git a/include/pocketsphinx.h b/include/pocketsphinx.h index 4dbcd7b04..884532fe0 100644 --- a/include/pocketsphinx.h +++ b/include/pocketsphinx.h @@ -1095,8 +1095,8 @@ void ps_get_all_time(ps_decoder_t *ps, double *out_nspeech, /** * @mainpage PocketSphinx API Documentation * @author David Huggins-Daines - * @version 5.0.3 - * @date December 28, 2023 + * @version 5.0.4 + * @date January 10, 2025 * * @tableofcontents{HTML:1} * diff --git a/pyproject.toml b/pyproject.toml index 62ad24dc1..41d8085d4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ build-backend = "scikit_build_core.build" [project] name = "pocketsphinx" -version = "5.0.3" +version = "5.0.4" description = "Official Python bindings for PocketSphinx" readme = "cython/README.md" authors = [ @@ -48,6 +48,7 @@ build = [ "cp310-*", "cp311-*", "cp312-*", + "cp313-*", ] # Build only universal wheels for Mac where possible, and skip 32-bit # builds to avoid building a gigabyte of stuff all the time diff --git a/release-checklist.md b/release-checklist.md index 48c1c1128..1e08cbfa9 100644 --- a/release-checklist.md +++ b/release-checklist.md @@ -4,7 +4,7 @@ - docs/source/conf.py - doxygen/CMakeLists.txt - README.md - - setup.cfg + - pyproject.toml - include/pocketsphinx.h - docker build - make github release and tag diff --git a/tox.ini b/tox.ini index b25b47c96..aa5049762 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -env_list = py{38,39,310,311,312} +env_list = py{38,39,310,311,312,313} minversion = 4.11.4 [testenv] From 79d9d0926aca75fc605a231e94bb2b43a7931608 Mon Sep 17 00:00:00 2001 From: David Huggins-Daines Date: Fri, 10 Jan 2025 09:35:17 -0500 Subject: [PATCH 2/3] docs: add recommended packages --- README.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/README.md b/README.md index d1b1e92b0..eefc40a7b 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,19 @@ There is no longer any dependency on SphinxBase. There is no SphinxBase anymore. This is not the SphinxBase you're looking for. All your SphinxBase are belong to us. +There are some other dependencies that you may find useful in order to +use the example code (though they are not strictly necessary to build +and install). On Debian GNU/Linux and its derivatives (such as +Raspberry Pi OS, Ubuntu, etc), you can install them with: + + sudo apt install \ + ffmpeg \ + libasound2-dev \ + libportaudio2 \ + libportaudiocpp0 \ + libpulse-dev \ + portaudio19-dev + To install the Python module in a virtual environment (replace `~/ve_pocketsphinx` with the virtual environment you wish to create), from the top level directory: From 1e2fd0b40e83fa9c3aeb73c6d3e993a96bb58d0a Mon Sep 17 00:00:00 2001 From: David Huggins-Daines Date: Fri, 10 Jan 2025 09:39:26 -0500 Subject: [PATCH 3/3] docs: also sox --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index eefc40a7b..c36ddf99a 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,9 @@ Raspberry Pi OS, Ubuntu, etc), you can install them with: libportaudio2 \ libportaudiocpp0 \ libpulse-dev \ - portaudio19-dev + libsox-fmt-all \ + portaudio19-dev \ + sox To install the Python module in a virtual environment (replace `~/ve_pocketsphinx` with the virtual environment you wish to create),