File: remove_upstream_setup_deps.diff

package info (click to toggle)
tahoe-lafs 1.9.2-1
  • links: PTS, VCS
  • area: main
  • in suites: wheezy
  • size: 7,240 kB
  • sloc: python: 71,758; makefile: 215; lisp: 89
file content (54 lines) | stat: -rw-r--r-- 2,187 bytes parent folder | download
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
Description: Remove upstream setup dependencies.
 Tahoe-lafs setup uses a custom setuptools which rely on darcsver to do some
 smart guessings. This isn't relevant in Debian and needs to be ignored.
Author: bertagaz <bertagaz@ptitcanardnoir.org>
Index: tahoe/setup.py
===================================================================
--- tahoe.orig/setup.py	2012-07-04 21:41:43.295659068 +0200
+++ tahoe/setup.py	2012-07-04 21:42:07.535159561 +0200
@@ -68,13 +68,13 @@
     del sys.argv[1]
     install_requires += ["fakedependency >= 1.0.0"]
 
-__requires__ = install_requires[:]
+#__requires__ = install_requires[:]
 
-egg = os.path.realpath(glob.glob('setuptools-*.egg')[0])
-sys.path.insert(0, egg)
-egg = os.path.realpath(glob.glob('darcsver-*.egg')[0])
-sys.path.insert(0, egg)
-import setuptools; setuptools.bootstrap_install_from = egg
+#egg = os.path.realpath(glob.glob('setuptools-*.egg')[0])
+#sys.path.insert(0, egg)
+#egg = os.path.realpath(glob.glob('darcsver-*.egg')[0])
+#sys.path.insert(0, egg)
+#import setuptools; setuptools.bootstrap_install_from = egg
 
 from setuptools import setup
 from setuptools.command import sdist
@@ -476,7 +476,7 @@
       package_data={"allmydata.web": ["*.xhtml"],
                     "allmydata.web.static": ["*.js", "*.png", "*.css"],
                     },
-      setup_requires=setup_requires,
+      #setup_requires=setup_requires,
       entry_points = { 'console_scripts': [ 'tahoe = allmydata.scripts.runner:run' ] },
       zip_safe=False, # We prefer unzipped for easier access.
       versionfiles=['src/allmydata/_version.py',],
Index: tahoe/setup.cfg
===================================================================
--- tahoe.orig/setup.cfg	2012-07-04 21:41:43.295659068 +0200
+++ tahoe/setup.cfg	2012-07-04 21:58:29.839700075 +0200
@@ -9,12 +9,3 @@
 tag_date = 0
 tag_svn_revision = 0
 
-[aliases]
-sdist_dsc = update_version sdist_dsc
-sdist = update_version sdist
-trial = update_version trial
-build = update_version develop --prefix=support make_executable build
-install = update_version install
-test = update_version develop --prefix=support make_executable build trial
-bdist_egg = update_version bdist_egg
-