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

Prep 2.0.3 release #98

Merged
merged 34 commits into from
Mar 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
67df28d
removed the link to the mailing group
DerMoehre Sep 29, 2022
c64c392
added a bug reporting form
DerMoehre Sep 30, 2022
72ce0a9
added a link to the bug report form
DerMoehre Sep 30, 2022
3b60932
added a description of bug triage
DerMoehre Sep 30, 2022
d216d04
added the changes to the bug report and readme
DerMoehre Oct 1, 2022
9edc8db
deleted .code-workspace
DerMoehre Oct 2, 2022
a81a9ae
Delete Documents.code-workspace
DerMoehre Oct 2, 2022
e64bc84
added the test_readFile and updated the code in read_transcription_fi…
DerMoehre Oct 3, 2022
15695a1
added the requested changes
DerMoehre Oct 5, 2022
1a59217
Delete test.csv
DerMoehre Oct 3, 2022
6b1db43
changes in the transcriptprocessor file
DerMoehre Oct 5, 2022
b436767
added the requested changes
DerMoehre Oct 5, 2022
a033a73
typo correction
DerMoehre Oct 6, 2022
ece4172
added license and python badge
DerMoehre Oct 9, 2022
ebb50ca
Update deps, expand author info in toml
chrisbrickhouse Aug 18, 2022
f0fd95b
Docs: write migration guide and doc updates
chrisbrickhouse Aug 23, 2022
82bb8d3
Add cmu_dict... test and fix write error
Aug 18, 2022
5dd8cb5
Fix unintended overwrite of add_dict
Aug 18, 2022
61b412a
fixing a copy-paste error from elsewhere
JoFrhwld Aug 11, 2022
caddbb5
fixing the tqdm pbar update
JoFrhwld Aug 11, 2022
6835835
ipa column
JoFrhwld Aug 11, 2022
e86791f
aeh to ae:
JoFrhwld Aug 11, 2022
811e3ce
added a test for extractFormants
DerMoehre Oct 9, 2022
0b346bb
mean_stdv should ignore None or np.NAN
JoFrhwld Oct 10, 2022
af94438
Handle TSVs with header rows
DerMoehre Oct 6, 2022
33a509c
Revert "added a test for extractFormants"
DerMoehre Oct 10, 2022
99e533c
added shields badges for PyPI and DOI
DerMoehre Oct 10, 2022
f19293b
mean_stdv ignores None
DerMoehre Oct 11, 2022
6049041
changed mean_stdv() to numpy
DerMoehre Oct 17, 2022
036094d
Workflows install and cache dependencies, use poetry (#83)
chrisbrickhouse Oct 17, 2022
0e6e9a1
Revert "Workflows install and cache dependencies, use poetry (#83)" (…
chrisbrickhouse Oct 18, 2022
1549eef
Update pyproject.toml and poetry.lock
chrisbrickhouse Oct 18, 2022
6e6d7ab
Update workflows to use poetry to install deps
chrisbrickhouse Oct 18, 2022
1206522
Fix workflow syntax error
chrisbrickhouse Oct 19, 2022
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
40 changes: 40 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: Bug Report
description: The software does something unwanted or unusual
title: "[BUG]: "
labels: ["bug"]

body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this bug report!
- type: checkboxes
id: new-bug
attributes:
label: Did you search for similar bugs?
description: Please search to see if an issue already exists for the bug you encountered.
options:
- label: I have searched the existing issues
required: false
- type: textarea
id: bug-description
attributes:
label: What happened?
description: Tell us what bug you encountered
validations:
required: true
- type: textarea
id: bug-behaviour
attributes:
label: Expectations?
description: Tell us what should have happened
validations:
required: true
- type: textarea
id: steps-to-reproduce
attributes:
label: Steps To Reproduce
description: Can you describe your steps, when you encountered the bug?
placeholder: Please write the steps in a list form
validations:
required: false
14 changes: 9 additions & 5 deletions .github/workflows/test-and-run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,24 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- name: Install poetry
run: pipx install poetry
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v3
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
cache: 'poetry'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install flake8 pytest
poetry env use "${{ matrix.python-version }}"
poetry install
- name: Lint with flake8
run: |
# stop the build if there are Python syntax errors or undefined names
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
poetry run flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
poetry run flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
- name: Test with pytest
run: |
python -m pytest tests/
poetry run pytest tests/
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
*.wav
build/*
docs/_build
*.code-workspace
*.swp
*.orig
env
Expand Down
10 changes: 8 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,16 @@ You can find user support for installing and using the FAVE toolkits at the [FAV
## Contributing to FAVE
For the most part, we'll be utilizing the fork-and-pull paradigm (see [Using Pull Requests](https://help.github.com/articles/using-pull-requests)). Please send pull requests to the `dev` branch.

If you want to keep up to date on FAVE development, or have questions about FAVE development, send a request to join the [FAVE Developers' Group](https://groups.google.com/forum/#!forum/fave-dev).
You can fill in a bug report at the [issue tab](https://github.com/JoFrhwld/FAVE/issues)

There may be a delay between when a bug is reported and when a bug is resolved. Developers prioritize bugs based on difficulty, importance, and other factors, so bug reports are usually not handled in the order they are received.

## Attribution
[![DOI](https://zenodo.org/badge/doi/10.5281/zenodo.22281.svg)](http://dx.doi.org/10.5281/zenodo.22281)
[![DOI](https://zenodo.org/badge/13744621.svg)](https://zenodo.org/badge/latestdoi/13744621)
![GitHub](https://img.shields.io/github/license/JoFrhwld/FAVE)
![GitHub](https://img.shields.io/badge/Python-3.8%2B-brightgreen)
[![PyPI version fury.io](https://badge.fury.io/py/fave.svg)](https://pypi.python.org/pypi/fave/)

As of v1.1.3 onwards, releases from this repository will have a DOI associated with them through Zenodo. The DOI for the current release is [10.5281/zenodo.22281](http://dx.doi.org/10.5281/zenodo.22281). We would recommend the citation:

Rosenfelder, Ingrid; Fruehwald, Josef; Brickhouse, Christian; Evanini, Keelan; Seyfarth, Scott; Gorman, Kyle; Prichard, Hilary; Yuan, Jiahong; 2022. FAVE (Forced Alignment and Vowel Extraction) Program Suite v2.0.0 */zenodo.*
Expand Down
Binary file modified docs/_build/doctrees/code/align/aligner.doctree
Binary file not shown.
Binary file modified docs/_build/doctrees/code/align/index.doctree
Binary file not shown.
Binary file modified docs/_build/doctrees/code/align/transcriptprocessor.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/code/aligner.doctree
Binary file not shown.
Binary file modified docs/_build/doctrees/code/cmudictionary.doctree
Binary file not shown.
Binary file modified docs/_build/doctrees/code/extract/esps.doctree
Binary file not shown.
Binary file modified docs/_build/doctrees/code/extract/index.doctree
Binary file not shown.
Binary file modified docs/_build/doctrees/code/extract/mahalanobis.doctree
Binary file not shown.
Binary file modified docs/_build/doctrees/code/extract/plotnik.doctree
Binary file not shown.
Binary file modified docs/_build/doctrees/code/extract/remeasure.doctree
Binary file not shown.
Binary file modified docs/_build/doctrees/code/extract/vowel.doctree
Binary file not shown.
Binary file modified docs/_build/doctrees/code/praat.doctree
Binary file not shown.
Binary file not shown.
Binary file modified docs/_build/doctrees/environment.pickle
Binary file not shown.
Binary file modified docs/_build/doctrees/index.doctree
Binary file not shown.
Binary file modified docs/_build/doctrees/usage/installation.doctree
Binary file not shown.
Binary file modified docs/_build/doctrees/usage/quickstart.doctree
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/_build/html/.buildinfo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: 95450042ea89bddbb1481c62b8e92e75
config: a9e501948c645bf032c7e86e32c92cb5
tags: 645f666f9bcd5a90fca523b33c5a78b7
5 changes: 0 additions & 5 deletions docs/_build/html/_sources/code/aligner.rst.txt

This file was deleted.

5 changes: 0 additions & 5 deletions docs/_build/html/_sources/code/transcriptprocessor.rst.txt

This file was deleted.

20 changes: 10 additions & 10 deletions docs/_build/html/_sources/index.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@
Forced Alignment and Vowel Extraction (FAVE)
============================================

Welcome to the FAVE documentation
This website documents the FAVE software, version 2.

.. warning::
If you have used FAVE before, please read :doc:`usage/whats-new` to familiarize yourself with the differences between the current and legacy versions of FAVE.

Guides and documentation
------------------------
.. toctree::
:maxdepth: 2

Installing FAVE <usage/installation>
Quickstart guide <usage/quickstart>
fave.align module <code/align/index>
fave.extract module <code/extract/index>
code/cmudictionary
code/praat

usage/index
code/index

Indices and tables
==================
Indices
-------

* :ref:`genindex`
* :ref:`modindex`
Expand Down
29 changes: 26 additions & 3 deletions docs/_build/html/_sources/usage/installation.rst.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,27 @@
Installing FAVE 2.0
===================
Installing FAVE 2
=================

To be created
Required software
-----------------

FAVE sometimes requires other software libraries in order to work.
* FAVE-align requires `SoX <http://sox.sourceforge.net/>`_ and `HTK <https://htk.eng.cam.ac.uk/>`_.
* FAVE-extract requires `Praat <https://www.fon.hum.uva.nl/praat/>`_.

You will need to manually install these if they are not already installed on your computer.

.. warning::
Mac users: HTK might need slight modification before it works. See `this bug report <https://github.com/JoFrhwld/FAVE/issues/48>`_.

Install with PIP
----------------

FAVE is available on the Python Package Index (PyPI) as ``fave``. You can install it using:

.. code-block:: console

python3 -m pip install fave

Other package managers
^^^^^^^^^^^^^^^^^^^^^^
Work is ongoing to publish FAVE as a debian package, but no other package system is supported at the moment. If you would like to package FAVE for your system, please feel free to :doc:`contribute <../contributing>`!
22 changes: 21 additions & 1 deletion docs/_build/html/_sources/usage/quickstart.rst.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,24 @@
Quickstart guide to using FAVE 2.0
==================================

To be created
#. Install FAVE and its dependencies according to :doc:`the directions <installation>`.
#. Download the ``FAAValign.py`` and ``extractFormants.py`` scripts.
#. Check your transcription for out-of-dictionary words

.. code-block:: console
:caption: Check for out-of-dictionary words

python3 FAAValign.py --check unknown_words.txt AudioFile.wav TranscriptionFile.txt OutputAlignment.TextGrid
#. Open ``unknown_words.txt`` and create a transcription for each word listed.
#. Align your audio and transcripts including your new transcriptions:

.. code-block:: console
:caption: Begin forced alignment

python3 FAAValign.py --import custom_dictionary.txt AudioFile.wav TranscriptionFile.txt OutputAlignment.TextGrid
#. Extract formant data using the default settings:

.. code-block:: console
:caption: Extract formant data

python3 extractFormants.py AudioFile.wav Alignment.TextGrid OutputFileName.tsv
Loading
Loading