Merge lp:~frankban/juju-quickstart/fix-manifest into lp:juju-quickstart

Proposed by Francesco Banconi
Status: Merged
Merged at revision: 58
Proposed branch: lp:~frankban/juju-quickstart/fix-manifest
Merge into: lp:juju-quickstart
Diff against target: 27 lines (+3/-1)
2 files modified
MANIFEST.in (+2/-0)
quickstart/__init__.py (+1/-1)
To merge this branch: bzr merge lp:~frankban/juju-quickstart/fix-manifest
Reviewer Review Type Date Requested Status
Juju GUI Hackers Pending
Review via email: mp+210781@code.launchpad.net

Description of the change

Add missing files to manifest.

https://codereview.appspot.com/75380044/

To post a comment you must log in.
Revision history for this message
Francesco Banconi (frankban) wrote :

Reviewers: mp+210781_code.launchpad.net,

Message:
Please take a look.

Description:
Add missing files to manifest.

https://code.launchpad.net/~frankban/juju-quickstart/fix-manifest/+merge/210781

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/75380044/

Affected files (+5, -1 lines):
   M MANIFEST.in
   A [revision details]
   M quickstart/__init__.py

Index: MANIFEST.in
=== modified file 'MANIFEST.in'
--- MANIFEST.in 2013-11-14 10:37:29 +0000
+++ MANIFEST.in 2014-03-13 11:56:58 +0000
@@ -17,8 +17,10 @@
  include COPYING
  include HACKING.rst
  include MANIFEST.in
+include Makefile
  include README.rst
  # Note: since the source requirements are dynamically generated parsing the
  # requirements.pip file, removing it from this list will break the source
  # distribution and therefore the Debian package builds. Do not do that.
  include requirements.pip
+include test-requirements.pip

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision:
<email address hidden>
+New revision:
<email address hidden>

Index: quickstart/__init__.py
=== modified file 'quickstart/__init__.py'
--- quickstart/__init__.py 2014-03-12 10:10:21 +0000
+++ quickstart/__init__.py 2014-03-13 11:56:58 +0000
@@ -22,7 +22,7 @@
  from __future__ import unicode_literals

-VERSION = (1, 1, 2)
+VERSION = (1, 1, 3)

  def get_version():

Revision history for this message
Francesco Banconi (frankban) wrote :
Revision history for this message
Francesco Banconi (frankban) wrote :

*** Submitted:

Add missing files to manifest.

R=
CC=
https://codereview.appspot.com/75380044

https://codereview.appspot.com/75380044/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'MANIFEST.in'
--- MANIFEST.in 2013-11-14 10:37:29 +0000
+++ MANIFEST.in 2014-03-13 11:58:40 +0000
@@ -17,8 +17,10 @@
17include COPYING17include COPYING
18include HACKING.rst18include HACKING.rst
19include MANIFEST.in19include MANIFEST.in
20include Makefile
20include README.rst21include README.rst
21# Note: since the source requirements are dynamically generated parsing the22# Note: since the source requirements are dynamically generated parsing the
22# requirements.pip file, removing it from this list will break the source23# requirements.pip file, removing it from this list will break the source
23# distribution and therefore the Debian package builds. Do not do that.24# distribution and therefore the Debian package builds. Do not do that.
24include requirements.pip25include requirements.pip
26include test-requirements.pip
2527
=== modified file 'quickstart/__init__.py'
--- quickstart/__init__.py 2014-03-12 10:10:21 +0000
+++ quickstart/__init__.py 2014-03-13 11:58:40 +0000
@@ -22,7 +22,7 @@
22from __future__ import unicode_literals22from __future__ import unicode_literals
2323
2424
25VERSION = (1, 1, 2)25VERSION = (1, 1, 3)
2626
2727
28def get_version():28def get_version():

Subscribers

People subscribed via source and target branches