Merge branch 'master' of github.com:dictation-toolbox/unimacro

struggling with website unimacro

.gitignore

@@ -16,3 +16,4 @@ __pycache__/
 /src/unimacro/UnimacroGrammars/rememberdialog.py
 /website unimacro/xxx.txt
 /website unimacro/source/sitemap.html
+/src/unimacro/UnimacroGrammars/rememberdialog.py

README.md

@@ -28,6 +28,13 @@ with the following.
 
 But... when you install Natlink via the natlink installer, and proceed with "Configure Natlink via GUI" or "Configure Natlink via CLI", and choose to activate Unimacro, this "pip" action is automatically performed. 
 
+If you want to install directly from github (say to install something between releases a developer is working on).
+
+```
+pip uninstall unimacro
+pip install unimacro@git+https://github.com/dougransom/unimacro@d1cbfb0d9559b9ba656a1d1bb1579f1c2b2562ae
+```
+replacing "https://github.com/dougransom/unimacro"  with the repository in github you wish to install from and "d1cbfb0d9559b9ba656a1d1bb1579f1c2b2562ae" with the version commit you wish to install.    
 
 
 # Location of Grammars

pyproject.toml

@@ -5,18 +5,24 @@ build-backend = "flit_core.buildapi"
 [project]
 name = "unimacro"
 authors = [{name = "Quintijn Hoogenboom (maintainer)", email = "q.hoogenboom@antenna.nl"}]
-dynamic = ["version", "description"]
+dynamic = ["description"]
+version = "4.1.7.dev2"
 requires-python = ">=3.10"
 readme = "README.md"
 
+#"dtactions = ^1.6.4" means anything >= 1.6.4.dev1 and less than 1.7.  A breaking change in dtactions 
+#will mean an update the version specifier below.
+#https://packaging.python.org/en/latest/specifications/version-specifiers/#id5
+#note you have to put in .dev1 to take the earliest dev release.
 
-dependencies = ["dtactions >= 1.6.2",
+
+dependencies = ["dtactions ~= 1.6.4.dev3",
         "debugpy >= 1.2.0",
 		"pywin32 >= 304",
-		"natlinkcore >= 5.4.1",
+		"natlinkcore ~= 5.4.2.dev1",
         "FreeSimpleGUI>=5.1.0"]
 
-classifiers=[	"Development Status :: 4 - Beta",
+classifiers=[	"Development Status :: 2 - Pre-Alpha",
 				"Topic :: Multimedia :: Sound/Audio :: Speech",
 				"Topic :: Scientific/Engineering :: Human Machine Interfaces",
 				"Environment :: Win32 (MS Windows)",

src/unimacro/OtherUnimacroGrammars/_calculator.py

@@ -35,11 +35,11 @@
 the grammars _number simple and _number extended.
 """
 import copy
-from dtactions.unimacro.unimacroactions import doAction as action
+from dtactions.unimacroactions import doAction as action
 
 from natlinkcore import natlinkutils as natut
-from dtactions.unimacro import unimacroutils
-from dtactions.unimacro import unimacroutils
+from dtactions import unimacroutils
+from dtactions import unimacroutils
 import unimacro.natlinkutilsbj as natbj
 
 ancestor = natbj.IniGrammar

src/unimacro/OtherUnimacroGrammars/_keystrokes.py

@@ -20,10 +20,10 @@
 
 import sys
 import copy
-from dtactions.unimacro import inivars
-from dtactions.unimacro.unimacroactions import doKeystroke as keystroke
-from dtactions.unimacro.unimacroactions import doAction as action
-from dtactions.unimacro import unimacroutils
+from dtactions import inivars
+from dtactions.unimacroactions import doKeystroke as keystroke
+from dtactions.unimacroactions import doAction as action
+from dtactions import unimacroutils
 from unimacro import natlinkutilsbj as natbj
 from natlinkcore import nsformat 
 from natlinkcore import loader

src/unimacro/OtherUnimacroGrammars/_latex.py

@@ -15,8 +15,8 @@
 import natlink
 from natlinkcore import nsformat 
 from natlinkcore import natlinkstatus
-from dtactions.unimacro import unimacroutils
-from dtactions.unimacro.unimacroactions import doAction as action
+from dtactions import unimacroutils
+from dtactions.unimacroactions import doAction as action
 from dtactions.sendkeys import sendkeys as keystroke
 import unimacro.natlinkutilsbj as natbj
 

src/unimacro/OtherUnimacroGrammars/_number extended.py

@@ -47,10 +47,10 @@
 """
 #pylint:disable=C0209, R0904, R0912, R0915
 import natlink
-from dtactions.unimacro.unimacroactions import doAction as action
-from dtactions.unimacro.unimacroactions import doKeystroke as keystroke
-from dtactions.unimacro.unimacroactions import getMetaAction
-from dtactions.unimacro import unimacroutils
+from dtactions.unimacroactions import doAction as action
+from dtactions.unimacroactions import doKeystroke as keystroke
+from dtactions.unimacroactions import getMetaAction
+from dtactions import unimacroutils
 
 import unimacro.natlinkutilsbj as natbj
 

src/unimacro/OtherUnimacroGrammars/_oops.py

@@ -61,7 +61,7 @@
 import natlink
 from natlinkcore import natlinkstatus
 from natlinkcore import loader
-from dtactions.unimacro import unimacroutils
+from dtactions import unimacroutils
 import unimacro.natlinkutilsbj as natbj
 
 logHour = -1

src/unimacro/OtherUnimacroGrammars/_repeat.py

@@ -41,8 +41,8 @@
 import os
 import os.path
 from dtactions.sendkeys import sendkeys
-from dtactions.unimacro import unimacroutils
-# from dtactions.unimacro.unimacroactions import doAction as action
+from dtactions import unimacroutils
+# from dtactions.unimacroactions import doAction as action
 import unimacro.natlinkutilsbj as natbj
 from natlinkcore import natlinkutils
 from natlinkcore import natlinktimer

src/unimacro/OtherUnimacroGrammars/_unimacrotest.py

@@ -20,9 +20,9 @@
 import natlink
 from natlinkcore import natlinkstatus
 import unimacro.natlinkutilsbj as natbj
-from dtactions.unimacro import unimacroutils
-from dtactions.unimacro import utilsqh
-from dtactions.unimacro import unimacroactions as actions
+from dtactions import unimacroutils
+from dtactions import utilsqh
+from dtactions import unimacroactions as actions
 
 status = natlinkstatus.NatlinkStatus()
 

src/unimacro/OtherUnimacroGrammars/excel.py

@@ -10,15 +10,15 @@
 
 
 import natlink
-from dtactions.unimacro import unimacroutils
+from dtactions import unimacroutils
 from natlinkcore import natlinkutils
-from dtactions.unimacro import unimacroutils
+from dtactions import unimacroutils
 import unimacro.natlinkutilsbj as natbj
 import pprint
 import types
-from dtactions.unimacro.unimacroactions import doAction as action
-from dtactions.unimacro.unimacroactions import doAction as action
-from dtactions.unimacro import unimacroactions as actions
+from dtactions.unimacroactions import doAction as action
+from dtactions.unimacroactions import doAction as action
+from dtactions import unimacroactions as actions
 import win32com
 
 # 

src/unimacro/OtherUnimacroGrammars/frescobaldi.py

@@ -47,16 +47,16 @@
   
 """
 
-from dtactions.unimacro import unimacroutils
+from dtactions import unimacroutils
 import unimacro.natlinkutilsbj as natbj
 from natlinkcore import natlinkutils
-from dtactions.unimacro import unimacroutils
+from dtactions import unimacroutils
 import unimacro.natlinkutilsbj as natbj
 import natlink
-from dtactions.unimacro.unimacroactions import doAction as action
-from dtactions.unimacro.unimacroactions import doAction as action
+from dtactions.unimacroactions import doAction as action
+from dtactions.unimacroactions import doAction as action
 from itertools import cycle
-from dtactions.unimacro import unimacroactions as actions
+from dtactions import unimacroactions as actions
 import re
 import copy
 import time

src/unimacro/OtherUnimacroGrammars/solitaire.py

@@ -35,7 +35,7 @@
 
 import win32gui
 from natlinkcore import natlinktimer
-from dtactions.unimacro import unimacroutils
+from dtactions import unimacroutils
 import unimacro.natlinkutilsbj as natbj
 
 #aantal carden en aantal stapelplaatsen:

src/unimacro/OtherUnimacroGrammars/xxxxnatspeak_dialog.py

@@ -9,7 +9,7 @@
 # interaction with grammar _folders.
 #
 #pylint:disable=
-from dtactions.unimacro import unimacroutils
+from dtactions import unimacroutils
 from dtactions.sendkeys import sendkeys as keystroke
 import unimacro.natlinkutilsbj as natbj
 

src/unimacro/UnimacroGrammars/_brackets.py

@@ -32,9 +32,9 @@
 """
 #pylint:disable=C0115, C0116, W0201, W0613
 from natlinkcore import nsformat
-from dtactions.unimacro import unimacroutils
-from dtactions.unimacro.unimacroactions import doAction as action
-from dtactions.unimacro.unimacroactions import doKeystroke as keystroke
+from dtactions import unimacroutils
+from dtactions.unimacroactions import doAction as action
+from dtactions.unimacroactions import doKeystroke as keystroke
 # from dtactions.natlinkclipboard import Clipboard
 import unimacro.natlinkutilsbj as natbj
 import natlink

src/unimacro/UnimacroGrammars/_clickbyvoice.py

@@ -29,9 +29,9 @@
 """
 import natlink
 from unimacro import natlinkutilsbj as natbj
-from dtactions.unimacro import unimacroutils
-from dtactions.unimacro.unimacroactions import doAction as action
-from dtactions.unimacro.unimacroactions import doKeystroke  as keystroke
+from dtactions import unimacroutils
+from dtactions.unimacroactions import doAction as action
+from dtactions.unimacroactions import doKeystroke  as keystroke
 
 # use extension Click by Voice
 visiblePause = 0.4

src/unimacro/UnimacroGrammars/_debug_natlink.py.txt

@@ -11,8 +11,8 @@ from natlinkcore import nsformat
 
 # import unimacro.natlinkutilsbj as natbj
 
-# from dtactions.unimacro import unimacroutils
-# from dtactions.unimacro.unimacroactions import doAction as action
+# from dtactions import unimacroutils
+# from dtactions.unimacroactions import doAction as action
 
 # ancestor = natbj.IniGrammar  #QH1
 class DebugGrammar(natlinkutils.GrammarBase):

src/unimacro/UnimacroGrammars/_folders.py

@@ -61,17 +61,17 @@
 from natlinkcore import readwritefile
 from natlinkcore import natlinktimer
 from natlinkcore import natlinkstatus
-from dtactions.unimacro import extenvvars
+from dtactions import extenvvars
 from dtactions import messagefunctions as mess
 from dtactions import natlinkclipboard
-from dtactions.unimacro.unimacroactions import doAction as action
-from dtactions.unimacro.unimacroactions import doKeystroke as keystroke
-# from dtactions.unimacro.unimacroactions import do_YESNO as YesNo
-from dtactions.unimacro.unimacroactions import UnimacroBringUp
-from dtactions.unimacro.unimacroactions import Message
-from dtactions.unimacro import unimacroutils
-# from dtactions.unimacro.unimacroactions import Message
-# from dtactions.unimacro import unimacroactions as actions
+from dtactions.unimacroactions import doAction as action
+from dtactions.unimacroactions import doKeystroke as keystroke
+# from dtactions.unimacroactions import do_YESNO as YesNo
+from dtactions.unimacroactions import UnimacroBringUp
+from dtactions.unimacroactions import Message
+from dtactions import unimacroutils
+# from dtactions.unimacroactions import Message
+# from dtactions import unimacroactions as actions
 from unimacro import natlinkutilsbj as natbj
 # from unimacro.unimacro_wxpythondialogs import InputBox
 # import natlinkcore.natlinkutils as natut

src/unimacro/UnimacroGrammars/_general.py

@@ -32,10 +32,10 @@
 from unimacro import natlinkutilsbj as natbj
 from unimacro import namelist # for name phrases
 
-from dtactions.unimacro.unimacroactions import doAction as action
-from dtactions.unimacro.unimacroactions import doKeystroke as keystroke
-from dtactions.unimacro import unimacroactions as actions
-from dtactions.unimacro import unimacroutils
+from dtactions.unimacroactions import doAction as action
+from dtactions.unimacroactions import doKeystroke as keystroke
+from dtactions import unimacroactions as actions
+from dtactions import unimacroutils
 
 # taskswitching moved to _tasks.py (july 2006)
 

src/unimacro/UnimacroGrammars/_lines.py

@@ -46,11 +46,11 @@
 import natlink
 from natlinkcore import natlinkutils
 import unimacro.natlinkutilsbj as natbj
-from dtactions.unimacro import inivars
-from dtactions.unimacro import unimacroutils
-from dtactions.unimacro.unimacroactions import doAction as action
+from dtactions import inivars
+from dtactions import unimacroutils
+from dtactions.unimacroactions import doAction as action
 from dtactions.sendkeys import sendkeys as keystroke
-from dtactions.unimacro import unimacroactions as actions
+from dtactions import unimacroactions as actions
 
 class LinesError(Exception):
     pass

src/unimacro/UnimacroGrammars/_number simple.py

@@ -23,7 +23,7 @@
 further comments in _number extended.py. Also see the page "number grammar" on the Unimacro we
 """
 #pylint:disable=C0115, C0116, W0613
-from dtactions.unimacro import unimacroutils
+from dtactions import unimacroutils
 from dtactions.sendkeys import sendkeys as keystroke
 import unimacro.natlinkutilsbj as natbj
 import natlink

src/unimacro/UnimacroGrammars/_tags.py

@@ -15,9 +15,9 @@
 #pylint:disable=C0116, W0603, W0613, W0201, R0912
 import natlink
 import unimacro.natlinkutilsbj as natbj
-from dtactions.unimacro import unimacroutils
-from dtactions.unimacro.unimacroactions import doKeystroke as keystroke
-from dtactions.unimacro.unimacroactions import doAction as action
+from dtactions import unimacroutils
+from dtactions.unimacroactions import doKeystroke as keystroke
+from dtactions.unimacroactions import doAction as action
 # from dtactions.natlinkclipboard import Clipboard
 # natlinkclipboard is not safe at the moment.