Skip to content

Commit 1f14693

Browse files
dhdainesdhdaines
authored
Merge pull request #373 from cmusphinx/release_503
Release 5.0.3
2 parents ec579bc + a61741c commit 1f14693

14 files changed

+48
-31
lines changed

‎.github/dependabot.yml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"

‎.github/workflows/build_wheels.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Build
22
on:
33
push:
44
branches:
5-
master
5+
- master
66
workflow_dispatch:
77

88
jobs:
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515

1616
- name: Build SDist
1717
run: pipx run build --sdist
@@ -25,14 +25,14 @@ jobs:
2525
runs-on: ${{ matrix.os }}
2626
strategy:
2727
matrix:
28-
os: [ubuntu-22.04, windows-2019, macos-11]
28+
os: [ubuntu-latest, windows-latest, macos-latest]
2929

3030
steps:
3131
- name: Checkout
32-
uses: actions/checkout@v3
32+
uses: actions/checkout@v4
3333

3434
- name: Build wheels
35-
uses: pypa/cibuildwheel@v2.12.3
35+
uses: pypa/cibuildwheel@v2.16.2
3636

3737
- name: Upload
3838
uses: actions/upload-artifact@v3

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ CMakeFiles
1212
CTestTestfile.cmake
1313
DartConfiguration.tcl
1414
cmake_install.cmake
15-
15+
venv/
1616
.tox

‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.14) # I like pie
22

3-
project(PocketSphinx VERSION 5.0.2
3+
project(PocketSphinx VERSION 5.0.3
44
DESCRIPTION "A small speech recognizer"
55
HOMEPAGE_URL "https://github.com/cmusphinx/pocketsphinx"
66
LANGUAGES C)

‎Dockerfile

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
FROM alpine:latest as runtime
2-
RUN apk add --no-cache python3 py3-pip sox
2+
RUN apk add --no-cache python3 py3-pip sox portaudio alsa-utils alsaconf
33

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

18-
RUN adduser -u 1000 -DHD pocketsphinx && adduser pocketsphinx audio
1918
COPY examples/ /work/examples/
20-
RUN chown -R pocketsphinx:pocketsphinx /work
21-
USER pocketsphinx
2219
WORKDIR /work

‎MANIFEST.in

+1
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,4 @@ recursive-exclude * *.DS_Store
4545
recursive-exclude * __pycache__
4646
recursive-exclude * *.so
4747
recursive-exclude * *.egg-info
48+
recursive-exclude venv *

‎NEWS

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
PocketSphinx 5.0.0
1+
PocketSphinx 5.0.3
22
^^^^^^^^^^^^^^^^^^
33

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

68
Pocketsphinx 0.8
79
^^^^^^^^^^^^^^^^

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
PocketSphinx 5.0.2
1+
PocketSphinx 5.0.3
22
==================
33

44
This is PocketSphinx, one of Carnegie Mellon University's open source large

‎cython/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
PocketSphinx 5.0.2
1+
PocketSphinx 5.0.3
22
==================
33

44
This is PocketSphinx, one of Carnegie Mellon University's open source large

‎docs/source/conf.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
# -- Project information -----------------------------------------------------
1919

2020
project = 'PocketSphinx'
21-
copyright = '2022, David Huggins-Daines'
21+
copyright = '2023, David Huggins-Daines'
2222
author = 'David Huggins-Daines'
2323

2424
# The full version, including alpha/beta/rc tags
25-
release = '5.0.2'
25+
release = '5.0.3'
2626

2727

2828
# -- General configuration ---------------------------------------------------

‎doxygen/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
find_package(Doxygen)
22
if(DOXYGEN_FOUND)
3-
set(DOXYGEN_PROJECT_NUMBER 5.0.2)
3+
set(DOXYGEN_PROJECT_NUMBER 5.0.3)
44
set(DOXYGEN_EXAMPLE_PATH ${CMAKE_SOURCE_DIR}/examples)
55
set(DOXYGEN_SORT_MEMBER_DOCS NO)
66
set(DOXYGEN_USE_MATHJAX YES)

‎include/pocketsphinx.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1095,8 +1095,8 @@ void ps_get_all_time(ps_decoder_t *ps, double *out_nspeech,
10951095
/**
10961096
* @mainpage PocketSphinx API Documentation
10971097
* @author David Huggins-Daines <[email protected]>
1098-
* @version 5.0.2
1099-
* @date July 31, 2023
1098+
* @version 5.0.3
1099+
* @date December 28, 2023
11001100
*
11011101
* @tableofcontents{HTML:1}
11021102
*

‎programs/pocketsphinx_main.c

+2
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,7 @@ output_hyp(ps_endpointer_t *ep, ps_decoder_t *decoder, ps_alignment_t *alignment
338338
--maxlen;
339339
*ptr = '\0';
340340
puts(hyp_json);
341+
fflush(stdout);
341342
ckd_free(hyp_json);
342343
}
343344

@@ -716,6 +717,7 @@ print_config(ps_config_t *config)
716717
{
717718
if (puts(ps_config_serialize_json(config)) < 0)
718719
return -1;
720+
fflush(stdout);
719721
return 0;
720722
}
721723

‎pyproject.toml

+19-10
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@ authors = [
1414
{name = "David Huggins-Daines", email = "[email protected]"}
1515
]
1616
keywords = ["asr", "speech"]
17+
dependencies = ["sounddevice"]
1718
classifiers = [
1819
"Development Status :: 6 - Mature",
1920
"Programming Language :: C",
21+
"Programming Language :: Cython",
2022
"Programming Language :: Python :: 3",
2123
"Programming Language :: Python :: 3.8",
2224
"Programming Language :: Python :: 3.9",
@@ -25,6 +27,7 @@ classifiers = [
2527
"Programming Language :: Python :: 3.12",
2628
"License :: OSI Approved :: BSD License",
2729
"Operating System :: OS Independent",
30+
"Topic :: Multimedia :: Sound/Audio :: Speech",
2831
]
2932

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

3639
[tool.cibuildwheel]
37-
# Build the versions found in Ubuntu LTS, the stable PyPy, and 3.10
38-
# everywhere else
40+
# Build a reduced selection of binaries as there are tons of them
3941
build = [
40-
"pp38*",
41-
"cp36-manylinux_*",
42-
"cp38-manylinux_*",
42+
"pp310*",
43+
"cp38-*",
4344
"cp310-*",
44-
"cp311-*"
45+
"cp311-*",
46+
"cp312-*",
4547
]
46-
# PyPy 3.8 will choke on CPython 3.8 build leftovers...
47-
before-build = "rm -rf _skbuild"
48-
# PyPy builds are broken on Windows, and skip 32-bit and musl
49-
skip = ["*musl*", "*_i686", "*-win32", "pp*win*"]
48+
# Build only universal wheels for Mac where possible, and skip 32-bit
49+
# builds to avoid building a gigabyte of stuff all the time
50+
skip = [
51+
"cp*-macosx_x86_64",
52+
"cp*-macosx_arm64",
53+
"*_i686",
54+
"*-win32",
55+
]
56+
57+
[tool.cibuildwheel.macos]
58+
archs = ["x86_64", "universal2", "arm64"]
5059

5160
[tool.isort]
5261
profile = "black"

0 commit comments

Comments
 (0)