Skip to content

Commit ee38c6b

Browse files
committed
Add core
1 parent e95888f commit ee38c6b

9 files changed

Lines changed: 17 additions & 12 deletions

File tree

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ matrix:
1313
env: TOXENV=py37
1414
install:
1515
- pip install tox
16+
before_install:
17+
- export BOTO_CONFIG=/dev/null
1618
script:
1719
- tox
1820
notifications:

rekcurd_client/core/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
from .rekcurd_worker_client import RekcurdWorkerClient

rekcurd_client/rekcurd_worker_client.py renamed to rekcurd_client/core/rekcurd_worker_client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import types
77
import grpc
88

9-
from .protobuf import rekcurd_pb2, rekcurd_pb2_grpc
10-
from .logger import SystemLoggerInterface
9+
from rekcurd_client.protobuf import rekcurd_pb2, rekcurd_pb2_grpc
10+
from rekcurd_client.logger import SystemLoggerInterface
1111

1212

1313
def error_handling(error_response):

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
install_requires=REQUIRES,
6262
tests_require=TESTS_REQUIRES,
6363
extras_require=EXTRAS,
64-
packages=['rekcurd_client', 'rekcurd_client.logger',
65-
'rekcurd_client.protobuf'],
64+
packages=['rekcurd_client', 'rekcurd_client.core',
65+
'rekcurd_client.logger', 'rekcurd_client.protobuf'],
6666
include_package_data=True,
6767
long_description=LONG_DESCRIPTION,
6868
classifiers=[

test/core/__init__.py

Whitespace-only changes.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
from rekcurd.utils import PredictResult
77

8-
import rekcurd_client.rekcurd_worker_client
8+
import rekcurd_client.core.rekcurd_worker_client
99
from rekcurd_client.protobuf import rekcurd_pb2_grpc
1010
from rekcurd_client.logger import logger
1111
from rekcurd_client import RekcurdWorkerClient
@@ -409,7 +409,7 @@ def _run_arrstring_arrstring(client: RekcurdWorkerClient):
409409

410410
def run(scenario, channel):
411411
stub = rekcurd_pb2_grpc.RekcurdWorkerStub(channel)
412-
client = rekcurd_client.rekcurd_worker_client.RekcurdWorkerClient(logger=logger, domain='example.com', app='rekcurd-sample', env='development')
412+
client = rekcurd_client.core.rekcurd_worker_client.RekcurdWorkerClient(logger=logger, domain='example.com', app='rekcurd-sample', env='development')
413413
client.stub = stub
414414
try:
415415
return _IMPLEMENTATIONS[scenario](client)
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
import grpc_testing
77

88
from rekcurd_client.protobuf import rekcurd_pb2
9-
from . import _client_application
10-
9+
from test.core import _client_application
1110

1211
target_service = rekcurd_pb2.DESCRIPTOR.services_by_name['RekcurdWorker']
1312

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import grpc
22
from concurrent import futures
33

4-
from . import *
4+
from test import *
55
from rekcurd_client.protobuf import rekcurd_pb2_grpc
66
import unittest
77
from functools import wraps
88
from unittest.mock import patch, Mock
99

1010
from rekcurd.utils import PredictResult
11-
import rekcurd_client.rekcurd_worker_client
11+
import rekcurd_client.core.rekcurd_worker_client
1212

1313

1414
def patch_predictor(input_type, output_type):
@@ -87,7 +87,7 @@ def setUpClass(cls):
8787
server.add_insecure_port("[::]:5000")
8888
server.start()
8989
cls.server = server
90-
cls.client = rekcurd_client.rekcurd_worker_client.RekcurdWorkerClient(logger=client_logger, host='127.0.0.1:5000')
90+
cls.client = rekcurd_client.core.rekcurd_worker_client.RekcurdWorkerClient(logger=client_logger, host='127.0.0.1:5000')
9191

9292
@classmethod
9393
def tearDownClass(cls):

tox.ini

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,14 @@ deps = -r{toxinidir}/test-requirements.txt
1010
commands =
1111
python -V
1212
py.test -vvv -s
13+
# Patch for https://github.com/travis-ci/travis-ci/issues/7940
14+
setenv =
15+
BOTO_CONFIG = /dev/null
1316

1417
[testenv:coverage]
1518
commands =
1619
python -V
17-
nosetests --with-coverage --cover-package=rekcurd_client --cover-tests
20+
nosetests --with-coverage --cover-package=rekcurd_client.core,rekcurd_client.logger --cover-tests
1821

1922
[testenv:codecov]
2023
commands =

0 commit comments

Comments
 (0)