56 lines
1.4 KiB
Diff
56 lines
1.4 KiB
Diff
From 939c515f2cc01525cbbd71f26e71d21471abdc93 Mon Sep 17 00:00:00 2001
|
|
From: "Jason R. Coombs" <jaraco@jaraco.com>
|
|
Date: Mon, 17 Dec 2018 12:17:02 -0500
|
|
Subject: [PATCH] Rely on pep517 0.5
|
|
|
|
---
|
|
install-pip-master.py | 21 ---------------------
|
|
tox.ini | 5 +----
|
|
2 files changed, 1 insertion(+), 25 deletions(-)
|
|
delete mode 100644 install-pip-master.py
|
|
|
|
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
|