Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
镜像
Python_Packaging_Authority
pip
提交
eb865b4e
P
pip
项目概览
镜像
/
Python_Packaging_Authority
/
pip
12 个月 前同步成功
通知
0
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
pip
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
eb865b4e
编写于
4月 05, 2020
作者:
P
Pradyun Gedam
提交者:
GitHub
4月 05, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #7955 from deveshks/pip-list-not-contain-pkg-work-dir
Don't list packages in current directory
上级
d9b3a7cc
feac5954
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
50 addition
and
0 deletion
+50
-0
news/7731.bugfix
news/7731.bugfix
+1
-0
src/pip/__main__.py
src/pip/__main__.py
+7
-0
tests/functional/test_list.py
tests/functional/test_list.py
+42
-0
未找到文件。
news/7731.bugfix
0 → 100644
浏览文件 @
eb865b4e
Avoid using the current directory for check, freeze, install, list and show commands, when invoked as 'python -m pip <command>'
src/pip/__main__.py
浏览文件 @
eb865b4e
...
...
@@ -3,6 +3,13 @@ from __future__ import absolute_import
import
os
import
sys
# Remove '' and current working directory from the first entry
# of sys.path, if present to avoid using current directory
# in pip commands check, freeze, install, list and show,
# when invoked as python -m pip <command>
if
sys
.
path
[
0
]
in
(
''
,
os
.
getcwd
()):
sys
.
path
.
pop
(
0
)
# If we are running from a wheel, add the wheel to sys.path
# This allows the usage python pip-*.whl/pip install pip-*.whl
if
__package__
==
''
:
...
...
tests/functional/test_list.py
浏览文件 @
eb865b4e
...
...
@@ -3,6 +3,7 @@ import os
import
pytest
from
tests.lib
import
create_test_package_with_setup
from
tests.lib.path
import
Path
...
...
@@ -543,3 +544,44 @@ def test_list_path_multiple(tmpdir, script, data):
json_result
=
json
.
loads
(
result
.
stdout
)
assert
{
'name'
:
'simple'
,
'version'
:
'2.0'
}
in
json_result
assert
{
'name'
:
'simple2'
,
'version'
:
'3.0'
}
in
json_result
def
test_list_skip_work_dir_pkg
(
script
):
"""
Test that list should not include package in working directory
"""
# Create a test package and create .egg-info dir
pkg_path
=
create_test_package_with_setup
(
script
,
name
=
'simple'
,
version
=
'1.0'
)
script
.
run
(
'python'
,
'setup.py'
,
'egg_info'
,
expect_stderr
=
True
,
cwd
=
pkg_path
)
# List should not include package simple when run from package directory
result
=
script
.
pip
(
'list'
,
'--format=json'
,
cwd
=
pkg_path
)
json_result
=
json
.
loads
(
result
.
stdout
)
assert
{
'name'
:
'simple'
,
'version'
:
'1.0'
}
not
in
json_result
def
test_list_include_work_dir_pkg
(
script
):
"""
Test that list should include package in working directory
if working directory is added in sys.path
"""
# Create a test package and create .egg-info dir
pkg_path
=
create_test_package_with_setup
(
script
,
name
=
'simple'
,
version
=
'1.0'
)
script
.
run
(
'python'
,
'setup.py'
,
'egg_info'
,
expect_stderr
=
True
,
cwd
=
pkg_path
)
# Add PYTHONPATH env variable
script
.
environ
.
update
({
'PYTHONPATH'
:
pkg_path
})
# List should include package simple when run from package directory
result
=
script
.
pip
(
'list'
,
'--format=json'
,
cwd
=
pkg_path
)
json_result
=
json
.
loads
(
result
.
stdout
)
assert
{
'name'
:
'simple'
,
'version'
:
'1.0'
}
in
json_result
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录