From a9fca38835f191589d2a1a2d896aebcaa57686c5 Mon Sep 17 00:00:00 2001 From: Stavros Sachtouris Date: Wed, 30 Jan 2013 16:38:56 +0200 Subject: [PATCH] CHANGELOG for version 0.6.3 1. Get rid of OrderedDict dependency (for python <= 2.6) 2. Minor fixes --- Changelog | 9 ++------- MANIFEST.in | 4 +++- kamaki/cli/config.py | 2 +- setup.py | 3 --- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Changelog b/Changelog index c97cecd..ee60815 100644 --- a/Changelog +++ b/Changelog @@ -1,9 +1,4 @@ CHANGELOG for version 0.6.3 -1. Introduce a quotaholder client (and primitive cli) -2. Enrich output responses and error reporting with instructions per command -3. Unified result output -4. Stabilize error handling (crashes are much less frequent) -5. Dynamic upper limit on threads when uploading -6. Update documentation -7. Restructure CLI code to clarify what is used in each interface mode \ No newline at end of file +1. Get rid of OrderedDict dependency (for python <= 2.6) +2. Minor fixes diff --git a/MANIFEST.in b/MANIFEST.in index dc212fd..ebddbdf 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1 +1,3 @@ -include README.rst COPYRIGHT +include README.rst COPYRIGHT Changelog +recursive-include docs * +prune docs/_build diff --git a/kamaki/cli/config.py b/kamaki/cli/config.py index 4ed5912..406b303 100644 --- a/kamaki/cli/config.py +++ b/kamaki/cli/config.py @@ -39,7 +39,7 @@ from ConfigParser import RawConfigParser, NoOptionError, NoSectionError try: from collections import OrderedDict except ImportError: - from ordereddict import OrderedDict + from kamaki.clients.commissioning.utils.ordereddict import OrderedDict # Path to the file that stores the configuration diff --git a/setup.py b/setup.py index fc20d0c..0c48ebb 100755 --- a/setup.py +++ b/setup.py @@ -45,9 +45,6 @@ optional = ['ansicolors', requires = ['objpool', 'argparse'] -if not hasattr(collections, "OrderedDict"): # Python 2.6 - requires.append("ordereddict") - setup( name='kamaki', version=kamaki.__version__, -- 1.7.10.4