Skip to content

Commit

Permalink
Merge pull request #27 from maetshju/update/rm_mfcc_module
Browse files Browse the repository at this point in the history
Remove MFCC submodule and depend on package
  • Loading branch information
maetshju authored Nov 19, 2022
2 parents dc0e8c5 + df6fbd4 commit ead297d
Show file tree
Hide file tree
Showing 16 changed files with 7 additions and 907 deletions.
6 changes: 3 additions & 3 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "Phonetics"
uuid = "e3a49ea3-7edf-49e1-b84f-839ab305a372"
authors = ["Matthew C. Kelley <[email protected]"]
version = "0.1.1"
version = "0.1.2"

[deps]
DSP = "717857b8-e6f2-59f4-9121-6e50c889abd2"
Expand All @@ -15,8 +15,8 @@ DynamicAxisWarping = "aaaaaaaa-4a10-5553-b683-e707b00e83ce"
FFTW = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341"
FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
GeometricalPredicates = "fd0ad045-b25c-564e-8f9c-8ef5c5f21267"
HDF5 = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
MFCC = "ca7b5df7-6146-5dcc-89ec-36256279a339"
Measures = "442fdcdd-2543-5da2-b0f3-8c86c306513e"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
ProgressBars = "49802e3a-d2f1-5c88-81d8-b72133a6f568"
Expand All @@ -39,7 +39,6 @@ DynamicAxisWarping = "0.4"
FFTW = "1.5"
FileIO = "1.16"
GeometricalPredicates = "0.4"
HDF5 = "0.16"
Measures = "0.3"
Plots = "1.33 - 1.35, 1"
ProgressBars = "1.4"
Expand All @@ -48,6 +47,7 @@ QHull = "0.2"
SpecialFunctions = "2.1"
StatsBase = "0.33"
WAV = "1.2"
MFCC = "0.3.3"
julia = "1.6 - 1.8"

[extras]
Expand Down
9 changes: 2 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,11 @@

[![docs](https://img.shields.io/badge/docs-release-green)](https://maetshju.github.io/Phonetics.jl)

[![DOI](https://zenodo.org/badge/267223711.svg)](https://zenodo.org/badge/latestdoi/267223711) (links to Zenodo DOI for each tagged version from v0.1.1 on for archival and referencing purposes; see license for copyright statement and repo ownership)
[![DOI](https://zenodo.org/badge/267223711.svg)](https://zenodo.org/badge/latestdoi/267223711)
(links to Zenodo DOI for each tagged version from v0.1.1 on for archival and referencing purposes; see license for copyright statement and repo ownership)

<img src="imgs/logo.svg" width="150" alt="Phonetics.jl logo: A capital P with a sine wave traveling through it">

Currently under development. Some function interfaces may break from time to time while in early releases.

Please note that the MFCC module is effectively a simple static link to the source code from [MFCC.jl v0.3.2](https://github.com/JuliaDSP/MFCC.jl), which is permitted under the BSD-2 license it was conveyed under. It has only been trivially modified to work with newer versions of `HDF5.jl` and to work as a statically linked library. The licenses for that code by itself are provided within the `src/MFCC` and `test/MFCC` folders. If you use the MFCC module itself from `Phonetics.jl` in your own work, please make sure to give credit as appropriate to David A. van Leeuwen, according to the license in the MFCC module folder.

The license for the `Phonetics.jl` project as a whole is given in the `LICENSE.txt` file in the root folder. Please note that statically including the `MFCC.jl` code is currently intended as a stopgap while version compatiblity is resolved in `MFCC.jl` so that dynamic linking of it via the package manager can be retinroduced.

`Phonetics.jl` can be installed with

```julia
Expand Down
21 changes: 0 additions & 21 deletions src/MFCC/LICENSE

This file was deleted.

24 changes: 0 additions & 24 deletions src/MFCC/MFCC.jl

This file was deleted.

176 changes: 0 additions & 176 deletions src/MFCC/feacalc.jl

This file was deleted.

93 changes: 0 additions & 93 deletions src/MFCC/io.jl

This file was deleted.

Loading

2 comments on commit ead297d

@maetshju
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/72524

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.1.2 -m "<description of version>" ead297dd33c55a5320758962c4d96ece4293a57a
git push origin v0.1.2

Please sign in to comment.