From 0dc43d07faae6f426ca50e6243127c508eea5bdd Mon Sep 17 00:00:00 2001 From: maxkoryukov Date: Sun, 5 Mar 2017 19:02:37 +0500 Subject: [PATCH 1/5] Add scrutinizer coverage, remove `test_coverage.py` (we should not use unittest lib direct --- .scrutinizer.yml | 9 +++++++++ test_coverage.py | 36 ------------------------------------ 2 files changed, 9 insertions(+), 36 deletions(-) create mode 100644 .scrutinizer.yml delete mode 100644 test_coverage.py diff --git a/.scrutinizer.yml b/.scrutinizer.yml new file mode 100644 index 0000000..8c5b3c9 --- /dev/null +++ b/.scrutinizer.yml @@ -0,0 +1,9 @@ +build: + tests: + override: + - + command: pytest + coverage: + file: '.coverage' + config_file: '.coveragerc' + format: 'py-cc' diff --git a/test_coverage.py b/test_coverage.py deleted file mode 100644 index 9be61a8..0000000 --- a/test_coverage.py +++ /dev/null @@ -1,36 +0,0 @@ -import os -import unittest - -import coverage - -COV = coverage.coverage( - branch=True, - include='route4me/*', - omit=[ - 'tests/*', - 'examples/*' - ] -) -COV.start() - - -def cov(): - """Runs the unit tests with coverage.""" - tests = unittest.TestLoader().discover('tests') - result = unittest.TextTestRunner(verbosity=2).run(tests) - if result.wasSuccessful(): - COV.stop() - COV.save() - print('Coverage Summary:') - COV.report() - basedir = os.path.abspath(os.path.dirname(__file__)) - covdir = os.path.join(basedir, 'tmp/coverage') - COV.html_report(directory=covdir) - print('HTML version: file://%s/index.html' % covdir) - COV.erase() - return 0 - return 1 - - -if __name__ == '__main__': - cov() From 19d76aed06cbb2e2960161590272e8be972050eb Mon Sep 17 00:00:00 2001 From: maxkoryukov Date: Sun, 5 Mar 2017 19:24:07 +0500 Subject: [PATCH 2/5] scrutinizer: override install --- .scrutinizer.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 8c5b3c9..e09d6b4 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -7,3 +7,7 @@ build: file: '.coverage' config_file: '.coveragerc' format: 'py-cc' + dependencies: + override: + - pip install -r requirements-dev.txt -q + - pip install -r requirements.txt -q From b6245393787b932a8b238b3a9d98b70b935edb84 Mon Sep 17 00:00:00 2001 From: maxkoryukov Date: Sun, 5 Mar 2017 19:28:10 +0500 Subject: [PATCH 3/5] fix scrutinizer config --- .scrutinizer.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.scrutinizer.yml b/.scrutinizer.yml index e09d6b4..74ccc8b 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -7,7 +7,7 @@ build: file: '.coverage' config_file: '.coveragerc' format: 'py-cc' - dependencies: - override: - - pip install -r requirements-dev.txt -q - - pip install -r requirements.txt -q + dependencies: + override: + - pip install -r requirements-dev.txt -q + - pip install -r requirements.txt -q From 6a18f3c57cb1754c365997df2890135807397ea7 Mon Sep 17 00:00:00 2001 From: maxkoryukov Date: Thu, 8 Jun 2017 11:54:43 +0500 Subject: [PATCH 4/5] Refactoring. One tiny step --- requirements-dev.txt | 8 ++++---- route4me/address.py | 5 +++-- route4me/members.py | 4 ++-- setup.py | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 1523a4b..d2673e2 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,7 +1,7 @@ # Development dependencies # in one place -pytest >=3.0.6 -pytest-cov >=2.4.0 -flake8 >=3.3.0 -mock >=1.0.0; python_version<='3.3' +pytest >=3.0.6 +pytest-cov >=2.4.0 +flake8 >=3.3.0 +mock >=1.0.0 diff --git a/route4me/address.py b/route4me/address.py index 9057300..44281c7 100644 --- a/route4me/address.py +++ b/route4me/address.py @@ -210,8 +210,9 @@ def geocode(self, **kwargs): """ if 'format' not in kwargs: kwargs.update({'format': 'csv'}) - kwargs.update({'api_key': self.params['api_key'], }) - if self.check_required_params(kwargs, ['addresses', ]): + kwargs['api_key'] = self.params['api_key'] + + if self.check_required_params(kwargs, ['addresses']): response = self.api._request_post(BATCH_GEOCODER, kwargs) return response.content diff --git a/route4me/members.py b/route4me/members.py index 3124430..22bd3a0 100644 --- a/route4me/members.py +++ b/route4me/members.py @@ -106,10 +106,10 @@ def get_users(self, **kwargs): def get_api_key_users(self, **kwargs): """ - Get users taht belong to a given api_key using GET request + Get users that belong to a given api_key using GET request :return: API response """ - kwargs.update({'api_key': self.params['api_key'], }) + kwargs['api_key'] = self.params['api_key'] response = self.api._request_get(USER_URL, kwargs) try: diff --git a/setup.py b/setup.py index e706909..85afbaa 100755 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ def read(file_name): packages=['route4me', 'examples', 'tests', ], long_description=read('README.md'), classifiers=[ - "Development Status :: 1 - Beta", + "Development Status :: 1 - Alpha", "Topic :: SDK", "License :: ISC", ], From 3c49ad98d8e39cefdf38d13443591d854234c2a5 Mon Sep 17 00:00:00 2001 From: maxkoryukov Date: Thu, 8 Jun 2017 11:57:55 +0500 Subject: [PATCH 5/5] Fix scrutinizer config --- .scrutinizer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 74ccc8b..4fad939 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -2,7 +2,7 @@ build: tests: override: - - command: pytest + command: python3 -m pytest coverage: file: '.coverage' config_file: '.coveragerc'