1 | Index: setup.py |
---|
2 | =================================================================== |
---|
3 | --- setup.py (revision 14803) |
---|
4 | +++ setup.py (working copy) |
---|
5 | @@ -1,50 +1,74 @@ |
---|
6 | #!/usr/bin/python |
---|
7 | # -*- test-case-name: "nevow.test -xformless.test" -*- |
---|
8 | |
---|
9 | -import os.path |
---|
10 | -from distutils.core import setup |
---|
11 | -import glob |
---|
12 | -import sys |
---|
13 | -import setupcommon |
---|
14 | +try: |
---|
15 | + import setuptools |
---|
16 | +except ImportError: |
---|
17 | + # No setuptools -- then we do the following setup script: |
---|
18 | + import os.path |
---|
19 | + from distutils.core import setup |
---|
20 | + import glob |
---|
21 | + import sys |
---|
22 | + import setupcommon |
---|
23 | |
---|
24 | -# Where should our data files go? |
---|
25 | -# They want to go in our package directory , which is under site-packages. |
---|
26 | -# We determine the location of site-packages here, for later use. It will be |
---|
27 | -# interpreted as relative to sys.prefix. |
---|
28 | -# This junk can go once we decide to drop Python 2.3 support or switch to |
---|
29 | -# setuptools. package_data is a much cleaner solution. |
---|
30 | -if sys.platform.lower().startswith('win'): |
---|
31 | - site_packages = 'Lib/site-packages/' |
---|
32 | -else: |
---|
33 | - version = '.'.join([str(i) for i in sys.version_info[:2]]) |
---|
34 | - site_packages = 'lib/python' + version + '/site-packages/' |
---|
35 | + # Where should our data files go? |
---|
36 | + # They want to go in our package directory , which is under site-packages. |
---|
37 | + # We determine the location of site-packages here, for later use. It will be |
---|
38 | + # interpreted as relative to sys.prefix. |
---|
39 | + # This junk can go once we decide to drop Python 2.3 support or switch to |
---|
40 | + # setuptools. package_data is a much cleaner solution. |
---|
41 | + if sys.platform.lower().startswith('win'): |
---|
42 | + site_packages = 'Lib/site-packages/' |
---|
43 | + else: |
---|
44 | + version = '.'.join([str(i) for i in sys.version_info[:2]]) |
---|
45 | + site_packages = 'lib/python' + version + '/site-packages/' |
---|
46 | |
---|
47 | -# Turn the package_data into a data_files for 2.3 compatability |
---|
48 | -data_files = [] |
---|
49 | -for pkg, patterns in setupcommon.package_data.items(): |
---|
50 | - pkgdir = os.path.join(*pkg.split('.')) |
---|
51 | - for pattern in patterns: |
---|
52 | - globdir = os.path.dirname(pattern) |
---|
53 | - files = glob.glob(os.path.join(pkgdir, pattern)) |
---|
54 | - data_files.append((os.path.join(site_packages,pkgdir,globdir),files)) |
---|
55 | + # Turn the package_data into a data_files for 2.3 compatability |
---|
56 | + data_files = [] |
---|
57 | + for pkg, patterns in setupcommon.package_data.items(): |
---|
58 | + pkgdir = os.path.join(*pkg.split('.')) |
---|
59 | + for pattern in patterns: |
---|
60 | + globdir = os.path.dirname(pattern) |
---|
61 | + files = glob.glob(os.path.join(pkgdir, pattern)) |
---|
62 | + data_files.append((os.path.join(site_packages,pkgdir,globdir),files)) |
---|
63 | |
---|
64 | -# We need to list the packages explicitly. |
---|
65 | -packages = [ |
---|
66 | - 'formless', 'formless.test', 'nevow', 'nevow.flat', |
---|
67 | - 'nevow.scripts', 'nevow.test', 'nevow.taglibrary', |
---|
68 | - 'nevow.plugins', 'nevow.livetrial', 'twisted.plugins'] |
---|
69 | + # We need to list the packages explicitly. |
---|
70 | + packages = [ |
---|
71 | + 'formless', 'formless.test', 'nevow', 'nevow.flat', |
---|
72 | + 'nevow.scripts', 'nevow.test', 'nevow.taglibrary', |
---|
73 | + 'nevow.plugins', 'nevow.livetrial', 'twisted.plugins'] |
---|
74 | |
---|
75 | -setup( |
---|
76 | - name=setupcommon.name, |
---|
77 | - version=setupcommon.version, |
---|
78 | - maintainer=setupcommon.maintainer, |
---|
79 | - maintainer_email=setupcommon.maintainer_email, |
---|
80 | - description=setupcommon.description, |
---|
81 | - url=setupcommon.url, |
---|
82 | - license=setupcommon.license, |
---|
83 | - platforms=setupcommon.platforms, |
---|
84 | - classifiers=setupcommon.classifiers, |
---|
85 | - packages=packages, |
---|
86 | - scripts=setupcommon.scripts, |
---|
87 | - data_files=data_files, |
---|
88 | - ) |
---|
89 | + setup( |
---|
90 | + name=setupcommon.name, |
---|
91 | + version=setupcommon.version, |
---|
92 | + maintainer=setupcommon.maintainer, |
---|
93 | + maintainer_email=setupcommon.maintainer_email, |
---|
94 | + description=setupcommon.description, |
---|
95 | + url=setupcommon.url, |
---|
96 | + license=setupcommon.license, |
---|
97 | + platforms=setupcommon.platforms, |
---|
98 | + classifiers=setupcommon.classifiers, |
---|
99 | + packages=packages, |
---|
100 | + scripts=setupcommon.scripts, |
---|
101 | + data_files=data_files, |
---|
102 | + ) |
---|
103 | +else: |
---|
104 | + # Importing setuptools worked -- then we do the following setup script: |
---|
105 | + from setuptools import setup, find_packages |
---|
106 | + import setupcommon |
---|
107 | + |
---|
108 | + setup( |
---|
109 | + name=setupcommon.name, |
---|
110 | + version=setupcommon.version, |
---|
111 | + maintainer=setupcommon.maintainer, |
---|
112 | + maintainer_email=setupcommon.maintainer_email, |
---|
113 | + description=setupcommon.description, |
---|
114 | + url=setupcommon.url, |
---|
115 | + license=setupcommon.license, |
---|
116 | + platforms=setupcommon.platforms, |
---|
117 | + classifiers=setupcommon.classifiers, |
---|
118 | + packages=find_packages(), |
---|
119 | + scripts=setupcommon.scripts, |
---|
120 | + package_data=setupcommon.package_data, |
---|
121 | + zip_safe = True, |
---|
122 | + ) |
---|
123 | Index: setup.cfg |
---|
124 | =================================================================== |
---|
125 | --- setup.cfg (revision 14803) |
---|
126 | +++ setup.cfg (working copy) |
---|
127 | @@ -1,3 +1,5 @@ |
---|
128 | [aliases] |
---|
129 | dev = egg_info --tag-svn-revision |
---|
130 | |
---|
131 | +[easy_install] |
---|
132 | +zip_ok=False |
---|