summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2018-12-17 12:17:02 -0500
committerJason R. Coombs <jaraco@jaraco.com>2018-12-17 12:27:36 -0500
commit939c515f2cc01525cbbd71f26e71d21471abdc93 (patch)
treeba1934f9dfa5271e03d23ffee3a4ee057c853e30
parentbc8a6cdf948376e1c846a121a4e8e4a699c66909 (diff)
downloadpytest-runner-939c515f2cc01525cbbd71f26e71d21471abdc93.tar.gz
Rely on pep517 0.5
-rw-r--r--install-pip-master.py21
-rw-r--r--tox.ini5
2 files changed, 1 insertions, 25 deletions
diff --git a/install-pip-master.py b/install-pip-master.py
deleted file mode 100644
index d62d20f..0000000
--- a/install-pip-master.py
+++ /dev/null
@@ -1,21 +0,0 @@
-"""
-In order to support installation of pep517 from source,
-pip from master must be installed.
-"""
-
-import subprocess
-import sys
-
-
-def main():
- cmd = [
- sys.executable,
- '-m', 'pip', 'install',
- 'git+https://github.com/pypa/pip',
- ]
- subprocess.run(cmd)
- cmd[-1:] = sys.argv[1:]
- subprocess.run(cmd)
-
-
-__name__ == '__main__' and main()
diff --git a/tox.ini b/tox.ini
index 853d7de..70b0be7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -20,11 +20,8 @@ commands =
[testenv:release]
skip_install = True
-# workaround for pep517 build support
-install_command = python install-pip-master.py {opts} {packages}
deps =
- # pull from feature branch for feature
- git+https://github.com/pypa/pep517@feature/build-command
+ pep517>=0.5
# workaround for https://github.com/pypa/twine/issues/423
git+https://github.com/pypa/twine
path.py