Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 5.0.3 #373

Merged
merged 8 commits into from
Dec 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
10 changes: 5 additions & 5 deletions .github/workflows/build_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Build
on:
push:
branches:
master
- master
workflow_dispatch:

jobs:
Expand All @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Build SDist
run: pipx run build --sdist
Expand All @@ -25,14 +25,14 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-22.04, windows-2019, macos-11]
os: [ubuntu-latest, windows-latest, macos-latest]

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Build wheels
uses: pypa/cibuildwheel@v2.12.3
uses: pypa/cibuildwheel@v2.16.2

- name: Upload
uses: actions/upload-artifact@v3
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ CMakeFiles
CTestTestfile.cmake
DartConfiguration.tcl
cmake_install.cmake

venv/
.tox
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.14) # I like pie

project(PocketSphinx VERSION 5.0.2
project(PocketSphinx VERSION 5.0.3
DESCRIPTION "A small speech recognizer"
HOMEPAGE_URL "https://github.com/cmusphinx/pocketsphinx"
LANGUAGES C)
Expand Down
7 changes: 2 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM alpine:latest as runtime
RUN apk add --no-cache python3 py3-pip sox
RUN apk add --no-cache python3 py3-pip sox portaudio alsa-utils alsaconf

FROM runtime as build
RUN apk add --no-cache cmake ninja gcc musl-dev python3-dev pkgconfig
Expand All @@ -13,10 +13,7 @@ RUN CMAKE_ARGS="-DUSE_INSTALLED_POCKETSPHINX=ON" pip wheel -v .
FROM runtime
COPY --from=build /usr/local/ /usr/local/
COPY --from=build /pocketsphinx/*.whl /
RUN pip install /*.whl && rm /*.whl
RUN pip install --break-system-packages /*.whl && rm /*.whl

RUN adduser -u 1000 -DHD pocketsphinx && adduser pocketsphinx audio
COPY examples/ /work/examples/
RUN chown -R pocketsphinx:pocketsphinx /work
USER pocketsphinx
WORKDIR /work
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,4 @@ recursive-exclude * *.DS_Store
recursive-exclude * __pycache__
recursive-exclude * *.so
recursive-exclude * *.egg-info
recursive-exclude venv *
6 changes: 4 additions & 2 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
PocketSphinx 5.0.0
PocketSphinx 5.0.3
^^^^^^^^^^^^^^^^^^

Not released yet!
The NEWS file has not been updated for some time. See the GitHub
releases page at https://github.com/cmusphinx/pocketsphinx/releases
instead.

Pocketsphinx 0.8
^^^^^^^^^^^^^^^^
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PocketSphinx 5.0.2
PocketSphinx 5.0.3
==================

This is PocketSphinx, one of Carnegie Mellon University's open source large
Expand Down
2 changes: 1 addition & 1 deletion cython/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PocketSphinx 5.0.2
PocketSphinx 5.0.3
==================

This is PocketSphinx, one of Carnegie Mellon University's open source large
Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
# -- Project information -----------------------------------------------------

project = 'PocketSphinx'
copyright = '2022, David Huggins-Daines'
copyright = '2023, David Huggins-Daines'
author = 'David Huggins-Daines'

# The full version, including alpha/beta/rc tags
release = '5.0.2'
release = '5.0.3'


# -- General configuration ---------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion doxygen/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
find_package(Doxygen)
if(DOXYGEN_FOUND)
set(DOXYGEN_PROJECT_NUMBER 5.0.2)
set(DOXYGEN_PROJECT_NUMBER 5.0.3)
set(DOXYGEN_EXAMPLE_PATH ${CMAKE_SOURCE_DIR}/examples)
set(DOXYGEN_SORT_MEMBER_DOCS NO)
set(DOXYGEN_USE_MATHJAX YES)
Expand Down
4 changes: 2 additions & 2 deletions include/pocketsphinx.h
Original file line number Diff line number Diff line change
Expand Up @@ -1095,8 +1095,8 @@ void ps_get_all_time(ps_decoder_t *ps, double *out_nspeech,
/**
* @mainpage PocketSphinx API Documentation
* @author David Huggins-Daines <[email protected]>
* @version 5.0.2
* @date July 31, 2023
* @version 5.0.3
* @date December 28, 2023
*
* @tableofcontents{HTML:1}
*
Expand Down
2 changes: 2 additions & 0 deletions programs/pocketsphinx_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,7 @@ output_hyp(ps_endpointer_t *ep, ps_decoder_t *decoder, ps_alignment_t *alignment
--maxlen;
*ptr = '\0';
puts(hyp_json);
fflush(stdout);
ckd_free(hyp_json);
}

Expand Down Expand Up @@ -716,6 +717,7 @@ print_config(ps_config_t *config)
{
if (puts(ps_config_serialize_json(config)) < 0)
return -1;
fflush(stdout);
return 0;
}

Expand Down
29 changes: 19 additions & 10 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@ authors = [
{name = "David Huggins-Daines", email = "[email protected]"}
]
keywords = ["asr", "speech"]
dependencies = ["sounddevice"]
classifiers = [
"Development Status :: 6 - Mature",
"Programming Language :: C",
"Programming Language :: Cython",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
Expand All @@ -25,6 +27,7 @@ classifiers = [
"Programming Language :: Python :: 3.12",
"License :: OSI Approved :: BSD License",
"Operating System :: OS Independent",
"Topic :: Multimedia :: Sound/Audio :: Speech",
]

[project.urls]
Expand All @@ -34,19 +37,25 @@ Repository = "https://github.com/cmusphinx/pocketsphinx.git"
Issues = "https://github.com/cmusphinx/pocketsphinx/issues"

[tool.cibuildwheel]
# Build the versions found in Ubuntu LTS, the stable PyPy, and 3.10
# everywhere else
# Build a reduced selection of binaries as there are tons of them
build = [
"pp38*",
"cp36-manylinux_*",
"cp38-manylinux_*",
"pp310*",
"cp38-*",
"cp310-*",
"cp311-*"
"cp311-*",
"cp312-*",
]
# PyPy 3.8 will choke on CPython 3.8 build leftovers...
before-build = "rm -rf _skbuild"
# PyPy builds are broken on Windows, and skip 32-bit and musl
skip = ["*musl*", "*_i686", "*-win32", "pp*win*"]
# Build only universal wheels for Mac where possible, and skip 32-bit
# builds to avoid building a gigabyte of stuff all the time
skip = [
"cp*-macosx_x86_64",
"cp*-macosx_arm64",
"*_i686",
"*-win32",
]

[tool.cibuildwheel.macos]
archs = ["x86_64", "universal2", "arm64"]

[tool.isort]
profile = "black"
Expand Down