Commit f6c75e8a by Eric Coissac

patch the obidistutils extention to rely on setuptools.

parent fd976f7d
...@@ -104,8 +104,7 @@ try: ...@@ -104,8 +104,7 @@ try:
sub_commands = [('build_files',has_files), sub_commands = [('build_files',has_files),
('build_cexe', has_executables) ('build_cexe', has_executables)
] + \ ] + ori_build_ext.sub_commands
ori_build_ext.sub_commands
except ImportError: except ImportError:
from distutils.command import build_ext # @UnusedImport from distutils.command import build_ext # @UnusedImport
......
...@@ -9,12 +9,12 @@ import os.path ...@@ -9,12 +9,12 @@ import os.path
import glob import glob
import sys import sys
# try: try:
# from setuptools.extension import Extension from setuptools.extension import Extension
# except ImportError: except ImportError:
# from distutils.extension import Extension from distutils.extension import Extension
from distutils.extension import Extension # from distutils.extension import Extension
from obidistutils.serenity.checkpackage import install_requirements,\ from obidistutils.serenity.checkpackage import install_requirements,\
check_requirements, \ check_requirements, \
......
...@@ -4,12 +4,12 @@ Created on 20 oct. 2012 ...@@ -4,12 +4,12 @@ Created on 20 oct. 2012
@author: coissac @author: coissac
''' '''
# try: try:
# from setuptools.dist import Distribution as ori_Distribution from setuptools.dist import Distribution as ori_Distribution
# except ImportError: except ImportError:
# from distutils.dist import Distribution as ori_Distribution from distutils.dist import Distribution as ori_Distribution
from distutils.dist import Distribution as ori_Distribution # from distutils.dist import Distribution as ori_Distribution
class Distribution(ori_Distribution): class Distribution(ori_Distribution):
......
...@@ -81,9 +81,15 @@ def serenity_mode(package,version): ...@@ -81,9 +81,15 @@ def serenity_mode(package,version):
argparser.add_argument('--serenity', argparser.add_argument('--serenity',
dest='serenity', dest='serenity',
action='store_true', action='store_true',
default=False, default=True,
help='Switch the installer in serenity mode. Everythings are installed in a virtualenv') help='Switch the installer in serenity mode. Everythings are installed in a virtualenv')
argparser.add_argument('--no-serenity',
dest='serenity',
action='store_false',
default=True,
help='Switch the installer in the no serenity mode.')
argparser.add_argument('--virtualenv', argparser.add_argument('--virtualenv',
dest='virtual', dest='virtual',
type=str, type=str,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment