From 754f89f920fb78953d60737e1296ef4dea4bd6d3 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Fri, 8 Nov 2013 09:05:32 -0200 Subject: add readme to manifest --- MANIFEST.in | 1 + 1 file changed, 1 insertion(+) 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 -- cgit v1.2.3 From 98c6b7869dbf8f690bc3dc7c0288afe4990204ed Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Thu, 5 Dec 2013 11:21:33 -0400 Subject: workaround for missing file during pip install --- setup.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 519ddb3..264d04c 100644 --- a/setup.py +++ b/setup.py @@ -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'}, -- cgit v1.2.3 From f150ad80f95f337bd8587d562868ad9cc91ba77e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= Date: Fri, 6 Dec 2013 15:24:14 -0300 Subject: Fold in changes --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 796e025..52c7ba7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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. -- cgit v1.2.3