Clean repo and reorganise testing suite

.github/workflows/testing.yml

@@ -25,7 +25,7 @@ jobs:
 
       - name: Installing MBROLA
         run: |
-          sudo /bin/bash src/install.sh
+          sudo /bin/bash bin/install.sh
 
       - name: Testing with Pytest
         run: |

.gitignore

@@ -1,6 +1,6 @@
 # Byte-compiled / optimized / DLL files
 __pycache__/
-*.py[cod]
+*.py[codz]
 *$py.class
 
 # C extensions
@@ -21,16 +21,14 @@ sdist/
 var/
 wheels/
 share/python-wheels/
-/*.egg-info
-/*.egg-info
-src/*.egg-info
-
+/**/*.egg-info/
 .installed.cfg
+*.egg
 MANIFEST
 
 # PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+#   Usually these files are written by a python script from a template
+#   before PyInstaller builds the exe, so as to inject date/other infos into it.
 *.manifest
 *.spec
 
@@ -48,7 +46,7 @@ htmlcov/
 nosetests.xml
 coverage.xml
 *.cover
-*.py,cover
+*.py.cover
 .hypothesis/
 .pytest_cache/
 cover/
@@ -94,37 +92,64 @@ ipython_config.py
 #   However, in case of collaboration, if having platform-specific dependencies or dependencies
 #   having no cross-platform support, pipenv may install dependencies that don't work, or not
 #   install all needed dependencies.
-#Pipfile.lock
+# Pipfile.lock
+
+# UV
+#   Similar to Pipfile.lock, it is generally recommended to include uv.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+# uv.lock
 
 # poetry
 #   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
 #   This is especially recommended for binary packages to ensure reproducibility, and is more
 #   commonly ignored for libraries.
 #   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
-#poetry.lock
+# poetry.lock
+# poetry.toml
 
 # pdm
 #   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
-#pdm.lock
-#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
-#   in version control.
-#   https://pdm.fming.dev/latest/usage/project/#working-with-version-control
-.pdm.toml
+#   pdm recommends including project-wide configuration in pdm.toml, but excluding .pdm-python.
+#   https://pdm-project.org/en/latest/usage/project/#working-with-version-control
+# pdm.lock
+# pdm.toml
 .pdm-python
 .pdm-build/
 
+# pixi
+#   Similar to Pipfile.lock, it is generally recommended to include pixi.lock in version control.
+# pixi.lock
+#   Pixi creates a virtual environment in the .pixi directory, just like venv module creates one
+#   in the .venv directory. It is recommended not to include this directory in version control.
+.pixi
+
 # PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
 __pypackages__/
 
 # Celery stuff
 celerybeat-schedule
 celerybeat.pid
 
+# Redis
+*.rdb
+*.aof
+*.pid
+
+# RabbitMQ
+mnesia/
+rabbitmq/
+rabbitmq-data/
+
+# ActiveMQ
+activemq-data/
+
 # SageMath parsed files
 *.sage.py
 
 # Environments
 .env
+.envrc
 .venv
 env/
 venv/
@@ -157,17 +182,44 @@ dmypy.json
 cython_debug/
 
 # PyCharm
-#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
-#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
-#  and can be added to the global gitignore or merged into this file.  For a more nuclear
-#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
+#   JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#   be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#   and can be added to the global gitignore or merged into this file.  For a more nuclear
+#   option (not recommended) you can uncomment the following to ignore the entire idea folder.
+# .idea/
+
+# Abstra
+#   Abstra is an AI-powered process automation framework.
+#   Ignore directories containing user credentials, local state, and settings.
+#   Learn more at https://abstra.io/docs
+.abstra/
+
+# Visual Studio Code
+#   Visual Studio Code specific template is maintained in a separate VisualStudioCode.gitignore 
+#   that can be found at https://github.com/github/gitignore/blob/main/Global/VisualStudioCode.gitignore
+#   and can be added to the global gitignore or merged into this file. However, if you prefer, 
+#   you could uncomment the following to ignore the entire vscode folder
+# .vscode/
+
+# Ruff stuff:
+.ruff_cache/
+
+# PyPI configuration file
+.pypirc
+
+# Marimo
+marimo/_static/
+marimo/_lsp/
+__marimo__/
+
+# Streamlit
+.streamlit/secrets.toml
+
 
-voices/
+assets/
 /**/*.gz
 /**/*.tar
 /.ruff_cache
 /.benchmarks
 *.wav
-*.pho
-src/mbrola.egg-info/
+*.pho

.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+    "python.testing.pytestArgs": [
+        "tests"
+    ],
+    "python.testing.unittestEnabled": false,
+    "python.testing.pytestEnabled": true
+}

Dockerfile

@@ -2,7 +2,7 @@ FROM ubuntu:22.04
 WORKDIR /project
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y curl git build-essential gcc python3
-COPY mbrola/install.sh /install.sh 
+COPY bin/install.sh /install.sh 
 RUN git config --global core.compression 0
 RUN chmod +x /install.sh && /install.sh
 COPY mbrola/mbrola.py /project/

pyproject.toml

@@ -22,9 +22,7 @@ classifiers = [
   "Programming Language :: Python :: Implementation :: PyPy",
 ]
 
-dependencies = [
-    "pytest>=8.3.5",
-]
+dependencies = ["pytest>=8.3.5"]
 
 [project.urls]
 Documentation = "https://github.com/gongcastro/pymbrola#readme"
@@ -35,74 +33,36 @@ Source = "https://github.com/gongcastro/pymbrola"
 requires = ["setuptools>=78.1.0", "wheel>=0.45.1"]
 build-backend = "setuptools.build_meta"
 
+[tool.setuptools]
+package-dir = { "" = "src" }
+
+[tool.setuptools.packages.find]
+where = ["src"]
 
 [[tool.uv.index]]
 name = "pypi"
 url = "https://pypi.org/"
 publish-url = "https://pypi.org/"
 explicit = true
+package = true
 
-[tool.hatch.version]
-path = "src/__about__.py"
-
-[tool.hatch.envs.types]
-extra-dependencies = [
-  "mypy>=1.0.0",
-  "pytest",
-  "pytest-cov",
-  "pytest-watcher"
-]
-[[tool.hatch.envs.test.matrix]]
-python = ["3.10", "3.11"]
-
-[tool.hatch.envs.types.scripts]
-check = "mypy --install-types --non-interactive {args:src tests}"
 
 [tool.coverage.run]
-source_pkgs = ["src", "tests"]
+source_pkgs = ["src"]
 branch = true
 parallel = true
-omit = [
-  "src/__about__.py",
-]
-
-[tool.hatch.build]
-sources = ["src"]
+omit = ["src/__about__.py"]
 
-[tool.hatch.build.targets.sdist]
-exclude = [
-  "/.benchmarks",
-  "/.coverage",
-  "/.github",
-  "/.gitignore",
-  "/.python-version",
-  "/.ruff_cache",
-  "/.vscode",
-  "/Dockerfile",
-  "/docs",
-  "/tests",
-  "/uv.lock",
-  "/voices",
-]
 
 [tool.pytest.ini_options]
 addopts = "--maxfail=1 --cov=testing_demo"
 
 [tool.coverage.paths]
 pymbrola = ["src"]
-tests = ["tests", "*/pymbrola/tests"]
+tests = ["tests"]
 
 [tool.coverage.report]
-exclude_lines = [
-  "no cov",
-  "if __name__ == .__main__.:",
-  "if TYPE_CHECKING:",
-]
+exclude_lines = ["no cov", "if __name__ == .__main__.:", "if TYPE_CHECKING:"]
 
 [dependency-groups]
-dev = [
-    "hatch>=1.14.1",
-    "pytest>=8.3.5",
-    "pytest-cov>=5.0.0",
-    "ruff>=0.12.9",
-]
+dev = ["pytest>=8.3.5", "pytest-cov>=5.0.0", "ruff>=0.12.9"]

src/mbrola.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mbrola
-Version: 0.2.1
+Version: 0.2.2
 Summary: A Python front-end for the MBROLA speech synthesizer
 Author-email: Gonzalo Garcia-Castro <gongarciacastro@gmail.com>
 License-Expression: MIT

src/mbrola.egg-info/SOURCES.txt

@@ -9,5 +9,4 @@ src/mbrola.egg-info/SOURCES.txt
 src/mbrola.egg-info/dependency_links.txt
 src/mbrola.egg-info/requires.txt
 src/mbrola.egg-info/top_level.txt
-tests/test_mbrola.py
-tests/test_validations.py
+tests/test_mbrola.py