Merge pull request 'bug fixes with meta package, and installation file' (#45) from v2.2 into master

Reviewed-on: cloud/cms#45

bin/qcms

@@ -12,7 +12,7 @@ from typing import Optional
 from typing import Tuple
 
 
-import meta
+# import meta
 import uuid
 from termcolor import colored
 import base64
@@ -32,9 +32,9 @@ from rich import print
 start = index.start
 __doc__ = f"""
 Built and designed by Steve L. Nyemba, steve@the-phi.com
-version {meta.__version__}
+version {cms.meta.__version__}
 
-{meta.__license__}"""
+{cms.meta.__license__}"""
 
 
 URL = os.environ['QCMS_HOST_URL'] if 'QCMS_HOST_URL' in os.environ else 'https://dev.the-phi.com/git/qcms/themes.git'
@@ -78,8 +78,8 @@ def _info():
     This function returns metadata information about this program, no parameters are needed
     """
     print ()
-    print ('QCMS',meta.__version__)
-    print (meta.__author__,meta.__email__)
+    print ('QCMS',cms.meta.__version__)
+    print (cms.meta.__author__,cms.meta.__email__)
     print ()
 
 @cli.command(name='setup')
@@ -283,7 +283,7 @@ def create(folder:Annotated[str,typer.Argument(help="path of the project folder"
            footer:str=typer.Option(default="Powered By QCMS",help="text to be placed as footer"), #Annotated[str,typer.Argument(help="text on the footer of the main page")]='Quick Content Management System',
            port:int=typer.Option(default=8084, help="port to be used for the app"),
            context:str=typer.Option(default="", help="application context if using a proxy server"),
-           version:str=typer.Option(default=meta.__version__,help="version number") #Annotated[str,typer.Argument(help="version of the site")]='0.1'
+           version:str=typer.Option(default=cms.meta.__version__,help="version number") #Annotated[str,typer.Argument(help="version of the site")]='0.1'
            ):
     """
     Create a project folder by performing a git clone (pull the template project)

cms/__init__.py

@@ -9,6 +9,7 @@ import importlib.util
 import json
 from . import sites
 from . import apexchart
+from . import meta
 
 class Plugin :
     #

meta/__init__.py

@@ -1,15 +0,0 @@
-__author__ = "Steve L. Nyemba"
-__version__= "2.2.22"
-__email__ = "steve@the-phi.com"
-__license__="""
-Copyright 2010 - 2024, Steve L. Nyemba, Vanderbilt University Medical Center
-
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-
-THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-"""

pyproject.toml

@@ -21,7 +21,7 @@ dependencies = [
     "gitpython", 
     "termcolor",
     "flask-session",
-    "mistune","git+https://github.com/lnyemba/plugins-ix",
+    "mistune","plugin-ix@git+https://github.com/lnyemba/plugins-ix",
     "numpy","pandas",
     "typer","smart-open", "pyncclient"
 ]
@@ -47,7 +47,7 @@ script-files = ["bin/qcms"]
 include = ["meta","meta.*", "cms", "cms.*"]
 
 [tool.setuptools.dynamic]
-version = {attr = "meta.__version__"}
+version = {attr = "cms.meta.__version__"}
 #authors = {attr = "meta.__author__"}
 
 # If you have a meta.py file, you might also want to include the author dynamically: