Merge remote-tracking branch 'upstream/master'

Author: flynnzzhang

CHANGELOG.md

@@ -141,8 +141,6 @@ support proxies
 
 ## [v1.7.3](https://github.com/tencentyun/cos-python-sdk-v5/compare/v1.7.2...v1.7.3) - 2019-08-06
 
-optimize object download
-
 ### Merged
 
 - optimize object download [`#94`](https://github.com/tencentyun/cos-python-sdk-v5/pull/94)

qcloud_cos/cos_client.py

@@ -1 +1 @@
-__version__ = '5.1.9.18'
+__version__ = '5.1.9.19'

qcloud_cos/version.py

@@ -1,5 +1,3 @@
-certifi<=2021.10.8;python_version<'3.0' # certifi新版本不支持python2，这里需要使用低版本
-requests>=2.8
 dicttoxml
 six
 crcmod

requirements.txt

@@ -1,11 +1,28 @@
+# -*- coding: utf-8 -*-
+
 from setuptools import setup, find_packages
 from platform import python_version_tuple
 import io
+import sys
 
 
 def requirements():
     with open('requirements.txt', 'r') as fileobj:
-        requirements = [line.strip() for line in fileobj]
+        requirements = []
+
+        # certifi2021.10.8之后的版本不再支持python2和python3.6之前的版本
+        if sys.version_info.major < 3 or \
+                (sys.version_info.major == 3 and sys.version_info.minor < 6):
+            requirements.append('certifi<=2021.10.8')
+
+        # requests2.27.1之后的版本不再支持python2和python3.7之前的版本
+        if sys.version_info.major < 3 or \
+                (sys.version_info.major == 3 and sys.version_info.minor < 7):
+            requirements.append('requests>=2.8,<=2.27.1')
+        else:
+            requirements.append('requests>=2.8')
+
+        requirements.extend([line.strip() for line in fileobj])
         return requirements
 
 
@@ -16,7 +33,7 @@ def long_description():
 
 setup(
     name='cos-python-sdk-v5',
-    version='1.9.18',
+    version='1.9.19',
     url='https://www.qcloud.com/',
     license='MIT',
     author='tiedu, lewzylu, channingliu',

setup.py

@@ -1949,6 +1949,37 @@ def test_ci_list_doc_transcode_jobs():
     assert (response['JobsDetail'])
 
 
+def test_ci_live_video_auditing():
+    if TEST_CI != 'true':
+        return
+    # 提交视频流审核任务
+    response = client.ci_auditing_live_video_submit(
+                    Bucket=ci_bucket_name,
+                    Url='rtmp://example.com/live/123',
+                    Callback='http://callback.com/',
+                    DataId='testdataid-111111',
+                    UserInfo={
+                        'TokenId': 'token',
+                        'Nickname': 'test',
+                        'DeviceId': 'DeviceId-test',
+                        'AppId': 'AppId-test',
+                        'Room': 'Room-test',
+                        'IP': 'IP-test',
+                        'Type': 'Type-test',
+                    },
+                    BizType="44f32597a627d013962c54d459a9ab6e",
+                )
+    assert (response['JobsDetail']['JobId'])
+    jobId = response['JobsDetail']['JobId']
+    time.sleep(5)
+    response = client.ci_auditing_live_video_cancle(
+                    Bucket=ci_bucket_name,
+                    JobID=jobId,
+                )
+    print(response)
+    assert (response['JobsDetail'])
+
+
 def test_sse_c_file():
     """测试SSE-C的各种接口"""
     bucket = test_bucket
@@ -2071,6 +2102,7 @@ def test_sse_c_file():
     test_ci_list_media_transcode_jobs()
     test_ci_create_doc_transcode_jobs()
     test_ci_list_doc_transcode_jobs()
+    test_ci_live_video_auditing()
     test_get_media_info()
     test_get_snapshot()
     test_get_pm3u8()