RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-19 17:41:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9386 from tchaikov/wip-bye-py2.6

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

Reviewed-by: Loic Dachary <ldachary@redhat.com>
This commit is contained in:
Loic Dachary 2016-06-08 20:44:49 +02:00
commit b5eb28b649
4 changed files with 12 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ceph-detect-init/requirements.txt
View File

@ -1 +0,0 @@
argparse

20
src/ceph-detect-init/setup.py
View File

@ -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',
],

1
src/ceph-disk/requirements.txt
View File

@ -1 +0,0 @@
argparse

20
src/ceph-disk/setup.py
View File

@ -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',
],