Skip to content
This repository
Browse code

Fixing dependencies and build script again.

  • Loading branch information...
commit 7a6931987bd4698546b87a8cb2338c5bf955c20b 1 parent bcda5d7
Sean Cribbs seancribbs authored

Showing 2 changed files with 8 additions and 8 deletions. Show diff stats Hide diff stats

  1. +2 4 .travis.yml
  2. +6 4 setup.py
6 .travis.yml
@@ -2,10 +2,8 @@ language: python
2 2 python:
3 3 - "2.6"
4 4 - "2.7"
5   -install:
6   - - python setup.py easy_install protobuf=2.4.1
7   - - python setup.py develop
8   -script: python setup.py test
  5 +install: ./setup.py develop
  6 +script: ./setup.py test
9 7 # TODO: get search enabled on Travis' Riak install, or fix the test server
10 8 env: "SKIP_LUWAK=1 SKIP_SEARCH=1"
11 9 notifications:
10 setup.py
@@ -16,15 +16,17 @@ def make_pb():
16 16 subprocess.call(['protoc', '--python_out=.', './riak/transports/riakclient.proto'])
17 17
18 18 if __name__ == "__main__":
19   - requires = ['protobuf(==2.4.1)']
  19 + install_requires = {'protobuf': ['>= 2.4.0', '< 2.5.0'] }
  20 + tests_require = []
20 21 if platform.python_version() < '2.7':
21   - requires.append("unittest2")
  22 + tests_require.append("unittest2")
22 23
23 24 setup(
24 25 name='riak',
25 26 version='1.3.0',
26 27 packages = find_packages(),
27   - requires = requires,
  28 + install_requires = install_requires,
  29 + tests_require = tests_require,
28 30 package_data = {
29 31 '' : ['*.proto'],
30 32 'riak' : ['erl_src/*']
@@ -35,7 +37,7 @@ def make_pb():
35 37 license='Apache 2',
36 38 platforms='Platform Independent',
37 39 author='Basho Technologies',
38   - author_email='riak@basho.com',
  40 + author_email='clients@basho.com',
39 41 test_suite='riak.tests.suite',
40 42 url='https://github.com/basho/riak-python-client'
41 43 )

0 comments on commit 7a69319

Please sign in to comment.
Something went wrong with that request. Please try again.