Merge pull request #38 from Forced-Alignment-and-Vowel-Extraction/dev

v1.0.2

.github/workflows/build-docs.yml

@@ -26,7 +26,7 @@ jobs:
                 installer-parallel: true
             - name: Load cached venv
               id: cached-poetry-dependencies
-              uses: actions/cache@v3
+              uses: actions/cache@v4
               with:
                 path: .venv
                 key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}     

.github/workflows/test-and-run.yml

@@ -37,7 +37,7 @@ jobs:
         installer-parallel: true
     - name: Load cached venv
       id: cached-poetry-dependencies
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: .venv
         key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}        

README.md

@@ -1,6 +1,6 @@
 # new-fave
 
-![PyPI](https://img.shields.io/pypi/v/new-fave.png) [![Python CI](https://github.com/Forced-Alignment-and-Vowel-Extraction/new-fave/actions/workflows/test-and-run.yml/badge.svg)](https://github.com/Forced-Alignment-and-Vowel-Extraction/new-fave/actions/workflows/test-and-run.yml) [![codecov](https://codecov.io/gh/Forced-Alignment-and-Vowel-Extraction/new-fave/graph/badge.svg?token=8JRGOB9NMN)](https://codecov.io/gh/Forced-Alignment-and-Vowel-Extraction/new-fave) [![Maintainability](https://api.codeclimate.com/v1/badges/2f00920067765c0ad77f/maintainability)](https://codeclimate.com/github/Forced-Alignment-and-Vowel-Extraction/new-fave/maintainability) [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
+![PyPI](https://img.shields.io/pypi/v/new-fave.png) ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/fasttrackpy) [![Python CI](https://github.com/Forced-Alignment-and-Vowel-Extraction/new-fave/actions/workflows/test-and-run.yml/badge.svg)](https://github.com/Forced-Alignment-and-Vowel-Extraction/new-fave/actions/workflows/test-and-run.yml) [![codecov](https://codecov.io/gh/Forced-Alignment-and-Vowel-Extraction/new-fave/graph/badge.svg?token=8JRGOB9NMN)](https://codecov.io/gh/Forced-Alignment-and-Vowel-Extraction/new-fave) [![Maintainability](https://api.codeclimate.com/v1/badges/2f00920067765c0ad77f/maintainability)](https://codeclimate.com/github/Forced-Alignment-and-Vowel-Extraction/new-fave/maintainability) [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 
 ## What is `new-fave`?
 

docs/index.qmd

@@ -4,7 +4,7 @@ date-modified: today
 ---
 
 
-![PyPI](https://img.shields.io/pypi/v/new-fave.png) [![Python CI](https://github.com/Forced-Alignment-and-Vowel-Extraction/new-fave/actions/workflows/test-and-run.yml/badge.svg)](https://github.com/Forced-Alignment-and-Vowel-Extraction/new-fave/actions/workflows/test-and-run.yml) [![codecov](https://codecov.io/gh/Forced-Alignment-and-Vowel-Extraction/new-fave/graph/badge.svg?token=8JRGOB9NMN)](https://codecov.io/gh/Forced-Alignment-and-Vowel-Extraction/new-fave) [![Maintainability](https://api.codeclimate.com/v1/badges/2f00920067765c0ad77f/maintainability)](https://codeclimate.com/github/Forced-Alignment-and-Vowel-Extraction/new-fave/maintainability) [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
+![PyPI](https://img.shields.io/pypi/v/new-fave.png) ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/fasttrackpy) [![Python CI](https://github.com/Forced-Alignment-and-Vowel-Extraction/new-fave/actions/workflows/test-and-run.yml/badge.svg)](https://github.com/Forced-Alignment-and-Vowel-Extraction/new-fave/actions/workflows/test-and-run.yml) [![codecov](https://codecov.io/gh/Forced-Alignment-and-Vowel-Extraction/new-fave/graph/badge.svg?token=8JRGOB9NMN)](https://codecov.io/gh/Forced-Alignment-and-Vowel-Extraction/new-fave) [![Maintainability](https://api.codeclimate.com/v1/badges/2f00920067765c0ad77f/maintainability)](https://codeclimate.com/github/Forced-Alignment-and-Vowel-Extraction/new-fave/maintainability) [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 
 ## Where to go:
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "new-fave"
-version = "1.0.1"
+version = "1.0.2"
 description = "New Vowel Extraction Suite"
 authors = ["JoFrhwld <[email protected]>"]
 license = "GPLv3"
@@ -28,6 +28,7 @@ scipy = "^1.13.1"
 cloudpickle = "^3.0.0"
 nptyping = "^2.5.0"
 librosa = "^0.10.2.post1"
+toml = "^0.10.2"
 
 
 [tool.poetry.group.docs.dependencies]

src/new_fave/__init__.py

@@ -10,8 +10,17 @@
 
 from importlib.metadata import version
 
-# this is bugged for testing
-#__version__ = version("new_fave")
+from pathlib import Path
+import toml
+
+__version__ = "unknown"
+# adopt path to your pyproject.toml
+pyproject_toml_file = Path(__file__).parent.parent.parent / "pyproject.toml"
+if pyproject_toml_file.exists() and pyproject_toml_file.is_file():
+    data = toml.load(pyproject_toml_file)
+    # check project.version
+    if "tool" in data and "poetry" in data["tool"] and "version" in data["tool"]["poetry"]:
+        __version__ = data["tool"]["poetry"]["version"]
 
 __all__ = [
     "VowelMeasurement", 

src/new_fave/extract.py

@@ -52,7 +52,7 @@
 def ask(message: str) -> bool:
     response = click.confirm(
         f"{message}",
-        default=True
+        default=False
     )
     return response
 

tests/test_version.py

@@ -0,0 +1,18 @@
+from pathlib import Path
+import toml
+import new_fave
+
+def test_version():
+    pyproject_toml_file = Path(__file__).parent.parent / "pyproject.toml"
+    toml_v = "unknown"
+    if pyproject_toml_file.exists() and pyproject_toml_file.is_file():
+        data = toml.load(pyproject_toml_file)
+        # check project.version
+        if "project" in data and "version" in data["project"]:
+            toml_v = data["project"]["version"]
+        # check tool.poetry.version
+        elif "tool" in data and "poetry" in data["tool"] and "version" in data["tool"]["poetry"]:
+            toml_v = data["tool"]["poetry"]["version"]
+
+    assert new_fave.__version__ == toml_v
+