Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
setuptools
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
setuptools
Commits
6310f99f
Commit
6310f99f
authored
May 14, 2019
by
Benoit Pierre
Committed by
GitHub
May 14, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1762 from benoit-pierre/fix_test_build_deps_on_distutils
Fix CIs.
parents
83c667e0
835580ae
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
4 deletions
+5
-4
appveyor.yml
appveyor.yml
+1
-1
setuptools/tests/test_integration.py
setuptools/tests/test_integration.py
+3
-2
tox.ini
tox.ini
+1
-1
No files found.
appveyor.yml
View file @
6310f99f
...
...
@@ -26,7 +26,7 @@ cache:
test_script
:
-
python --version
-
python -m pip install --disable-pip-version-check --upgrade pip setuptools wheel
-
pip install --upgrade tox tox-venv
-
pip install --upgrade tox tox-venv
virtualenv
-
pip freeze --all
-
python bootstrap.py
-
tox -- --cov
...
...
setuptools/tests/test_integration.py
View file @
6310f99f
...
...
@@ -141,6 +141,7 @@ def test_build_deps_on_distutils(request, tmpdir_factory, build_dep):
allowed_unknowns
=
[
'test_suite'
,
'tests_require'
,
'python_requires'
,
'install_requires'
,
]
assert
not
match
or
match
.
group
(
1
).
strip
(
'"
\
'
'
)
in
allowed_unknowns
...
...
@@ -149,8 +150,8 @@ def test_build_deps_on_distutils(request, tmpdir_factory, build_dep):
def
install
(
pkg_dir
,
install_dir
):
with
open
(
os
.
path
.
join
(
pkg_dir
,
'setuptools.py'
),
'w'
)
as
breaker
:
breaker
.
write
(
'raise ImportError()'
)
cmd
=
[
sys
.
executable
,
'setup.py'
,
'install'
,
'--prefix'
,
install_dir
]
env
=
dict
(
os
.
environ
,
PYTHONPATH
=
pkg_dir
)
cmd
=
[
sys
.
executable
,
'setup.py'
,
'install'
,
'--prefix'
,
str
(
install_dir
)
]
env
=
dict
(
os
.
environ
,
PYTHONPATH
=
str
(
pkg_dir
)
)
output
=
subprocess
.
check_output
(
cmd
,
cwd
=
pkg_dir
,
env
=
env
,
stderr
=
subprocess
.
STDOUT
)
return
output
.
decode
(
'utf-8'
)
...
...
tox.ini
View file @
6310f99f
...
...
@@ -14,7 +14,7 @@ deps=-rtests/requirements.txt
# from being added to `sys.path`.
install_command
=
python -c 'import sys; sys.path.remove(""); from pkg_resources import load_entry_point; load_entry_point("pip", "console_scripts", "pip")()' install {opts} {packages}
# Same as above.
list_dependencies_command
=
{envbindir}/pip freeze
list_dependencies_command
=
{envbindir}/pip freeze
--all
setenv
=
COVERAGE_FILE={toxworkdir}/.coverage.{envname}
# TODO: The passed environment variables came from copying other tox.ini files
# These should probably be individually annotated to explain what needs them.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment