1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
|
Description: Migrate from distutils to setuptools.
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Forwarded: pending, upstream maintainer is MIA
--- a/setup.py
+++ b/setup.py
@@ -30,12 +30,12 @@
import glob
import subprocess
from os.path import dirname, abspath, join, split
-from distutils.core import Extension, Command
-from distutils import version
-from distutils.command.build_ext import build_ext
-from distutils.sysconfig import customize_compiler
+from setuptools import Extension, Command
+from setuptools.command.build_ext import build_ext
+from setuptools._distutils.sysconfig import customize_compiler
from contextlib import contextmanager
from subprocess import getstatusoutput
+import DistUtilsExtra.auto
# Building in pbuilder for Precise with Python 3.2 and
# python3-distutils-extra 2.34-0ubuntu0.1
@@ -46,16 +46,6 @@
import locale
locale.getpreferredencoding = lambda *x: 'UTF-8'
-try:
- import DistUtilsExtra.auto
-except ImportError:
- print('To build Onboard you need https://launchpad.net/python-distutils-extra', file=sys.stderr)
- sys.exit(1)
-
-current_ver = version.StrictVersion(DistUtilsExtra.auto.__version__)
-required_ver = version.StrictVersion('2.12')
-assert current_ver >= required_ver , 'needs DistUtilsExtra.auto >= 2.12'
-
project_root = dirname(abspath(__file__))
build_root = join(project_root, 'build', 'lib*{}.*' \
.format(sys.version_info.major))
@@ -353,7 +343,6 @@
return True
-
# Custom build_i18n command that overrides the hard-coded
# auto-start path "share/autostart" in auto.build_i18n_auto
# for "onboard-autostart.desktop.in"
--- a/Onboard/pypredict/attic/setup.py
+++ b/Onboard/pypredict/attic/setup.py
@@ -20,7 +20,7 @@
import os
import glob
import sys
-from distutils.core import setup, Extension
+from setuptools import setup, Extension
from os.path import join
try:
|
