diff --git a/pyproject.toml b/pyproject.toml index aa7159f..a82ebde 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,25 +2,27 @@ requires = ["flit_core >=2,<4"] build-backend = "flit_core.buildapi" -[tool.flit.metadata] - -author = "Mark Lillibridge" -author-email = "mdl@alum.mit.edu" -maintainer = "Quintijn Hoogenboom" -maintainer-email = "q.hoogenboom@antenna.nl" -home-page = "http://vocola.net/v2/" -description-file = "README.md" -module="vocola2" -requires=["dtactions>=1.5.7"] - +[project] +version = '3.1.7.dev1' +authors = [{name = "Mark Lillibridge", email = "mdl@alum.mit.edu"}] +name = "vocola2" +readme = "README.md" classifiers=[ "Development Status :: 4 - Beta", "Topic :: Multimedia :: Sound/Audio :: Speech", - "Topic :: Scientific/Engineering :: Human Machine Interfaces", - ] + "Topic :: Scientific/Engineering :: Human Machine Interfaces"] + +description = "Vocola2 (for Natlink)" requires-python = ">=3.8" -keywords="dragon,speech,dictation,dictation-toolbox,unimacro,natlink" +keywords=["dragon","speech","dictation","dictation-toolbox","natlink", "dtactions"] + +dependencies = ["dtactions == 1.6.4.dev3", + "natlinkcore >= 5.4.1"] + -[tool.flit.scripts] +[project.urls] +homepage = "https://vocola.net/v2/" +repository="https://github.com/dictation-toolbox/vocola2" +source="https://github.com/dictation-toolbox/vocola2" \ No newline at end of file diff --git a/src/vocola2/VocolaUtils.py b/src/vocola2/VocolaUtils.py index 2cda1e6..dac7120 100644 --- a/src/vocola2/VocolaUtils.py +++ b/src/vocola2/VocolaUtils.py @@ -234,7 +234,7 @@ def quoteAsVisualBasicString(argument): unimacro_available = False unimacroactions = None try: - from dtactions.unimacro import unimacroactions + from dtactions import unimacroactions unimacro_available = True except ImportError: pass diff --git a/src/vocola2/__init__.py b/src/vocola2/__init__.py index bff0304..304888b 100644 --- a/src/vocola2/__init__.py +++ b/src/vocola2/__init__.py @@ -1,15 +1,6 @@ """Vocola""" -__version__='3.1.9' -#fix encoding line in outputfile -#__version__ = '3.1.6' # bug fix/enhancing different takes languages and take unimacro actions comments for new vcl files. -## now in versions 3.1. series -# __version__ = '2.9.6' # sendkeys again from Vocola, but via dtactions. -# __version__ = '2.9.5' # make ready for improved pip -# '2.9.4' # bugfix, check for correct directories (VocolaUserDirectory, VocolaGrammarsDirectory) -# '2.9.3' # bugfix, typo -# '2.9.2' # bugfix, normpath changed into abspath -# '2.9.1' # initial version with python3 +#version number now in project.toml """utility functions, to get calling directory of module (in site-packages),