Merge lp:~coreygoldberg/python-swiftclient/py3-packaging-swiftclient into lp:~ubuntu-server-dev/python-swiftclient/juno

Proposed by Corey Goldberg
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp:~coreygoldberg/python-swiftclient/py3-packaging-swiftclient
Merge into: lp:~ubuntu-server-dev/python-swiftclient/juno
Diff against target: 110 lines (+51/-4)
6 files modified
debian/control (+46/-3)
debian/py3dist-overrides (+1/-0)
debian/python-swiftclient.install (+1/-0)
debian/python3-swiftclient.install (+1/-0)
debian/rules (+1/-1)
debian/swiftclient-bin.install (+1/-0)
To merge this branch: bzr merge lp:~coreygoldberg/python-swiftclient/py3-packaging-swiftclient
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+234721@code.launchpad.net

Commit message

Packaging for python3-swiftclient

Description of the change

Packaging for python3-swiftclient

Note:
I couldn't find a reason to keep the dependency on python-eventlet, so i removed it from python3 client package. (Also there is no python3-eventlet packaged). However, I left it alone in python-swiftclient package. Please advise if I should remove also.

Note:
the python3-swiftclient package has a dependency on python3-keystoneclient, which is not available yet (MP has been sent for packing that)

To post a comment you must log in.
46. By Corey Goldberg

updated build rules for py3

47. By Corey Goldberg

packaging fix

48. By Corey Goldberg

packaging fixes

49. By Corey Goldberg

added py3dist-overrides

50. By Corey Goldberg

evenlet dependency removed

Revision history for this message
Barry Warsaw (barry) wrote :

Comments provided inline.

51. By Corey Goldberg

packaging fix. split out swiftclient-bin

52. By Corey Goldberg

packaging fix. removed bin rename

Revision history for this message
Martin Pitt (pitti) wrote :

python3-swiftclient is in wily, so this was done already.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2014-08-27 18:07:43 +0000
3+++ debian/control 2014-09-30 18:02:36 +0000
4@@ -19,9 +19,23 @@
5 python-six (>= 1.5.2),
6 python-subunit,
7 python-testtools,
8+ python3-all (>= 3.4),
9+ python3-coverage,
10+ python3-fixtures,
11+ python3-httplib2,
12+ python3-keystoneclient,
13+ python3-mock,
14+ python3-pbr,
15+ python3-requests (>= 1.1),
16+ python3-setuptools,
17+ python3-simplejson (>= 2.0.9),
18+ python3-six (>= 1.5.2),
19+ python3-subunit,
20+ python3-testtools,
21 testrepository
22 Standards-Version: 3.9.4
23 X-Python-Version: >= 2.7
24+X-Python3-Version: >= 3.4
25 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/python-swiftclient/juno/files
26 Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/python-swiftclient/juno
27 XS-Testsuite: autopkgtest
28@@ -29,7 +43,6 @@
29 Package: python-swiftclient
30 Architecture: all
31 Depends:
32- python-eventlet,
33 python-httplib2,
34 python-keystoneclient,
35 python-requests (>= 1.1),
36@@ -41,5 +54,35 @@
37 Breaks: swift ( << 1.7.4-0ubuntu2)
38 Replaces: swift ( << 1.7.4-0ubuntu2)
39 Description: Client library for Openstack Swift API.
40- This is a client for the OpenStack Swift API. There's a Python API
41- (the ``swiftclient`` module), and a command-line script (``swift``).
42+ .
43+ This is the Python 2 version.
44+
45+Package: python3-swiftclient
46+Architecture: all
47+Depends:
48+ python3-httplib2,
49+ python3-keystoneclient,
50+ python3-requests (>= 1.1),
51+ python3-setuptools,
52+ python3-simplejson (>= 2.0.9),
53+ python3-six (>= 1.5.2),
54+ ${misc:Depends},
55+ ${python3:Depends}
56+Description: Client library for Openstack Swift API.
57+ .
58+ This is the Python 3 version.
59+
60+Package: swiftclient-bin
61+Architecture: all
62+Depends:
63+ python3-httplib2,
64+ python3-keystoneclient,
65+ python3-requests (>= 1.1),
66+ python3-setuptools,
67+ python3-simplejson (>= 2.0.9),
68+ python3-six (>= 1.5.2),
69+ ${misc:Depends},
70+ ${python3:Depends}
71+Description: Client library for Openstack Swift API.
72+ .
73+ Provides the command-line script ``swift``.
74
75=== added file 'debian/py3dist-overrides'
76--- debian/py3dist-overrides 1970-01-01 00:00:00 +0000
77+++ debian/py3dist-overrides 2014-09-30 18:02:36 +0000
78@@ -0,0 +1,1 @@
79+argparse
80
81=== added file 'debian/python-swiftclient.install'
82--- debian/python-swiftclient.install 1970-01-01 00:00:00 +0000
83+++ debian/python-swiftclient.install 2014-09-30 18:02:36 +0000
84@@ -0,0 +1,1 @@
85+usr/lib/python2*
86
87=== added file 'debian/python3-swiftclient.install'
88--- debian/python3-swiftclient.install 1970-01-01 00:00:00 +0000
89+++ debian/python3-swiftclient.install 2014-09-30 18:02:36 +0000
90@@ -0,0 +1,1 @@
91+usr/lib/python3*
92
93=== modified file 'debian/rules'
94--- debian/rules 2013-05-21 15:46:13 +0000
95+++ debian/rules 2014-09-30 18:02:36 +0000
96@@ -4,7 +4,7 @@
97 #export DH_VERBOSE=1
98
99 %:
100- dh $@ --with python2
101+ dh $@ --with python2,python3 --buildsystem=pybuild
102
103 override_dh_auto_test:
104 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
105
106=== added file 'debian/swiftclient-bin.install'
107--- debian/swiftclient-bin.install 1970-01-01 00:00:00 +0000
108+++ debian/swiftclient-bin.install 2014-09-30 18:02:36 +0000
109@@ -0,0 +1,1 @@
110+usr/bin/swift

Subscribers

People subscribed via source and target branches