libdep-service-python

Merge lp:~jml/libdep-service-python/egg-info into lp:libdep-service-python

  1. egg-info
  2. Merge into trunk
Proposed by Jonathan Lange
Status: Merged
Approved by: Jonathan Lange
Approved revision: 8
Merged at revision: 11
Proposed branch: lp:~jml/libdep-service-python/egg-info
Merge into: lp:libdep-service-python
Diff against target: 50 lines (+16/-2)
3 files modified
distribute_setup.py (+1/-1)
setup.py (+11/-0)
versions.cfg (+4/-1)
To merge this branch: bzr merge lp:~jml/libdep-service-python/egg-info
Reviewer Review Type Date Requested Status
Jonathan Lange (community) Approve
Review via email: mp+130331@code.launchpad.net

Commit message

Use distribute_setup for building

Description of the change

We weren't using distribute_setup. Hence, no egg-info, hence no distribution found.

To post a comment you must log in.
Revision history for this message
Jonathan Lange (jml) wrote :

Please feel free to post-review.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'distribute_setup.py'
2--- distribute_setup.py 2012-08-28 16:25:44 +0000
3+++ distribute_setup.py 2012-10-18 12:47:19 +0000
4@@ -46,7 +46,7 @@
5 args = [quote(arg) for arg in args]
6 return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
7
8-DEFAULT_VERSION = "0.6.28"
9+DEFAULT_VERSION = "0.6.29DEV"
10 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
11 SETUPTOOLS_FAKED_VERSION = "0.6c11"
12
13
14=== modified file 'setup.py'
15--- setup.py 2012-10-11 15:24:35 +0000
16+++ setup.py 2012-10-18 12:47:19 +0000
17@@ -12,6 +12,17 @@
18 # You should have received a copy of the GNU General Public License
19 # along with this program. If not, see <http://www.gnu.org/licenses/>.
20
21+import distribute_setup
22+# What is specified here is the minimum version, and the version
23+# that will be installed if there isn't one already. We specify
24+# it so that we can update distribute_setup without it implying
25+# that we require the latest version, which can cause unnecessary
26+# updating, and can fail if there is a version conflict.
27+# If we do require a higher minimum version then update it here
28+# and ensure that distribute_setup is at least as new as that
29+# version.
30+distribute_setup.use_setuptools(version='0.6.10')
31+
32 from setup_helpers import get_version
33 from setuptools import setup, find_packages
34
35
36=== modified file 'versions.cfg'
37--- versions.cfg 2012-10-17 20:30:00 +0000
38+++ versions.cfg 2012-10-18 12:47:19 +0000
39@@ -12,7 +12,10 @@
40 bzr = 2.5.1
41 Cheetah = 2.4.4
42 configglue = 1.0.3
43-distribute = 0.6.28
44+# jml's fork. Code lives at https://bitbucket.org/mumak/distribute.
45+# DEFAULT_VERSION in distribute_setup.py must match the distribute version here
46+# If you change it here, change it there.
47+distribute = 0.6.29DEV
48 django = 1.3.1
49 django-configglue = 0.6.1
50 django-openid-auth = 0.4

Subscribers

People subscribed via source and target branches