2021-01-08 13:41:50 +01:00
|
|
|
From 64c2735b64a074acc1ef05a82f9fcf342426f87e Mon Sep 17 00:00:00 2001
|
2020-04-07 14:14:01 +02:00
|
|
|
From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
|
|
|
|
<psuarezhernandez@suse.com>
|
|
|
|
Date: Wed, 25 Mar 2020 13:09:52 +0000
|
|
|
|
Subject: [PATCH] Make setup.py script to not require setuptools > 9.1
|
|
|
|
|
|
|
|
---
|
2020-04-30 16:20:16 +02:00
|
|
|
setup.py | 8 --------
|
|
|
|
1 file changed, 8 deletions(-)
|
2020-04-07 14:14:01 +02:00
|
|
|
|
|
|
|
diff --git a/setup.py b/setup.py
|
2021-01-08 13:41:50 +01:00
|
|
|
index 39a66fefba..d9c3d6e303 100755
|
2020-04-07 14:14:01 +02:00
|
|
|
--- a/setup.py
|
|
|
|
+++ b/setup.py
|
2021-01-08 13:41:50 +01:00
|
|
|
@@ -805,14 +805,6 @@ class Install(install):
|
2020-04-07 14:14:01 +02:00
|
|
|
install.finalize_options(self)
|
|
|
|
|
|
|
|
def run(self):
|
2021-01-08 13:41:50 +01:00
|
|
|
- if LooseVersion(setuptools.__version__) < LooseVersion("9.1"):
|
2020-04-07 14:14:01 +02:00
|
|
|
- sys.stderr.write(
|
2021-01-08 13:41:50 +01:00
|
|
|
- "\n\nInstalling Salt requires setuptools >= 9.1\n"
|
|
|
|
- "Available setuptools version is {}\n\n".format(setuptools.__version__)
|
2020-04-07 14:14:01 +02:00
|
|
|
- )
|
|
|
|
- sys.stderr.flush()
|
|
|
|
- sys.exit(1)
|
|
|
|
-
|
|
|
|
# Let's set the running_salt_install attribute so we can add
|
|
|
|
# _version.py in the build command
|
|
|
|
self.distribution.running_salt_install = True
|
|
|
|
--
|
2021-01-08 13:41:50 +01:00
|
|
|
2.29.2
|
2020-04-07 14:14:01 +02:00
|
|
|
|
|
|
|
|