Merge branch 'packaging-and-distribution'

ciscosparkapi/_version.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # This file helps to compute a version number in source trees obtained from
 # git-archive tarball (such as those provided by githubs download-from-tag
@@ -10,9 +9,6 @@
 # versioneer-0.16 (https://github.com/warner/python-versioneer)
 
 """Git implementation of _version.py."""
-from __future__ import print_function
-from builtins import str
-from builtins import object
 
 import errno
 import os
@@ -33,7 +29,7 @@ def get_keywords():
     return keywords
 
 
-class VersioneerConfig(object):
+class VersioneerConfig:
     """Container for Versioneer configuration parameters."""
 
 

versioneer.py

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 # Version: 0.16
 
 """The Versioneer - like a rocketeer, but for versions.
@@ -349,15 +349,10 @@
 """
 
 from __future__ import print_function
-from future import standard_library
-standard_library.install_aliases()
-from builtins import str
-from builtins import object
 try:
     import configparser
 except ImportError:
-    import configparser as configparser
-
+    import ConfigParser as configparser
 import errno
 import json
 import os
@@ -366,7 +361,7 @@
 import sys
 
 
-class VersioneerConfig(object):
+class VersioneerConfig:
     """Container for Versioneer configuration parameters."""