bcmd 0.4.6__py3-none-any.whl → 0.4.7__py3-none-any.whl

bcmd/tasks/venv.py

@@ -27,11 +27,13 @@ async def venv(
     path: Path = typer.Option(None, '--path', help='指定路径，默认当前目录'),
     isOfficial: bool = typer.Option(False, '--official', help='是否使用官方地址安装（https://pypi.org/simple）'),
     isNewProject: bool = typer.Option(False, '--new-project', help='是否新建项目'),
-    isForceBase: bool = typer.Option(False, '--force-base', help='是否强制使用基础库去安装'),
-    isFullBase: bool = typer.Option(False, '--full-base', help='是否先清空venv目录再使用基础库去安装'),
+    isUseBase: bool = typer.Option(False, '--use-base', help='是否强制使用基础库去安装'),
+    isReBase: bool = typer.Option(False, '--re-base', help='是否先清空venv目录再使用基础库去安装'),
+    isUseLock: bool = typer.Option(False, '--use-lock', help='是否使用锁定库安装'),
+    isReLock: bool = typer.Option(False, '--re-lock', help='是否先清空venv目录再使用锁定库安装'),
 ):
     'python 虚拟环境配置'
-    btask.check(not (isForceBase == isFullBase == True), '不能同时使用 --force-base 和 --full-base')
+    btask.check(not (isUseBase == isReBase == isUseLock == isReLock == True), '4个选项只能选择其中一个 --use-base / --re-base / --use-lock / --re-lock')
     path = path or Path(os.getcwd())
     binPath = path / 'bin'
     binListFile = bpath.get(path, 'bin.list')
@@ -40,7 +42,7 @@ async def venv(
     venvFile = bpath.get(path, '.venv')
     checkFileOrNotExists(venvFile)
     await _inputQiniuPassword(binListFile, binPath)
-    if isFullBase:
+    if isReBase or isReLock:
         bpath.remove(venvPath)
         btask.check(not venvPath.exists(), f'无法删除 venv 目录 {venvPath}')
     packages = packages or []
@@ -54,8 +56,10 @@ async def venv(
     if not venvFile.exists():
         await bfile.writeText(venvFile, '')
     basePackages, lockPackages = await getPackageList(venvFile)
-    if isForceBase or isFullBase:
+    if isUseBase or isReBase:
         installPackages = _mergePackageList(basePackages, packages)
+    elif isUseLock or isReLock:
+        installPackages = _mergePackageList(lockPackages, packages)
     else:
         installPackages = _mergePackageList(lockPackages or basePackages, packages)
     installPackages = sorted(list(set(installPackages)))

{bcmd-0.4.6.dist-info → bcmd-0.4.7.dist-info}/METADATA

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

{bcmd-0.4.6.dist-info → bcmd-0.4.7.dist-info}/RECORD

@@ -22,9 +22,9 @@ bcmd/tasks/mirror.py,sha256=-ztGkkxVk81npIo4cpmyLdHa1w4ZFdiJ3mv5WIBMI5Y,1556
 bcmd/tasks/project.py,sha256=ESWyRvRu4tesoYrlBtYMrQvQoxzMnFkI-jTN2hsYruI,939
 bcmd/tasks/proxy.py,sha256=mdiBR2vah5qKt9o7dXE7rg8Lz_A6GheVJDts0m1gmSs,1324
 bcmd/tasks/time.py,sha256=nSIVYov2LsGdxsZAtC91UKXcUtVAqR9o-JmzeuevFhA,2586
-bcmd/tasks/venv.py,sha256=U4Ac2B3jFFwGhzeuFdgNJ94WQ88dAJp71ffoCKbEsXU,6800
-bcmd-0.4.6.dist-info/METADATA,sha256=PqZPpz2uBfhb7z-gf48uH_UZkY508_mGMsRpMfdvIOs,486
-bcmd-0.4.6.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-bcmd-0.4.6.dist-info/entry_points.txt,sha256=rHJrP6KEQpB-YaQqDFzEL2v88r03rxSfnzAayRvAqHU,39
-bcmd-0.4.6.dist-info/top_level.txt,sha256=-KrvhhtBcYsm4XhcjQvEcFbBB3VXeep7d3NIfDTrXKQ,5
-bcmd-0.4.6.dist-info/RECORD,,
+bcmd/tasks/venv.py,sha256=Metps2tKu_wyZfezMTvQPInAWgQV6FyRW9l4-WS9lk8,7160
+bcmd-0.4.7.dist-info/METADATA,sha256=PLqFGXVEpVWeo8M0qwIik_e5dHmkL40BxC1CvIV6aPo,486
+bcmd-0.4.7.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+bcmd-0.4.7.dist-info/entry_points.txt,sha256=rHJrP6KEQpB-YaQqDFzEL2v88r03rxSfnzAayRvAqHU,39
+bcmd-0.4.7.dist-info/top_level.txt,sha256=-KrvhhtBcYsm4XhcjQvEcFbBB3VXeep7d3NIfDTrXKQ,5
+bcmd-0.4.7.dist-info/RECORD,,