7a9a0ba90f
- The test_debian test now uses port 80 for ubuntu keyserver - Fix too frequent systemd service restart in test_system test - Added: * fix-test_debian-to-work-in-our-infrastructure-676.patch * fix-test_system-flaky-setup_teardown-fn.patch * fix-deprecated-code-677.patch OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=255
34 lines
1.0 KiB
Diff
34 lines
1.0 KiB
Diff
From d2b4c8170d7ff30bf33623fcbbb6ebb6d7af934e Mon Sep 17 00:00:00 2001
|
|
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
|
|
|
|
---
|
|
setup.py | 8 --------
|
|
1 file changed, 8 deletions(-)
|
|
|
|
diff --git a/setup.py b/setup.py
|
|
index e60f1b7085..8ca8a66d45 100755
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -632,14 +632,6 @@ class Install(install):
|
|
install.finalize_options(self)
|
|
|
|
def run(self):
|
|
- if LooseVersion(setuptools.__version__) < LooseVersion("9.1"):
|
|
- sys.stderr.write(
|
|
- "\n\nInstalling Salt requires setuptools >= 9.1\n"
|
|
- "Available setuptools version is {}\n\n".format(setuptools.__version__)
|
|
- )
|
|
- sys.stderr.flush()
|
|
- sys.exit(1)
|
|
-
|
|
# Let's set the running_salt_install attribute so we can add
|
|
# _version.txt in the build command
|
|
self.distribution.running_salt_install = True
|
|
--
|
|
2.39.2
|
|
|
|
|