turnip

Merge ~doismellburning/turnip:feature/readme-rst into turnip:master

  1. Git
  2. lp:~doismellburning/turnip
  3. feature/readme-rst
  4. Merge into master
Proposed by Kristian Glass
Status: Merged
Approved by: Colin Watson
Approved revision: aa6790e0d7998120e2917aad1d8ea3f22c362bd0
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~doismellburning/turnip:feature/readme-rst
Merge into: turnip:master
Diff against target: 25 lines (+2/-1)
1 file modified
setup.py (+2/-1)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+378313@code.launchpad.net

Commit message

Rename README to README.rst to reflect the syntax used within

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

This breaks setup.py. Could you please change the references there from README to README.rst? Adding long_description_content_type="text/x-rst" to the setup() arguments would be a good idea too while you're there.

review: Needs Fixing
Revision history for this message
Kristian Glass (doismellburning) wrote :

Thanks - I'd accidentally been running tests against the wrong clone and hadn't noticed setup.py - should now be good!

Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/README b/README.rst
2similarity index 100%
3rename from README
4rename to README.rst
5diff --git a/setup.py b/setup.py
6index 4ba7f65..cd8f4fb 100755
7--- a/setup.py
8+++ b/setup.py
9@@ -12,7 +12,7 @@ from setuptools import (
10
11 here = os.path.abspath(os.path.dirname(__file__))
12
13-with open(os.path.join(here, 'README')) as f:
14+with open(os.path.join(here, 'README.rst')) as f:
15 README = f.read()
16 with open(os.path.join(here, 'NEWS')) as f:
17 README += "\n\n" + f.read()
18@@ -54,6 +54,7 @@ setup(
19 maintainer_email='lazr-developers@lists.launchpad.net',
20 description='turnip',
21 long_description=README,
22+ long_description_content_type='text/x-rst',
23 license='AGPL v3',
24 url='https://launchpad.net/turnip',
25 download_url='https://launchpad.net/turnip/+download',

Subscribers

People subscribed via source and target branches