Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

final fixes before pushing to PyPI

  • Loading branch information...
commit 31ea0fb8d3b4aeb2244c8431e28388bd5ef21a97 1 parent a0f8959
@argv0 argv0 authored
Showing with 5 additions and 74 deletions.
  1. +1 −0  .hgignore
  2. +0 −71 reset_riak
  3. +3 −3 riak/tests/test_all.py
  4. +1 −0  setup.py
View
1  .hgignore
@@ -5,3 +5,4 @@ riak.egg-info
build
*.html
.*.swp
+dist/*
View
71 reset_riak
@@ -1,71 +0,0 @@
-#! /usr/bin/env -- escript
-%% -*- erlang -*-
-%% -------------------------------------------------------------------
-%%
-%% reset_riak: Reset riak server
-%%
-%% Copyright (c) 2010 Basho Techonologies
-%%
-%% This file is provided to you under the Apache License,
-%% Version 2.0 (the "License"); you may not use this file
-%% except in compliance with the License. You may obtain
-%% a copy of the License at
-%%
-%% http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-%% -------------------------------------------------------------------
-
-main([]) ->
- Node = 'riak@127.0.0.1',
- MyNode = 'test@127.0.0.1',
- Cookie = 'riak',
-
- %% Try and spin up epmd
- case erl_epmd:start() of
- {ok, _} ->
- ok;
- {error, {already_Started, _}} ->
- ok;
- {error, Reason1} ->
- io:format("Could not start erlang port mapper: ~p\n", [Reason1]),
- halt(1)
- end,
- %% Try to spin up net_kernel
- case net_kernel:start([MyNode]) of
- {ok, _} ->
- ok;
- {error, {already_started, _}} ->
- ok;
- {error, Reason2} ->
- io:format("Could not start erlang network kernel: ~p\n", [Reason2]),
- halt(1)
- end,
-
-
- %% Initialize cookie
- true = erlang:set_cookie(Node, Cookie),
-
- %% Ping to prove we can talk
- pong = net_adm:ping(Node),
-
- %% Until there is a good way to empty the vnodes, require the
- %% test to run with ETS and kill the vnode master/sup to empty all the ETS tables
- %% and the ring manager to remove any bucket properties
- ok = rpc:call(Node, application, set_env, [riak_kv, storage_backend, riak_kv_ets_backend]),
-
- ok = supervisor:terminate_child({riak_kv_sup, Node}, riak_kv_vnode_master),
- ok = supervisor:terminate_child({riak_kv_sup, Node}, riak_kv_vnode_sup),
- ok = supervisor:terminate_child({riak_core_sup, Node}, riak_core_ring_manager),
-
- {ok, _} = supervisor:restart_child({riak_core_sup, Node}, riak_core_ring_manager),
- {ok, _} = supervisor:restart_child({riak_kv_sup, Node}, riak_kv_vnode_sup),
- {ok, _} = supervisor:restart_child({riak_kv_sup, Node}, riak_kv_vnode_master),
- io:format("ok\n").
-
View
6 riak/tests/test_all.py
@@ -8,9 +8,9 @@
import random
import sys
import unittest
-from riak.client import RiakClient
-from riak.transports import RiakPbcTransport
-from riak.transports import RiakHttpTransport
+from riak import RiakClient
+from riak import RiakPbcTransport
+from riak import RiakHttpTransport
HOST = os.environ.get('RIAK_TEST_HOST', 'localhost')
HTTP_HOST = os.environ.get('RIAK_TEST_HTTP_HOST', HOST)
View
1  setup.py
@@ -26,6 +26,7 @@ def make_pb():
'' : ['*.proto']
},
description='Python client for Riak',
+ zip_safe=True,
license='Apache 2',
platforms='Platform Independent',
author='Basho Technologies',
Please sign in to comment.
Something went wrong with that request. Please try again.