bcmd 0.2.8__tar.gz → 0.3.4__tar.gz

{bcmd-0.2.8 → bcmd-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bcmd
-Version: 0.2.8
+Version: 0.3.4
 Summary: Commands for Beni
 Author-email: Beni Mang <benimang@126.com>
 Maintainer-email: Beni Mang <benimang@126.com>

bcmd-0.3.4/bcmd/resources/project/.vscode/settings.json

@@ -0,0 +1,76 @@
+{
+    "files.exclude": {
+        ".pytest_cache": true,
+        "**/__pycache__": true,
+        ".gitignore": true,
+        ".venv": true,
+        ".venv-lock": true,
+        "venv": true,
+    },
+    "python.defaultInterpreterPath": "${workspaceFolder}/venv/Scripts/python.exe",
+    // coommon ------------------------------------------------------------------------------------
+    "window.menuBarVisibility": "classic", // 顶部中间
+    // "breadcrumbs.enabled": false, // 代码顶部导航
+    // "http.proxy": "http://localhost:15236",
+    "security.workspace.trust.enabled": false,
+    "redhat.telemetry.enabled": false,
+    "window.restoreWindows": "none",
+    "workbench.startupEditor": "none",
+    "files.eol": "\n",
+    "explorer.autoReveal": false, // 取消文件自动定位跟踪
+    "editor.renderWhitespace": "none", // 不高亮显示空白
+    "editor.unicodeHighlight.allowedLocales": { // 注释里的全角符号不提示警告
+        "zh-hans": true,
+        "zh-hant": true,
+    },
+    "github.copilot.enable": {
+        "*": true,
+        "plaintext": true,
+        "markdown": true,
+        "scminput": false,
+        "yaml": true
+    },
+    "github.copilot.editor.enableAutoCompletions": true,
+    "github.copilot.chat.localeOverride": "zh-CN",
+    "git.openRepositoryInParentFolders": "never",
+    "workbench.colorTheme": "Default Dark+",
+    "editor.stickyScroll.enabled": false,
+    "workbench.editor.enablePreview": false,
+    "window.commandCenter": false,
+    "editor.inlineSuggest.enabled": true,
+    "[markdown]": {
+        "editor.defaultFormatter": "yzhang.markdown-all-in-one"
+    },
+    // python -------------------------------------------------------------------------------------
+    "python.languageServer": "Pylance",
+    "python.analysis.autoImportCompletions": true,
+    "python.analysis.diagnosticMode": "workspace", // 针对整个workspace做检查提示
+    "python.analysis.typeCheckingMode": "strict",
+    "[python]": {
+        "editor.defaultFormatter": "ms-python.autopep8",
+    },
+    "autopep8.args": [
+        "--ignore=E501",
+    ],
+    "python.testing.pytestArgs": [
+        "test", // 指定单元测试查找的目录
+        "-s", // 支持print输出
+    ],
+    "python.testing.unittestEnabled": false,
+    "python.testing.pytestEnabled": false,
+    "python.analysis.diagnosticSeverityOverrides": {
+        "reportMissingTypeStubs": "none",
+        "reportUnknownMemberType": "none",
+        // "reportUnknownParameterType": "none",
+        // "reportUnknownVariableType": "none",
+        // "reportUnknownArgumentType": "none",
+        // "reportMatchNotExhaustive": "none", // match 没有匹配所有，会提示添加一个 _
+        // "reportUnusedCallResult": "warning",
+        "reportUnusedClass": "warning",
+        "reportUnusedCoroutine": "warning",
+        "reportUnusedFunction": "warning",
+        "reportUnusedImport": "warning",
+        "reportUnusedVariable": "warning",
+        "reportImportCycles": "warning",
+    },
+}

{bcmd-0.2.8/bcmd/resources/project/src → bcmd-0.3.4/bcmd/resources/project}/.vscode/tasks.json

@@ -7,7 +7,7 @@
             "command": "TortoiseGitProc.exe",
             "args": [
                 "/command:commit",
-                "/path:${workspaceFolder}/../",
+                "/path:${workspaceFolder}/",
             ],
         },
         {
@@ -25,7 +25,7 @@
             "command": "TortoiseGitProc.exe",
             "args": [
                 "/command:revert",
-                "/path:${workspaceFolder}/../",
+                "/path:${workspaceFolder}/",
             ],
         },
         {
@@ -43,7 +43,7 @@
             "command": "TortoiseGitProc.exe",
             "args": [
                 "/command:sync",
-                "/path:${workspaceFolder}/../",
+                "/path:${workspaceFolder}/",
             ],
         },
         {
@@ -52,7 +52,7 @@
             "command": "TortoiseGitProc.exe",
             "args": [
                 "/command:log",
-                "/path:${workspaceFolder}/../",
+                "/path:${workspaceFolder}/",
             ],
         },
         {

{bcmd-0.2.8 → bcmd-0.3.4}/bcmd/tasks/lib.py

@@ -23,8 +23,8 @@ async def tidy_dependencies(
         workspace_path = Path.cwd()
     pyprojectTomlFile = workspace_path / 'pyproject.toml'
     btask.check(pyprojectTomlFile.is_file(), 'pyproject.toml 不存在', pyprojectTomlFile)
-    targetVenvFileName = 'venv.lock' if with_version else 'venv.list'
-    targetVenvFile = bpath.get(workspace_path, f'./../{targetVenvFileName}')
+    targetVenvFileName = '.venv-lock' if with_version else '.venv'
+    targetVenvFile = bpath.get(workspace_path, f'./{targetVenvFileName}')
     btask.check(targetVenvFile.is_file(), '文件不存在', targetVenvFile)
     libAry = (await bfile.readText(targetVenvFile)).strip().replace('\r\n', '\n').split('\n')
     oldContent = await bfile.readText(pyprojectTomlFile)
@@ -79,7 +79,7 @@ async def update_version(
 @app.command()
 @syncCall
 async def build(
-    src_path: Path = typer.Argument(None, help='src 路径'),
+    workspace_path: Path = typer.Argument(None, help='workspace 路径'),
     keep_build_files: bool = typer.Option(False, '--keep-build-files', '-k', help='是否保留构建文件'),
 ):
     '发布项目'
@@ -87,22 +87,21 @@ async def build(
     # 获取用户名和密码
     u, p = await password.getPypi()
 
-    if not src_path:
-        src_path = Path.cwd()
-    src_path = src_path.resolve()
+    if not workspace_path:
+        workspace_path = Path.cwd()
+    workspace_path = workspace_path.resolve()
 
     def removeUnusedPath():
-        bpath.remove(src_path / 'dist')
-        paths = bpath.listDir(src_path)
+        bpath.remove(workspace_path / 'dist')
+        paths = bpath.listDir(workspace_path)
         for x in paths:
             if x.name.endswith('.egg-info'):
                 bpath.remove(x)
 
     try:
-        with bpath.changePath(src_path):
+        with bpath.changePath(workspace_path):
             removeUnusedPath()
-            scriptPath = (src_path / './../venv/Scripts').resolve()
-            os.system(f'{scriptPath / "pip.exe"} install setuptools -U -i https://mirrors.aliyun.com/pypi/simple')
+            scriptPath = (workspace_path / './venv/Scripts').resolve()
             os.system(f'{scriptPath / "python.exe"} -m build')
             os.system(f'{scriptPath / "twine.exe"} upload dist/* -u {u} -p {p}')
     finally:

{bcmd-0.2.8 → bcmd-0.3.4}/bcmd/tasks/proxy.py

@@ -17,7 +17,7 @@ async def proxy(
     port: int = typer.Option(15236, help="代理服务器端口"),
 ):
     '生成终端设置代理服务器的命令'
-    processNameAry = []
+    processNameAry:list[str] = []
     process = psutil.Process().parent()
     while process:
         processNameAry.append(process.name())

{bcmd-0.2.8 → bcmd-0.3.4}/bcmd/tasks/venv.py

@@ -24,6 +24,7 @@ async def venv(
     disabled_mirror: bool = typer.Option(False, '--disabled-mirror', '-d', help='是否禁用镜像'),
     new_project: bool = typer.Option(False, '--new-project', '-n', help='是否新建项目'),
     quiet: bool = typer.Option(False, '--quiet', '-q', help='是否安静模式'),
+    no_lock: bool = typer.Option(False, '--no-lock', help='是否不使用.venv-lock文件来安装（使用在不同系统上增量安装）'),
 ):
     'python 虚拟环境配置'
     path = path or Path(os.getcwd())
@@ -42,14 +43,14 @@ async def venv(
         await binput.confirm('指定目录为非venv目录，是否确认新创建？')
     if not venvPath.exists():
         await bexecute.run(f'python -m venv {venvPath}')
-    venvLockFile = bpath.get(path, 'venv.lock')
+    venvLockFile = bpath.get(path, '.venv-lock')
     assertFile(venvLockFile)
-    venvListFile = bpath.get(path, 'venv.list')
+    venvListFile = bpath.get(path, '.venv')
     assertFile(venvListFile)
     if not venvListFile.exists():
         await bfile.writeText(venvListFile, '')
     await tidyVenvFile(venvListFile, packages)
-    if venvLockFile.exists():
+    if venvLockFile.exists() and not no_lock:
         await tidyVenvFile(venvLockFile, packages)
         targetFile = venvLockFile
     else:
@@ -69,10 +70,8 @@ async def venv(
         )
     # 新建项目
     if new_project:
-        with bpath.changePath(path):
-            await bexecute.run('beni venv --quiet')
         with importlib.resources.path('bcmd.resources', 'project') as sourceProjectPath:
-            for p in bpath.listDir(sourceProjectPath):
+            for p in bpath.listPath(sourceProjectPath):
                 bpath.copy(p, path / p.name)
     bcolor.printGreen('OK')
 

{bcmd-0.2.8 → bcmd-0.3.4}/bcmd.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bcmd
-Version: 0.2.8
+Version: 0.3.4
 Summary: Commands for Beni
 Author-email: Beni Mang <benimang@126.com>
 Maintainer-email: Beni Mang <benimang@126.com>

{bcmd-0.2.8 → bcmd-0.3.4}/bcmd.egg-info/SOURCES.txt

@@ -12,10 +12,10 @@ bcmd.egg-info/top_level.txt
 bcmd/common/__init__.py
 bcmd/common/password.py
 bcmd/resources/project/.gitignore
-bcmd/resources/project/src/main.py
-bcmd/resources/project/src/.vscode/launch.json
-bcmd/resources/project/src/.vscode/settings.json
-bcmd/resources/project/src/.vscode/tasks.json
+bcmd/resources/project/main.py
+bcmd/resources/project/.vscode/launch.json
+bcmd/resources/project/.vscode/settings.json
+bcmd/resources/project/.vscode/tasks.json
 bcmd/tasks/__init__.py
 bcmd/tasks/bin.py
 bcmd/tasks/code.py

{bcmd-0.2.8 → bcmd-0.3.4}/pyproject.toml

@@ -3,7 +3,7 @@
 
 [project]
 name = 'bcmd'
-version = '0.2.8'
+version = '0.3.4'
 description = 'Commands for Beni'
 requires-python = '>=3.10'
 keywords = ['benimang', 'beni', 'bcmd']

bcmd-0.2.8/bcmd/resources/project/src/.vscode/settings.json

@@ -1,7 +0,0 @@
-{
-    "files.exclude": {
-        ".pytest_cache": true,
-        "**/__pycache__": true,
-    },
-    "python.defaultInterpreterPath": "${workspaceFolder}/../venv/Scripts/python.exe",
-}