From 005a5455b1980bdf6c38b5d903fd6616ff26dda1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20V=C3=A1zquez=20Acosta?= Date: Tue, 12 Dec 2017 15:56:31 -0500 Subject: [PATCH] Reorganize the package to provide our vendorized riak client. See bug https://github.com/basho/riak-python-client/issues/526 --- setup.cfg | 4 ++ setup.py | 51 ++++++++++++++++------ {kaircs => src/kaircs}/__init__.py | 0 {kaircs => src/kaircs}/release.py | 11 ++--- {kaircs => src/kaircs}/service/__init__.py | 0 {kaircs => src/kaircs}/service/fs.py | 0 {kaircs => src/kaircs}/service/http.py | 0 {kaircs => src/kaircs}/vsbs.py | 0 src/riak | 1 + tox.ini | 4 +- 10 files changed, 48 insertions(+), 23 deletions(-) rename {kaircs => src/kaircs}/__init__.py (100%) rename {kaircs => src/kaircs}/release.py (86%) rename {kaircs => src/kaircs}/service/__init__.py (100%) rename {kaircs => src/kaircs}/service/fs.py (100%) rename {kaircs => src/kaircs}/service/http.py (100%) rename {kaircs => src/kaircs}/vsbs.py (100%) create mode 120000 src/riak diff --git a/setup.cfg b/setup.cfg index 7e5376d..66e52aa 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,3 +1,7 @@ +[metadata] +provides = + riak (3.0.0) + [egg_info] # tag_build = dev # tag_svn_revision = true diff --git a/setup.py b/setup.py index 14e540e..1d6b683 100644 --- a/setup.py +++ b/setup.py @@ -6,25 +6,50 @@ # # This is free software; you can do what the LICENCE file allows you to. # -# flake8: noqa from __future__ import (division as _py3_division, - print_function as _py3_print, - unicode_literals as _py3_unicode) - # XXX: Don't put absolute imports in setup.py + print_function as _py3_print) -import sys, os +# XXX: Don't put absolute imports in setup.py + +import sys +import os from setuptools import setup, find_packages # Import the version from the release module project_name = str('kaircs') _current_dir = os.path.dirname(os.path.abspath(__file__)) -sys.path.append(os.path.join(_current_dir, project_name)) -from release import VERSION as version +VERSION = '0.3.0' + + +install_requires = [ + 'xoutil>=1.8.0,<1.9', + 'flask>=0.12.2', + 'six>=1.8.0', + 'basho_erlastic>=2.1.1' +] +requires = [ + 'xoutil(>=1.8.0, <1.9)', + 'flask(>=0.12.2)', + 'six(>=1.8.0)', + 'basho_erlastic(>= 2.1.1)' +] + +if sys.version_info[:3] <= (2, 7, 9): + install_requires.append("pyOpenSSL >= 0.14") + requires.append("pyOpenSSL(>=0.14)") + +if sys.version_info[:3] <= (3, 0, 0): + install_requires.append('protobuf >=2.4.1, <2.7.0') + requires.append('protobuf(>=2.4.1, <2.7.0)') +else: + install_requires.append('python3_protobuf >=2.4.1, <2.6.0') + requires.append('python3_protobuf(>=2.4.1, <2.6.0)') + setup( name=project_name, - version=version, + version=VERSION, description="A small File Cloud Storage over Riak KV", long_description=open( os.path.join(_current_dir, 'README.rst')).read(), @@ -37,12 +62,10 @@ author='Merchise Autrement [~ยบ/~]', author_email='', url='http://www.merchise.org/', - packages=find_packages(exclude=['ez_setup', 'examples', 'tests']), + packages=find_packages('src'), + package_dir={'': 'src'}, include_package_data=True, zip_safe=False, - install_requires=[ - 'xoutil>=1.8.0,<1.9', - 'riak>=2.7,<2.8', - 'flask>=0.12.2', - ], + requires=requires, + install_requires=install_requires, ) diff --git a/kaircs/__init__.py b/src/kaircs/__init__.py similarity index 100% rename from kaircs/__init__.py rename to src/kaircs/__init__.py diff --git a/kaircs/release.py b/src/kaircs/release.py similarity index 86% rename from kaircs/release.py rename to src/kaircs/release.py index 11746d5..930f2d6 100644 --- a/kaircs/release.py +++ b/src/kaircs/release.py @@ -12,22 +12,19 @@ absolute_import as _py3_abs_imports) -VERSION = '0.3.0' - - -def dev_tag_installed(): +def _installed(): import pkg_resources try: dist = pkg_resources.get_distribution('kaircs') full_version = dist.version # FIX: Below line is not working anymore base = dist.parsed_version.base_version - return full_version[len(base):] + return base or '', full_version[len(base):] or '' except Exception: - return None + return '', '' -RELEASE_TAG = dev_tag_installed() or '' +VERSION, RELEASE_TAG = _installed() def safe_int(x): diff --git a/kaircs/service/__init__.py b/src/kaircs/service/__init__.py similarity index 100% rename from kaircs/service/__init__.py rename to src/kaircs/service/__init__.py diff --git a/kaircs/service/fs.py b/src/kaircs/service/fs.py similarity index 100% rename from kaircs/service/fs.py rename to src/kaircs/service/fs.py diff --git a/kaircs/service/http.py b/src/kaircs/service/http.py similarity index 100% rename from kaircs/service/http.py rename to src/kaircs/service/http.py diff --git a/kaircs/vsbs.py b/src/kaircs/vsbs.py similarity index 100% rename from kaircs/vsbs.py rename to src/kaircs/vsbs.py diff --git a/src/riak b/src/riak new file mode 120000 index 0000000..dd9e7ad --- /dev/null +++ b/src/riak @@ -0,0 +1 @@ +../vendor/riak/riak \ No newline at end of file diff --git a/tox.ini b/tox.ini index 5a1456a..4513605 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = system,py27,py35,py36 +envlist = system,{2.7,3.5,3.6}-unit [testenv:system] basepython = python @@ -11,5 +11,5 @@ deps = commands= /bin/dd if=/dev/urandom of={toxinidir}/tests/blob count=3 bs=1M - py.test -l -q [] + py.test -l -q [] -- tests/ /bin/rm {toxinidir}/tests/blob