mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@26c91a9
This commit is contained in:
@@ -0,0 +1,34 @@
|
||||
From 44fb453931c611d4822343debe902cca8e1c8afe Mon Sep 17 00:00:00 2001
|
||||
From: Scott Kitterman <sklist@kitterman.com>
|
||||
Date: Tue, 26 May 2020 20:08:16 -0400
|
||||
Subject: [PATCH] Remove spurious requirement for wheel (#596)
|
||||
|
||||
* Remove spurious requirement for wheel
|
||||
|
||||
* Put wheel back in pyproject.toml
|
||||
|
||||
Co-authored-by: Scott Kitterman <scott@kitterman.com>
|
||||
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
|
||||
[james.hilliard1@gmail.com: backport from upstream commit
|
||||
44fb453931c611d4822343debe902cca8e1c8afe]
|
||||
---
|
||||
setup.py | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 9319c1c..d82a7fe 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -35,8 +35,7 @@ except ImportError:
|
||||
|
||||
|
||||
requirements = ["six"]
|
||||
-setup_requirements = ["setuptools",
|
||||
- "wheel"]
|
||||
+setup_requirements = ["setuptools"]
|
||||
test_requirements = ["pytest>=3.2.1,!=3.3.0",
|
||||
"hypothesis>=3.27.0"]
|
||||
docs_requirements = ["sphinx>=1.6.5",
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# md5, sha256 from https://pypi.org/pypi/pynacl/json
|
||||
md5 1db3e111775fbe6b66772ff30af7a956 PyNaCl-1.2.1.tar.gz
|
||||
sha256 e0d38fa0a75f65f556fb912f2c6790d1fa29b7dd27a1d9cc5591b281321eaaa9 PyNaCl-1.2.1.tar.gz
|
||||
md5 8c6c57893327a694c72510fb620e4744 PyNaCl-1.4.0.tar.gz
|
||||
sha256 54e9a2c849c742006516ad56a88f5c74bf2ce92c9f67435187c3c5953b346505 PyNaCl-1.4.0.tar.gz
|
||||
# Locally computed sha256 checksums
|
||||
sha256 d3174ad63e721d4c9dccb8ad4320848992d314369bc46319720b5802c9153fe9 LICENSE
|
||||
sha256 d3174ad63e721d4c9dccb8ad4320848992d314369bc46319720b5802c9153fe9 LICENSE
|
||||
|
||||
@@ -4,9 +4,9 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_PYNACL_VERSION = 1.2.1
|
||||
PYTHON_PYNACL_VERSION = 1.4.0
|
||||
PYTHON_PYNACL_SOURCE = PyNaCl-$(PYTHON_PYNACL_VERSION).tar.gz
|
||||
PYTHON_PYNACL_SITE = https://files.pythonhosted.org/packages/08/19/cf56e60efd122fa6d2228118a9b345455b13ffe16a14be81d025b03b261f
|
||||
PYTHON_PYNACL_SITE = https://files.pythonhosted.org/packages/cf/5a/25aeb636baeceab15c8e57e66b8aa930c011ec1c035f284170cacb05025e
|
||||
PYTHON_PYNACL_LICENSE = Apache-2.0
|
||||
PYTHON_PYNACL_LICENSE_FILES = LICENSE
|
||||
PYTHON_PYNACL_SETUP_TYPE = setuptools
|
||||
|
||||
Reference in New Issue
Block a user