Merge lp:~jaypipes/glance/packaging into lp:~hudson-openstack/glance/trunk

Proposed by Jay Pipes
Status: Merged
Approved by: Christopher MacGown
Approved revision: 19
Merged at revision: 18
Proposed branch: lp:~jaypipes/glance/packaging
Merge into: lp:~hudson-openstack/glance/trunk
Diff against target: 87 lines (+54/-2)
4 files modified
MANIFEST.in (+5/-0)
builddeb.sh (+19/-0)
pylintrc (+27/-0)
setup.py (+3/-2)
To merge this branch: bzr merge lp:~jaypipes/glance/packaging
Reviewer Review Type Date Requested Status
Eric Day (community) Approve
Christopher MacGown (community) Approve
Monty Taylor Pending
Review via email: mp+39087@code.launchpad.net

Description of the change

packaging fixups preparing for release candidate

To post a comment you must log in.
Revision history for this message
Christopher MacGown (0x44) wrote :

lgtm

review: Approve
Revision history for this message
Eric Day (eday) wrote :

I think we should just rename the bin/* files instead of creating symlinks, any reason why you didn't?

review: Needs Information
lp:~jaypipes/glance/packaging updated
19. By Jay Pipes

Remove symlinks in bin/

Revision history for this message
Eric Day (eday) wrote :

lgtm!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'MANIFEST.in'
2--- MANIFEST.in 1970-01-01 00:00:00 +0000
3+++ MANIFEST.in 2010-10-21 20:36:51 +0000
4@@ -0,0 +1,5 @@
5+include LICENSE run_tests.sh ChangeLog
6+include README builddeb.sh
7+include MANIFEST.in pylintrc
8+graft doc
9+graft tools
10
11=== renamed file 'bin/parallax-server.py' => 'bin/parallax-server'
12=== renamed file 'bin/teller-server.py' => 'bin/teller-server'
13=== added file 'builddeb.sh'
14--- builddeb.sh 1970-01-01 00:00:00 +0000
15+++ builddeb.sh 2010-10-21 20:36:51 +0000
16@@ -0,0 +1,19 @@
17+#!/bin/sh
18+
19+# Copyright 2010 OpenStack, LLC
20+# All Rights Reserved.
21+#
22+# Licensed under the Apache License, Version 2.0 (the "License"); you may
23+# not use this file except in compliance with the License. You may obtain
24+# a copy of the License at
25+#
26+# http://www.apache.org/licenses/LICENSE-2.0
27+#
28+# Unless required by applicable law or agreed to in writing, software
29+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
30+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
31+# License for the specific language governing permissions and limitations
32+# under the License.
33+
34+dpkg-buildpackage -b -rfakeroot -tc -uc -D
35+
36
37=== added file 'pylintrc'
38--- pylintrc 1970-01-01 00:00:00 +0000
39+++ pylintrc 2010-10-21 20:36:51 +0000
40@@ -0,0 +1,27 @@
41+[Messages Control]
42+# W0511: TODOs in code comments are fine.
43+# W0142: *args and **kwargs are fine.
44+# W0622: Redefining id is fine.
45+disable-msg=W0511,W0142,W0622
46+
47+[Basic]
48+# Variable names can be 1 to 31 characters long, with lowercase and underscores
49+variable-rgx=[a-z_][a-z0-9_]{0,30}$
50+
51+# Argument names can be 2 to 31 characters long, with lowercase and underscores
52+argument-rgx=[a-z_][a-z0-9_]{1,30}$
53+
54+# Method names should be at least 3 characters long
55+# and be lowecased with underscores
56+method-rgx=[a-z_][a-z0-9_]{2,50}$
57+
58+# Module names matching nova-* are ok (files in bin/)
59+module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+)|(nova-[a-z0-9_-]+))$
60+
61+# Don't require docstrings on tests.
62+no-docstring-rgx=((__.*__)|([tT]est.*)|setUp|tearDown)$
63+
64+[Design]
65+max-public-methods=100
66+min-public-methods=0
67+max-args=6
68
69=== modified file 'setup.py'
70--- setup.py 2010-09-27 22:43:04 +0000
71+++ setup.py 2010-10-21 20:36:51 +0000
72@@ -46,7 +46,7 @@
73 author='OpenStack, LLC.',
74 author_email='openstack-admins@lists.launchpad.net',
75 url='https://launchpad.net/glance',
76- packages=find_packages(exclude=['test', 'bin']),
77+ packages=find_packages(exclude=['tests', 'bin']),
78 test_suite='nose.collector',
79 cmdclass={'sdist': local_sdist},
80 classifiers=[
81@@ -57,4 +57,5 @@
82 'Environment :: No Input/Output (Daemon)',
83 ],
84 install_requires=[], # removed for better compat
85- scripts=[])
86+ scripts=['bin/parallax-server',
87+ 'bin/teller-server'])

Subscribers

People subscribed via source and target branches