Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixing dependencies and build script again.

  • Loading branch information...
commit 7a6931987bd4698546b87a8cb2338c5bf955c20b 1 parent bcda5d7
Sean Cribbs seancribbs authored
Showing with 8 additions and 8 deletions.
  1. +2 −4 .travis.yml
  2. +6 −4 setup.py
6 .travis.yml
View
@@ -2,10 +2,8 @@ language: python
python:
- "2.6"
- "2.7"
-install:
- - python setup.py easy_install protobuf=2.4.1
- - python setup.py develop
-script: python setup.py test
+install: ./setup.py develop
+script: ./setup.py test
# TODO: get search enabled on Travis' Riak install, or fix the test server
env: "SKIP_LUWAK=1 SKIP_SEARCH=1"
notifications:
10 setup.py
View
@@ -16,15 +16,17 @@ def make_pb():
subprocess.call(['protoc', '--python_out=.', './riak/transports/riakclient.proto'])
if __name__ == "__main__":
- requires = ['protobuf(==2.4.1)']
+ install_requires = {'protobuf': ['>= 2.4.0', '< 2.5.0'] }
+ tests_require = []
if platform.python_version() < '2.7':
- requires.append("unittest2")
+ tests_require.append("unittest2")
setup(
name='riak',
version='1.3.0',
packages = find_packages(),
- requires = requires,
+ install_requires = install_requires,
+ tests_require = tests_require,
package_data = {
'' : ['*.proto'],
'riak' : ['erl_src/*']
@@ -35,7 +37,7 @@ def make_pb():
license='Apache 2',
platforms='Platform Independent',
author='Basho Technologies',
- author_email='riak@basho.com',
+ author_email='clients@basho.com',
test_suite='riak.tests.suite',
url='https://github.com/basho/riak-python-client'
)
Please sign in to comment.
Something went wrong with that request. Please try again.