Merge pull request #28 from dougransom/master

some tweaks to pyproject.toml.
dictation-toolbox · Nov 30, 2024 · 795e5bb · 795e5bb
2 parents 8cfbc5c + d819376
commit 795e5bb
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 49 deletions.
diff --git a/README.md b/README.md
@@ -87,37 +87,23 @@ Natlink and Vocola2 have been upgraded to Python 3
 -First install Natlink to the latest version.
 
 The current Vocola2 is partly stable, and can be installed via pip:
--pip install vocola2
+```
+pip install  --pre vocola2
+```
+Note  the --pre to get the prelrease versions.
+
 
 Instructions for installing the latest released version can be found at
-http://vocola.net/v2/InstallVocola.asp
+
 
 ## Instructions for the developers
 
 To install the version checked out in your git repository,
--first uninstall vocola:
-```
-pip uninstall vocola2
-```
--In your root of your repository:  
-```flit build
-pip install -e .
-```
-
-
--You can now edit the files in your (Forked) repository, the changes will reflect the state of
-you packages in the site-packages directory immediately.  
-
--When you are satisfied with a release, take the following steps:
--change the release number in __init__.py of vocola2.
-- update the version number requirement of any dependancies in pyproject.toml..
--do a local `pip uninstall vocola2`
--commit and push your git directory
+`pip install -e .` in your repository root.
 
-Then: 
+To build the package, run this in your repository root:
 ```
-flit build
-flit publish
+python -m build
 ```
 
 

diff --git a/build_package.cmd b/build_package.cmd
diff --git a/build_package.ps1 b/build_package.ps1
diff --git a/compile_README.cmd b/compile_README.cmd
diff --git a/publish_package_pypi.cmd b/publish_package_pypi.cmd
diff --git a/publish_package_pypi.ps1 b/publish_package_pypi.ps1
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,24 +1,43 @@
 [build-system]
 requires = ["flit_core >=2,<4"]
 build-backend = "flit_core.buildapi"
-
 [project]
-version = '3.1.10.dev1'
+dependencies=[
+	"dtactions~=1.6.4.dev3",
+  	"natlinkcore >= 5.4.1"
+	]
+requires-python = ">=3.10"
+name='vocola2'
 authors = [{name = "Mark Lillibridge", email = "[email protected]"}]
-name = "vocola2"
-readme = "README.md"
-classifiers=[	"Development Status :: 4 - Beta",
-	"Topic :: Multimedia :: Sound/Audio :: Speech",
-	"Topic :: Scientific/Engineering :: Human Machine Interfaces"]
-
-description = "Vocola2 (for Natlink)"
-
-requires-python = ">=3.8"
+version="3.1.10.dev2"
+description="Vocola is a voice command language for creating commands to control a computer by voice "
 keywords=["dragon","speech","dictation","dictation-toolbox","natlink", "dtactions"]
 
-dependencies = ["dtactions == 1.6.4.dev3",
-				"natlinkcore >= 5.4.1"]
+    classifiers=[
+        "Development Status :: 4 - Beta",
+        "Environment :: Win32 (MS Windows)",
+        "Intended Audience :: Developers",
+        "Operating System :: Microsoft :: Windows",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: Implementation :: CPython",
+        "Topic :: Multimedia :: Sound/Audio :: Speech",
+        "Topic :: Software Development :: Libraries :: Python Modules",
+		"Topic :: Scientific/Engineering :: Human Machine Interfaces",
+        ]
+
+[project.urls]
+homepage="http://vocola.net/v2/"
+repository="https://github.com/dictation-toolbox/Vocola2"
 
+keywords="dragon,speech,dictation,dictation-toolbox,unimacro,natlink"
+[project.optional-dependencies]
+test = [
+    "pytest >=7.1.2",
+]
+dev = [
+    "pyenvutils","entry-point-inspector","build"
+] 
+
 
 
 [project.urls]