diff options
| author | Kali Kaneko <kali@leap.se> | 2013-12-10 15:41:49 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-12-10 15:41:49 -0400 |
| commit | 50ba4027ca95e9d42ffa8f160ad8e7bf77212513 (patch) | |
| tree | bb53070c964fcaeb33a124fcce26cdb2b2c49e30 | |
| parent | 10c0e1d3456c3f8ef3950d7e11b4a4548e771073 (diff) | |
| parent | 25ef3a640bb6e7877487a6300c065635092c92c0 (diff) | |
Merge tag '0.3.6' into debian-0.3.6
Tag leap.common version 0.3.6
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | MANIFEST.in | 1 | ||||
| -rw-r--r-- | setup.py | 8 |
3 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,6 @@ +0.3.6 Dec 6: + o Update some documentation and packaging bits. + 0.3.5 Nov 1: o Move get_email_charset to this module. diff --git a/MANIFEST.in b/MANIFEST.in index 9fb5300..cad7096 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -4,3 +4,4 @@ include src/leap/common/cacert.pem include versioneer.py include LICENSE include CHANGELOG +include README.rst @@ -104,6 +104,11 @@ def get_versions(default={}, verbose=False): with open(versioneer.versionfile_source, 'w') as f: f.write(subst_template) +try: + long_description = open('README.rst').read() + '\n\n\n' + \ + open('CHANGELOG').read() +except Exception: + long_description = "" cmdclass["freeze_debianver"] = freeze_debianver setup( @@ -118,8 +123,7 @@ setup( maintainer='Kali Kaneko', maintainer_email='kali@leap.se', description='Common files used by the LEAP project.', - long_description=open('README.rst').read() + '\n\n\n' + - open('CHANGELOG').read(), + long_description=long_description, classifiers=trove_classifiers, namespace_packages=["leap"], package_dir={'': 'src'}, |