From eae7bea4f609b151b6276c6207fbc41b4e565b1f Mon Sep 17 00:00:00 2001 From: Dan Colish Date: Thu, 1 Mar 2012 16:17:03 -0800 Subject: [PATCH] Add requirements.txt to sdist and allow setup.py to use setuptools if detected in environment --- MANIFEST.in | 1 + setup.py | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/MANIFEST.in b/MANIFEST.in index 7c985df0444..7802228b732 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,4 @@ include AUTHORS include LICENSE include README.rst +include requirements.txt \ No newline at end of file diff --git a/setup.py b/setup.py index c88f81cc76e..3370e8bad71 100755 --- a/setup.py +++ b/setup.py @@ -11,6 +11,9 @@ from distutils.command.sdist import sdist from distutils.cmd import Command from distutils.sysconfig import get_python_lib, PREFIX +if os.environ.get('VIRTUAL_ENV'): + from setuptools import setup + execfile('salt/version.py') class TestCommand(Command): @@ -48,6 +51,10 @@ else: libraries = ['ws2_32'] if sys.platform == 'win32' else [] +requirements='' +with open('requirements.txt') as f: + requirements = f.read() + setup( name=NAME, version=VER, @@ -108,4 +115,5 @@ setup( ['doc/man/salt.7', ]), ], + install_requires=requirements, )