Commit 5266cad0 authored by Nikos Skalkotos's avatar Nikos Skalkotos
Browse files

Cleanup setup.py

Remove obsolete code needed when we were using distribute.
parent 729c71a9
...@@ -32,14 +32,8 @@ ...@@ -32,14 +32,8 @@
# or implied, of GRNET S.A. # or implied, of GRNET S.A.
# #
import os import os
import sys
from distutils.util import convert_path
from fnmatch import fnmatchcase
from setuptools import setup, find_packages from setuptools import setup, find_packages
HERE = os.path.abspath(os.path.normpath(os.path.dirname(__file__)))
try: try:
from devflow.version import __version__ from devflow.version import __version__
except ImportError: except ImportError:
...@@ -48,6 +42,8 @@ except ImportError: ...@@ -48,6 +42,8 @@ except ImportError:
update_version() update_version()
from devflow.version import __version__ from devflow.version import __version__
HERE = os.path.abspath(os.path.normpath(os.path.dirname(__file__)))
# Package info # Package info
VERSION = __version__ VERSION = __version__
README = open(os.path.join(HERE, 'README.md')).read() README = open(os.path.join(HERE, 'README.md')).read()
...@@ -61,9 +57,7 @@ PACKAGES = find_packages(PACKAGES_ROOT) ...@@ -61,9 +57,7 @@ PACKAGES = find_packages(PACKAGES_ROOT)
CLASSIFIERS = [] CLASSIFIERS = []
# Package requirements # Package requirements
INSTALL_REQUIRES = [ INSTALL_REQUIRES = ['gitpython>=0.3.2RC1', 'sh', 'configobj', 'ansicolors']
'gitpython>=0.3.2RC1', 'sh', 'configobj', 'ansicolors'
]
# Provided as an attribute, so you can append to these instead # Provided as an attribute, so you can append to these instead
# of replicating them: # of replicating them:
...@@ -71,90 +65,6 @@ standard_exclude = ["*.py", "*.pyc", "*$py.class", "*~", ".*", "*.bak"] ...@@ -71,90 +65,6 @@ standard_exclude = ["*.py", "*.pyc", "*$py.class", "*~", ".*", "*.bak"]
standard_exclude_directories = [".*", "CVS", "_darcs", "./build", "./dist", standard_exclude_directories = [".*", "CVS", "_darcs", "./build", "./dist",
"EGG-INFO", "*.egg-info"] "EGG-INFO", "*.egg-info"]
# (c) 2005 Ian Bicking and contributors; written for Paste (http://pythonpaste.org)
# Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php
# Note: you may want to copy this into your setup.py file verbatim, as
# you can't import this from another package, when you don't know if
# that package is installed yet.
def find_package_data(
where=".",
package="",
exclude=standard_exclude,
exclude_directories=standard_exclude_directories,
only_in_packages=True,
show_ignored=False):
"""
Return a dictionary suitable for use in ``package_data``
in a distutils ``setup.py`` file.
The dictionary looks like::
{"package": [files]}
Where ``files`` is a list of all the files in that package that
don"t match anything in ``exclude``.
If ``only_in_packages`` is true, then top-level directories that
are not packages won"t be included (but directories under packages
will).
Directories matching any pattern in ``exclude_directories`` will
be ignored; by default directories with leading ``.``, ``CVS``,
and ``_darcs`` will be ignored.
If ``show_ignored`` is true, then all the files that aren"t
included in package data are shown on stderr (for debugging
purposes).
Note patterns use wildcards, or can be exact paths (including
leading ``./``), and all searching is case-insensitive.
"""
out = {}
stack = [(convert_path(where), "", package, only_in_packages)]
while stack:
where, prefix, package, only_in_packages = stack.pop(0)
for name in os.listdir(where):
fn = os.path.join(where, name)
if os.path.isdir(fn):
bad_name = False
for pattern in exclude_directories:
if (fnmatchcase(name, pattern)
or fn.lower() == pattern.lower()):
bad_name = True
if show_ignored:
print >> sys.stderr, (
"Directory %s ignored by pattern %s"
% (fn, pattern))
break
if bad_name:
continue
if (os.path.isfile(os.path.join(fn, "__init__.py"))
and not prefix):
if not package:
new_package = name
else:
new_package = package + "." + name
stack.append((fn, "", new_package, False))
else:
stack.append((fn, prefix + name + "/", package,
only_in_packages))
elif package or not only_in_packages:
# is a file
bad_name = False
for pattern in exclude:
if (fnmatchcase(name, pattern)
or fn.lower() == pattern.lower()):
bad_name = True
if show_ignored:
print >> sys.stderr, (
"File %s ignored by pattern %s"
% (fn, pattern))
break
if bad_name:
continue
out.setdefault(package, []).append(prefix + name)
return out
setup( setup(
name='devflow', name='devflow',
version=VERSION, version=VERSION,
...@@ -169,21 +79,17 @@ setup( ...@@ -169,21 +79,17 @@ setup(
maintainer='Synnefo development team', maintainer='Synnefo development team',
maintainer_email='synnefo-devel@googlegroups.com', maintainer_email='synnefo-devel@googlegroups.com',
packages=PACKAGES, packages=find_packages(),
package_dir={'': PACKAGES_ROOT},
include_package_data=True, include_package_data=True,
package_data=find_package_data('.'),
zip_safe=False,
install_requires=INSTALL_REQUIRES, install_requires=INSTALL_REQUIRES,
entry_points={ entry_points={
'console_scripts': [ 'console_scripts': [
'devflow-version=devflow.versioning:main', 'devflow-version=devflow.versioning:main',
'devflow-bump-version=devflow.versioning:bump_version_main', 'devflow-bump-version=devflow.versioning:bump_version_main',
'devflow-update-version=devflow.versioning:update_version', 'devflow-update-version=devflow.versioning:update_version',
'devflow-autopkg=devflow.autopkg:main', 'devflow-autopkg=devflow.autopkg:main',
'devflow-flow=devflow.flow:main', 'devflow-flow=devflow.flow:main'],
], },
},
) )
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment