projects
/
pithos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanup pithos backend pools, new pool api support
[pithos]
/
snf-pithos-backend
/
setup.py
diff --git
a/snf-pithos-backend/setup.py
b/snf-pithos-backend/setup.py
index
569b74e
..
968f137
100644
(file)
--- a/
snf-pithos-backend/setup.py
+++ b/
snf-pithos-backend/setup.py
@@
-40,10
+40,15
@@
import os
from distutils.util import convert_path
from fnmatch import fnmatchcase
from setuptools import setup, find_packages
from distutils.util import convert_path
from fnmatch import fnmatchcase
from setuptools import setup, find_packages
-from synnefo.util import version
HERE = os.path.abspath(os.path.normpath(os.path.dirname(__file__)))
HERE = os.path.abspath(os.path.normpath(os.path.dirname(__file__)))
-version.update_version('pithos.backends', 'version', HERE)
+try:
+ # try to update the version file
+ from synnefo.util import version
+ version.update_version('pithos.backends', 'version', HERE)
+except ImportError:
+ pass
+
from pithos.backends.version import __version__
# Package info
from pithos.backends.version import __version__
# Package info
@@
-60,10
+65,9
@@
CLASSIFIERS = []
# Package requirements
INSTALL_REQUIRES = [
# Package requirements
INSTALL_REQUIRES = [
- 'Django>=1.2.3',
- 'SQLAlchemy>=0.6.3',
- 'MySQL-python>=1.2.2',
- 'psycopg2>=2.2.1'
+ 'snf-common>0.9.13',
+ 'SQLAlchemy==0.6.3',
+ 'alembic>=0.3.4, <0.4',
]
EXTRAS_REQUIRES = {
]
EXTRAS_REQUIRES = {
@@
-75,7
+79,7
@@
TESTS_REQUIRES = [
# Provided as an attribute, so you can append to these instead
# of replicating them:
# Provided as an attribute, so you can append to these instead
# of replicating them:
-standard_exclude = ["*.py", "*.pyc", "*$py.class", "*~", ".*", "*.bak"]
+standard_exclude = ["*.pyc", "*$py.class", "*~", ".*", "*.bak"]
standard_exclude_directories = [
".*", "CVS", "_darcs", "./build", "./dist", "EGG-INFO", "*.egg-info", "snf-0.7"
]
standard_exclude_directories = [
".*", "CVS", "_darcs", "./build", "./dist", "EGG-INFO", "*.egg-info", "snf-0.7"
]
@@
-180,12
+184,12
@@
setup(
namespace_packages = ['pithos'],
packages = PACKAGES,
package_dir= {'': PACKAGES_ROOT},
namespace_packages = ['pithos'],
packages = PACKAGES,
package_dir= {'': PACKAGES_ROOT},
+ package_data=find_package_data("."),
include_package_data = True,
include_package_data = True,
- package_data = find_package_data('.'),
zip_safe = False,
dependency_links = [
zip_safe = False,
dependency_links = [
- 'http://docs.dev.grnet.gr/pypi/index.html'],
+ 'http://docs.dev.grnet.gr/pypi/'],
install_requires = INSTALL_REQUIRES,
extras_require = EXTRAS_REQUIRES,
install_requires = INSTALL_REQUIRES,
extras_require = EXTRAS_REQUIRES,
@@
-193,7
+197,8
@@
setup(
entry_points = {
'console_scripts': [
entry_points = {
'console_scripts': [
- ],
- },
+ 'pithos-migrate = pithos.backends.migrate:main'
+ ],
+ },
)
)