ceph-detect-init,ceph-disk: drop support of py2.6

jewel now supports only the distro shipping py2.7+, so we can drop the
support of 2.6 now.

this partially reverts f11a3a5c2fc89810f3723299e516c527b07e9098

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/ceph-detect-init/requirements.txt b/src/ceph-detect-init/requirements.txt
index 1352d5e6f193543a763e11ab1deff15bafc9e500..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/src/ceph-detect-init/requirements.txt
+++ b/src/ceph-detect-init/requirements.txt
@@ -1 +0,0 @@
-argparse

diff --git a/src/ceph-detect-init/setup.py b/src/ceph-detect-init/setup.py
index dea9637d60ad3a2570351c42e0b45036ff1654d5..3a2b6ada1924bfab03dd43d91205fde5740a949c 100644 (file)
--- a/src/ceph-detect-init/setup.py
+++ b/src/ceph-detect-init/setup.py
@@ -23,21 +23,14 @@ import sys
 from setuptools import setup
 from setuptools import find_packages
 
+assert sys.version_info >= (2, 7), \
+    "Python version lower than 2.7 is not supported"
+
 def read(fname):
     path = os.path.join(os.path.dirname(__file__), fname)
     f = open(path)
     return f.read()
 
-
-def filter_included_modules(*m):
-    modules = sum(m, [])
-    if sys.version_info[0] == 2 and sys.version_info[1] <= 6:
-        return modules
-    included_modules = set(['argparse', 'importlib', 'sysconfig'])
-    return list(set(modules) - included_modules)
-
-
-install_requires = read('requirements.txt').split()
 tests_require = read('test-requirements.txt').split()
 
 setup(
@@ -53,9 +46,8 @@ setup(
     keywords='ceph',
     url="https://git.ceph.com/?p=ceph.git;a=summary",
 
-    install_requires=filter_included_modules(['setuptools'],
-                                             install_requires),
-    tests_require=filter_included_modules(tests_require),
+    install_requires=['setuptools'],
+    tests_require=tests_require,
 
     classifiers=[
         'Environment :: Console',
@@ -64,7 +56,7 @@ setup(
         'Operating System :: POSIX :: Linux',
         'License :: OSI Approved :: GNU Lesser General Public License v2 or later (LGPLv2+)',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Topic :: Utilities',
     ],

diff --git a/src/ceph-disk/requirements.txt b/src/ceph-disk/requirements.txt
index 1352d5e6f193543a763e11ab1deff15bafc9e500..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/src/ceph-disk/requirements.txt
+++ b/src/ceph-disk/requirements.txt
@@ -1 +0,0 @@
-argparse

diff --git a/src/ceph-disk/setup.py b/src/ceph-disk/setup.py
index 05c9203ec98f661238e01ff10db845dd2accc970..f1d185377d510d443536c80a9f715c212e16e944 100644 (file)
--- a/src/ceph-disk/setup.py
+++ b/src/ceph-disk/setup.py
@@ -18,21 +18,14 @@ import sys
 from setuptools import setup
 from setuptools import find_packages
 
+assert sys.version_info >= (2, 7), \
+    "Python version lower than 2.7 is not supported"
+
 def read(fname):
     path = os.path.join(os.path.dirname(__file__), fname)
     f = open(path)
     return f.read()
 
-
-def filter_included_modules(*m):
-    modules = sum(m, [])
-    if sys.version_info[0] == 2 and sys.version_info[1] <= 6:
-        return modules
-    included_modules = set(['argparse', 'importlib', 'sysconfig'])
-    return list(set(modules) - included_modules)
-
-
-install_requires = read('requirements.txt').split()
 tests_require = read('test-requirements.txt').split()
 
 setup(
@@ -48,9 +41,8 @@ setup(
     keywords='ceph',
     url="https://git.ceph.com/?p=ceph.git;a=summary",
 
-    install_requires=filter_included_modules(['setuptools'],
-                                             install_requires),
-    tests_require=filter_included_modules(tests_require),
+    install_requires=['setuptools'],
+    tests_require=tests_require,
 
     classifiers=[
         'Environment :: Console',
@@ -59,7 +51,7 @@ setup(
         'Operating System :: POSIX :: Linux',
         'License :: OSI Approved :: GNU Lesser General Public License v2 or later (LGPLv2+)',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Topic :: Utilities',
     ],