cmdpackage 0.1.3__tar.gz → 0.1.4__tar.gz

{cmdpackage-0.1.3 → cmdpackage-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cmdpackage
-Version: 0.1.3
+Version: 0.1.4
 Summary: Automated python package generator for CLI function calls
 Author-email: mpytel <mpytel@domain.com>
 Maintainer-email: mpytel <mpytel@domain.com>

{cmdpackage-0.1.3 → cmdpackage-0.1.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cmdpackage"
-version = "0.1.3"
+version = "0.1.4"
 description = "Automated python package generator for CLI function calls"
 readme = "README.md"
 license-files = ["LICEN[CS]E*"]
@@ -26,8 +26,6 @@ requires = ["setuptools>=61.0", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools.packages.find]
-[tool.setuptools.package-dir]
-cmdpackage = "src"
-
+where = ["src"]
 [project.scripts]
-cmdpackage = "src:main"
+cmdpackage = "cmdpackage.main:main"

{cmdpackage-0.1.3/src → cmdpackage-0.1.4/src/cmdpackage}/defs/writeCLIPackage.py

@@ -1,6 +1,6 @@
 import os, json
 from ..templates.cmdTemplate import \
-    initFile, logPrintTemplate, \
+    mainFile, logPrintTemplate, \
     commandsFileStr, commandsJsonDict, \
     cmdSwitchbordFileStr, cmdOptSwitchbordFileStr, \
     argParseTemplate, optSwitchesTemplate, \
@@ -13,12 +13,12 @@ def writeCLIPackage(fields: dict):
     programName = fields[field_name]
     # -- package dir files
     ## write __init__.py to package dir from str
-    packDir = os.path.join(os.path.abspath("."),'src')
-    print('packDir:', str(packDir))
+    packDir = os.path.join(os.path.abspath("."), 'src', programName)
+    #print('packDir:', str(packDir))
     chkDir(packDir)
-    fileName = os.path.join(packDir,"__init__.py")
+    fileName = os.path.join(packDir,"main.py")
     with open(fileName,"w") as wf:
-        wf.write(initFile)
+        wf.write(mainFile)
 
     # -- defs dir files
     ## write logPrint.py def for def dir from template

cmdpackage-0.1.3/src/__init__.py → cmdpackage-0.1.4/src/cmdpackage/main.py

@@ -8,7 +8,9 @@ from pathlib import Path
 GREEN = "\033[32m"
 RESET = "\033[0m"
 
+
 def main():
+    print("--- Inside cmdPack.src.main() ---")
     projName = ''
     askForDirChange = False
     if len(sys.argv) > 1:
@@ -17,7 +19,7 @@ def main():
         askForDirChange = ensure_and_cd_to_directory(projName)
     else:
         projName = Path(os.getcwd()).stem
-    fields: dict[str,str] = writePyProject()
+    fields: dict[str, str] = writePyProject()
     writeCLIPackage(fields)
     createzVirtualEnv(fields)
     print(f'*** Activate and install {projName} virtual enviroment ***')
@@ -26,9 +28,11 @@ def main():
     print(f'{GREEN}execute{RESET}: . env/{projName}/bin/activate')
     print(f'{GREEN}execute{RESET}: pip install -e .')
 
+
 if __name__ == '__main__':
     main()
 
+
 def ensure_and_cd_to_directory(target_dir_name: str) -> bool:
     """
     Checks if a target directory exists in the current working directory.

{cmdpackage-0.1.3/src → cmdpackage-0.1.4/src/cmdpackage}/templates/cmdTemplate.py

@@ -2,7 +2,7 @@
 from string import Template
 from textwrap import dedent
 
-initFile = dedent("""import sys, os
+mainFile = dedent("""import sys, os
 from .classes.argParse import ArgParse
 from .commands.cmdSwitchbord import cmdSwitchbord
 

{cmdpackage-0.1.3/src → cmdpackage-0.1.4/src/cmdpackage}/templates/pyprojectTemplate.py

@@ -24,11 +24,9 @@ pyproject_base_template = Template(dedent("""\
     build-backend = "setuptools.build_meta"
 
     [tool.setuptools.packages.find]
-    [tool.setuptools.package-dir]
-    ${name} = "src"
-
+    where = ["src"]
     [project.scripts]
-    ${name} = "src:main"
+    ${name} = "${name}.main:main"
     """))
 
 classifiers_line = Template(

{cmdpackage-0.1.3 → cmdpackage-0.1.4/src}/cmdpackage.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cmdpackage
-Version: 0.1.3
+Version: 0.1.4
 Summary: Automated python package generator for CLI function calls
 Author-email: mpytel <mpytel@domain.com>
 Maintainer-email: mpytel <mpytel@domain.com>

cmdpackage-0.1.4/src/cmdpackage.egg-info/SOURCES.txt

@@ -0,0 +1,20 @@
+LICENSE
+README.md
+pyproject.toml
+src/cmdpackage/__init__.py
+src/cmdpackage/main.py
+src/cmdpackage.egg-info/PKG-INFO
+src/cmdpackage.egg-info/SOURCES.txt
+src/cmdpackage.egg-info/dependency_links.txt
+src/cmdpackage.egg-info/entry_points.txt
+src/cmdpackage.egg-info/top_level.txt
+src/cmdpackage/defs/__init__.py
+src/cmdpackage/defs/createzVirtualEnv.py
+src/cmdpackage/defs/runSubProc.py
+src/cmdpackage/defs/writeCLIPackage.py
+src/cmdpackage/defs/writePyProject.py
+src/cmdpackage/defs/writeSetup.py
+src/cmdpackage/templates/__init__.py
+src/cmdpackage/templates/cmdTemplate.py
+src/cmdpackage/templates/pyprojectTemplate.py
+src/cmdpackage/templates/setupTemplates.py

cmdpackage-0.1.4/src/cmdpackage.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+cmdpackage = cmdpackage.main:main

cmdpackage-0.1.4/src/cmdpackage.egg-info/top_level.txt

@@ -0,0 +1 @@
+cmdpackage

cmdpackage-0.1.3/cmdpackage.egg-info/SOURCES.txt

@@ -1,19 +0,0 @@
-LICENSE
-README.md
-pyproject.toml
-cmdpackage.egg-info/PKG-INFO
-cmdpackage.egg-info/SOURCES.txt
-cmdpackage.egg-info/dependency_links.txt
-cmdpackage.egg-info/entry_points.txt
-cmdpackage.egg-info/top_level.txt
-src/__init__.py
-src/defs/__init__.py
-src/defs/createzVirtualEnv.py
-src/defs/runSubProc.py
-src/defs/writeCLIPackage.py
-src/defs/writePyProject.py
-src/defs/writeSetup.py
-src/templates/__init__.py
-src/templates/cmdTemplate.py
-src/templates/pyprojectTemplate.py
-src/templates/setupTemplates.py

cmdpackage-0.1.3/cmdpackage.egg-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-cmdpackage = src:main

cmdpackage-0.1.3/cmdpackage.egg-info/top_level.txt

@@ -1,2 +0,0 @@
-dist
-src