From b54e73aa4f2ca9ca2773b3078d0910804e2a2459 Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Thu, 2 Oct 2014 07:56:40 +0000 Subject: [PATCH] Try for resolving dependencies install --- MANIFEST.in | 1 + distutils.ext/obidistutils/core.py | 27 ++++++++++++++++++++------- requirements.txt | 5 +++++ 3 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 requirements.txt diff --git a/MANIFEST.in b/MANIFEST.in index 7435676..1ffb96b 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -7,4 +7,5 @@ recursive-include doc/sphinx/source *.txt *.rst *.py include doc/sphinx/make.bat include doc/sphinx/Makefile include README.txt +include requirements.txt diff --git a/distutils.ext/obidistutils/core.py b/distutils.ext/obidistutils/core.py index 9d60f9f..aea1a7b 100644 --- a/distutils.ext/obidistutils/core.py +++ b/distutils.ext/obidistutils/core.py @@ -8,6 +8,14 @@ from os import path import os.path import glob + +try: + from setuptools import setup as ori_setup + has_setuptools = True +except ImportError: + from distutils.core import setup as ori_setup + has_setuptools = False + from distutils.core import setup as ori_setup from distutils.extension import Extension @@ -119,6 +127,18 @@ CEXES =[] FILES =[] def setup(**attrs): + + if has_setuptools: + try: + requirements = open('requirements.txt').readlines() + requirements = [x.strip() for x in requirements] + + if 'install_requires' not in attrs: + attrs['install_requires']=requirements + else: + attrs['install_requires'].extend(requirements) + except IOError: + pass if 'distclass' not in attrs: attrs['distclass']=Distribution @@ -141,13 +161,6 @@ def setup(**attrs): if 'cmdclass' not in attrs: attrs['cmdclass'] = COMMANDS - if 'requires' not in attrs: - attrs['requires'] = [] - - attrs['requires'].append('Cython (>=0.21)') - attrs['requires'].append('Sphinx (>=1.2.0)') - attrs['requires'].append('wheel (>=0.24.0)') - attrs['requires'].append('virtualenv (>=1.11.0)') if 'ctools' not in attrs: attrs['ctools'] = CTOOLS diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..809b7c5 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,5 @@ +-i https://pypi.python.org/simple/ +Cython>=0.21 +Sphinx>=1.2.0 +wheel>=0.24.0 +virtualenv>=1.11.0 -- GitLab