Merge branch 'develop' into 'master'

发布版本 v0.2.8

See merge request bge/bge-python-sdk!4

Author: zhanglei3

.coverage

@@ -0,0 +1,4 @@
+
+[run]
+branch = True
+omit = tests/*

.coveragerc

@@ -7,14 +7,13 @@ install:
 
 # 构建源码包
 build: wheel
-	$(PYTHON) setup.py build sdist
-
-# 构建 wheel 包
-wheel:
 	$(PYTHON) setup.py bdist_wheel
+	$(PYTHON) setup.py sdist --formats=gztar,zip,bztar,xztar,ztar,tar
+	$(PYTHON) setup.py bdist
 
 # 单元测试
 test:
+	pip install pytest pytest-cov; \
 	chmod +x ./test_env.sh; \
 	./test_env.sh
 

Makefile

@@ -41,6 +41,8 @@
 
 endpoints = [v['endpoint'] for v in constants.ENDPOINTS]
 
+ACCESS_TOKEN_API = '/oauth2/access_token'
+
 
 def progress_callback(bytes_consumed, total_bytes):
     sys.stdout.write(
@@ -65,7 +67,7 @@ def alive(self):
         self.endpoint, max_retries=max_retries, verbose=verbose)
     try:
         request.get('/ping', timeout=timeout)
-    except Exception as e:
+    except Exception:
         return False
     return True
 
@@ -151,7 +153,7 @@ def exchange_authorization_code(self, code, redirect_uri):
         request = HTTPRequest(
             self.endpoint, max_retries=max_retries, verbose=verbose)
         result = request.post(
-            '/oauth2/access_token', data=data, timeout=timeout)
+            ACCESS_TOKEN_API, data=data, timeout=timeout)
         return models.AuthorizationCodeToken(self, result)
 
     def exchange_refresh_token(self, refresh_token):
@@ -175,7 +177,7 @@ def exchange_refresh_token(self, refresh_token):
         request = HTTPRequest(
             self.endpoint, max_retries=max_retries, verbose=verbose)
         result = request.post(
-            '/oauth2/access_token', data=data, timeout=timeout)
+            ACCESS_TOKEN_API, data=data, timeout=timeout)
         return models.AuthorizationCodeToken(self, result)
 
     def get_credentials_token(self):
@@ -195,7 +197,7 @@ def get_credentials_token(self):
         request = HTTPRequest(
             self.endpoint, max_retries=max_retries, verbose=verbose)
         result = request.post(
-            '/oauth2/access_token', data=data, timeout=timeout)
+            ACCESS_TOKEN_API, data=data, timeout=timeout)
         return models.ClientCredentialsToken(self, result)
 
     def get_api(self, access_token):

bgesdk/client.py

@@ -20,7 +20,7 @@ def __init__(self, parser, command_name=None, **kwargs):
         self.add_arguments(parser)
 
     def add_arguments(self, parser):
-        pass
+        """添加自定义命令参数"""
 
     @abstractmethod
     def handler(self, args):

bgesdk/management/command.py

@@ -6,7 +6,10 @@
 from bgesdk.management import constants
 from bgesdk.management.command import BaseCommand
 from bgesdk.management.utils import (
-    get_active_project, config_get, read_config, output
+    get_active_project,
+    config_get,
+    read_config,
+    output
 )
 from bgesdk.models import ModelEncoder
 from bgesdk.version import __version__

bgesdk/management/commands/api/commands/aggregate_omics_data.py

@@ -6,7 +6,10 @@
 from bgesdk.management import constants
 from bgesdk.management.command import BaseCommand
 from bgesdk.management.utils import (
-    get_active_project, config_get, read_config, output
+    get_active_project,
+    config_get,
+    read_config,
+    output
 )
 from bgesdk.version import __version__
 

bgesdk/management/commands/api/commands/download.py

@@ -6,7 +6,10 @@
 from bgesdk.management import constants
 from bgesdk.management.command import BaseCommand
 from bgesdk.management.utils import (
-    get_active_project, config_get, read_config, output
+    get_active_project,
+    config_get,
+    read_config,
+    output
 )
 from bgesdk.models import ModelEncoder
 from bgesdk.version import __version__

bgesdk/management/commands/api/commands/get_data_items.py

@@ -6,7 +6,10 @@
 from bgesdk.management import constants
 from bgesdk.management.command import BaseCommand
 from bgesdk.management.utils import (
-    get_active_project, config_get, read_config, output
+    get_active_project,
+    config_get,
+    read_config,
+    output
 )
 from bgesdk.models import ModelEncoder
 from bgesdk.version import __version__

bgesdk/management/commands/api/commands/get_func_abundance.py

@@ -6,7 +6,10 @@
 from bgesdk.management import constants
 from bgesdk.management.command import BaseCommand
 from bgesdk.management.utils import (
-    get_active_project, config_get, read_config, output
+    get_active_project,
+    config_get,
+    read_config,
+    output
 )
 from bgesdk.models import ModelEncoder
 from bgesdk.version import __version__