Jelajahi Sumber

bug fix: cli and installer (windows support)

Steve Nyemba 1 bulan lalu
induk
melakukan
57a97e8df1
5 mengubah file dengan 20 tambahan dan 36 penghapusan
  1. 3 2
      bin/smart-logger
  2. 2 0
      bin/smart-logger.bat
  3. 0 15
      meta/__init__.py
  4. 13 17
      pyproject.toml
  5. 2 2
      smart/__init__.py

+ 3 - 2
bin/smart-logger

@@ -14,9 +14,10 @@ import smart.folder
 import smart.top
 import smart.logger
 import smart.files
+from smart import meta
 import uuid
 import typer
-import meta
+
 import json
 import os
 import transport
@@ -132,7 +133,7 @@ def apply_signup (email:str,key:str=None,provider:str='sqlite') :
     """
     print ()
     print (_msg)
-    pass
+    
 def post(_df,_table):
     """
     Store data in a given location 

+ 2 - 0
bin/smart-logger.bat

@@ -0,0 +1,2 @@
+cd /D "%~dp0"
+python smart-logger %1 %2 %3 %4 %5 %6

+ 0 - 15
meta/__init__.py

@@ -1,15 +0,0 @@
-import os
-__app_name__= "smart-logger"
-__version__ = "1.10"
-__author__ = "Steve L. Nyemba, info@the-phi.com"
-__home__ = os.sep.join([os.environ['HOME'],'.smart-logger'])
-__database__='smart_logs'
-__license__= """
-Copyright 2017 - 2023, The Phi Technology
-
-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.
-
-"""

+ 13 - 17
pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=45", "wheel"]
+requires = ["setuptools>=61.0", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -7,21 +7,12 @@ name = "smart-logger"  # Replace with meta.__app_name__
 dynamic = ["version"]
 description = ""    # Add your project description here
 authors = [
-    {name = "Your Name", email = "meta@the-phi.com"}  # Replace with meta.__author__
+    {name = "Steve L. Nyemba", email = "steve@the-phi.com"}  # Replace with meta.__author__
 ]
 license = {text = "MIT"}  # Replace with meta.__license__
 readme = "README.md"  # Optional: add if you have a README
 requires-python = ">=3.7"
-keywords = [
-    "mongodb",
-    "couchdb", 
-    "rabbitmq",
-    "file",
-    "read",
-    "write",
-    "s3",
-    "sqlite"
-]
+keywords = ["logs", "apps","folder","login"]
 classifiers = [
     "Development Status :: 4 - Beta",
     "Intended Audience :: Developers",
@@ -40,14 +31,19 @@ transport = [
 ]
 
 [project.urls]
-Homepage = "https://dev.the-phi.com/git/steve/smart-top.git"
-Repository = "https://dev.the-phi.com/git/steve/smart-top.git"
+Homepage = "https://dev.the-phi.com/git/steve/smart-logger.git"
+Repository = "https://dev.the-phi.com/git/steve/smart-logger.git"
 
-[project.scripts]
-smart-logger = "smart.logger:main"  # Adjust the module path as needed
+#[project.scripts]
+#smart-logger = "smart.logger:main"  # Adjust the module path as needed
+[tool.setuptools]
+include-package-data = true
+zip-safe = false
+script-files = ["bin/smart-logger","bin/smart-logger.bat"]
 
 [tool.setuptools.packages.find]
-include = ["smart*","smart.meta", "smart.cmd", "smart.top", "smart.folder", "smart.logger", "smart.files"]
+include = ["smart*"]
+
 
 [tool.setuptools.dynamic]
 version = {attr = "smart.meta.__version__"}

+ 2 - 2
smart/__init__.py

@@ -148,5 +148,5 @@ def post(_df,_table):
     if hasattr(writer,'close') :
         writer.close()
 
-if __name__ == '__main__' :
-    _cli()
+#if __name__ == '__main__' :
+#    _cli()