Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
后端镜像
Pdm
提交
9716c1ce
P
Pdm
项目概览
后端镜像
/
Pdm
通知
0
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Pdm
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
9716c1ce
编写于
2月 13, 2020
作者:
F
Frost Ming
提交者:
GitHub
2月 13, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #34 from frostming/feature/33
Reuse pinned candidates during `pdm install`
上级
f59ceaf6
487a476b
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
25 addition
and
5 deletion
+25
-5
news/33.feature
news/33.feature
+1
-0
pdm/cli/commands.py
pdm/cli/commands.py
+9
-4
pdm/project/core.py
pdm/project/core.py
+1
-1
tests/cli/test_cli.py
tests/cli/test_cli.py
+14
-0
未找到文件。
news/33.feature
0 → 100644
浏览文件 @
9716c1ce
Pinned
candidates
in
lock
file
are
reused
when
relocking
during
`pdm
install`.
pdm/cli/commands.py
浏览文件 @
9716c1ce
...
@@ -103,10 +103,15 @@ def lock(project):
...
@@ -103,10 +103,15 @@ def lock(project):
)
)
@
pass_project
@
pass_project
def
install
(
project
,
sections
,
dev
,
default
,
lock
):
def
install
(
project
,
sections
,
dev
,
default
,
lock
):
if
lock
and
not
(
if
lock
:
project
.
lockfile_file
.
is_file
()
and
project
.
is_lockfile_hash_match
()
if
not
project
.
lockfile_file
.
exists
():
):
context
.
io
.
echo
(
"Lock file does not exist, trying to generate one..."
)
actions
.
do_lock
(
project
)
actions
.
do_lock
(
project
,
strategy
=
"all"
)
elif
not
project
.
is_lockfile_hash_match
():
context
.
io
.
echo
(
"Lock file hash doesn't match pyproject.toml, regenerating..."
)
actions
.
do_lock
(
project
,
strategy
=
"reuse"
)
actions
.
do_sync
(
project
,
sections
,
dev
,
default
,
False
,
False
)
actions
.
do_sync
(
project
,
sections
,
dev
,
default
,
False
,
False
)
...
...
pdm/project/core.py
浏览文件 @
9716c1ce
...
@@ -177,7 +177,7 @@ class Project:
...
@@ -177,7 +177,7 @@ class Project:
return
{}
return
{}
section
=
section
or
"default"
section
=
section
or
"default"
result
=
{}
result
=
{}
for
package
in
[
dict
(
p
)
for
p
in
self
.
lockfile
[
"package"
]
]:
for
package
in
[
dict
(
p
)
for
p
in
self
.
lockfile
.
get
(
"package"
,
[])
]:
if
section
!=
"__all__"
and
section
not
in
package
[
"sections"
]:
if
section
!=
"__all__"
and
section
not
in
package
[
"sections"
]:
continue
continue
version
=
package
.
get
(
"version"
)
version
=
package
.
get
(
"version"
)
...
...
tests/cli/test_cli.py
浏览文件 @
9716c1ce
...
@@ -6,6 +6,7 @@ from pathlib import Path
...
@@ -6,6 +6,7 @@ from pathlib import Path
import
pytest
import
pytest
from
click.testing
import
CliRunner
from
click.testing
import
CliRunner
from
pdm.cli
import
actions
,
commands
from
pdm.cli
import
actions
,
commands
from
pdm.models.requirements
import
parse_requirement
@
pytest
.
fixture
()
@
pytest
.
fixture
()
...
@@ -124,3 +125,16 @@ def test_use_command(project, invoke):
...
@@ -124,3 +125,16 @@ def test_use_command(project, invoke):
project
.
write_pyproject
()
project
.
write_pyproject
()
result
=
invoke
([
"use"
,
"2.7"
],
obj
=
project
)
result
=
invoke
([
"use"
,
"2.7"
],
obj
=
project
)
assert
result
.
exit_code
==
1
assert
result
.
exit_code
==
1
def
test_install_with_lockfile
(
project
,
invoke
,
working_set
,
repository
):
result
=
invoke
([
"lock"
],
obj
=
project
)
assert
result
.
exit_code
==
0
result
=
invoke
([
"install"
],
obj
=
project
)
assert
"Lock file"
not
in
result
.
output
project
.
add_dependencies
({
"pytz"
:
parse_requirement
(
"pytz"
)})
result
=
invoke
([
"install"
],
obj
=
project
)
assert
"Lock file hash doesn't match"
in
result
.
output
assert
"pytz"
in
project
.
get_locked_candidates
()
assert
project
.
is_lockfile_hash_match
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录