smartpush 1.0.6__py3-none-any.whl → 1.0.7__py3-none-any.whl

smartpush/export/basic/ExcelExportChecker.py

@@ -89,8 +89,7 @@ def read_excel_and_write_to_list(excel_data=None, file_name=None, **kwargs):
 
         with warnings.catch_warnings():
             warnings.filterwarnings("ignore", category=UserWarning, module=re.escape('openpyxl.styles.stylesheet'))
-            df = pd.read_excel(excel_data, engine="openpyxl", **kwargs)
-            print(df)
+            df = pd.read_excel(excel_data, engine="openpyxl", na_filter=False, **kwargs)
         # 将DataFrame转换为字典，以行为单位存储数据
         rows_list = df.values.tolist()
         return rows_list
@@ -240,8 +239,6 @@ def check_excel_content(actual, expected):
      """
     try:
         # TODO 嵌套list -dict 比较失败
-        print(actual)
-        print(expected)
         if actual == expected:
             return True, ["excel内容-完全匹配"]
         else:
@@ -254,29 +251,22 @@ def check_excel_content(actual, expected):
                 errors.append("excel内容-预期和实际行数相等，为" + str(actual_num) + "行")
             else:
                 errors.append(
-                    "excel内容-行数和预期对比差" + check_row.__str__() + "行" + ", 实际:" + str(
-                        actual_num) + "预期: " + str(
-                        expected_num))
+                    "excel内容-行数和预期对比差" + check_row.__str__() + "行" + ", 实际:" + str(actual_num) + "预期: " + str(expected_num))
             # 断言不匹配行
             if check_row >= 0:
                 num = len(expected)
             else:
                 num = len(actual)
             for i in range(num):
-                # 将nan转换成None
-                actual[i] = [None if isinstance(x, (float, int)) and np.isnan(x) else x for x in actual[i]]
-                expected[i] = [None if isinstance(x, (float, int)) and np.isnan(x) else x for x in expected[i]]
                 if actual[i] == expected[i]:
                     continue
                 else:
                     errors.append(
-                        "excel内容-第" + str(i + 1) + "行不匹配，预期为：" + str(expected[i]) + ", 实际为: " + str(
-                            actual[i]))
+                        "excel内容-第" + str(i + 1) + "行不匹配，预期为：" + str(expected[i]) + ", 实际为: " + str(actual[i]))
             return False, errors
     except Exception as e:
-        raise e
-        # print(f"：excel内容-服务异常{e}")
-        # return False, [e]
+        print(f"：excel内容-服务异常{e}")
+        return False, [e]
 
 
 def del_temp_file(file_name=""):
@@ -290,12 +280,3 @@ def del_temp_file(file_name=""):
     except Exception as e:
         print(f"删除文件 {file_path} 时出错：{e}")
 
-
-if __name__ == '__main__':
-    # print(check_excel_for_lu("content",actual_oss="https://sl-smartfile.oss-ap-southeast-1.aliyuncs.com/material_ec2_prod/2025-01-20/fcb98e2965314ef2862db65760dcce1f/ab%E5%BC%B9%E7%AA%97%E6%B4%BB%E5%8A%A8-%E8%BD%AC%E5%8C%96%E7%8E%87%E8%8E%B7%E8%83%9C%E9%94%80%E5%94%AE%E9%A2%9D%E6%98%8E%E7%BB%86%E6%95%B0%E6%8D%AE.xlsx",expected_oss="https://sl-smartfile.oss-ap-southeast-1.aliyuncs.com/material_ec2_prod/2025-01-20/fcb98e2965314ef2862db65760dcce1f/ab%E5%BC%B9%E7%AA%97%E6%B4%BB%E5%8A%A8-%E8%BD%AC%E5%8C%96%E7%8E%87%E8%8E%B7%E8%83%9C%E9%94%80%E5%94%AE%E9%A2%9D%E6%98%8E%E7%BB%86%E6%95%B0%E6%8D%AE.xlsx"))
-    eexcelxcel = check_excel_for_lu("all",expected_oss="https://sl-smartfile.oss-ap-southeast-1.aliyuncs.com/material/2025-01-24/3e1048ec9a7949b3be3727e71f4be645"
-        "/AutoTest-%E5%9B%BA%E5%AE%9AB-2025-01-24%20%E5%89%B5%E5%BB%BA%E7%9A%84Email12%E6%95%B0%E6%8D%AE%E6%A6%82%E8"
-        "%A7%88.xlsx", actual_oss = "https://sl-smartfile.oss-ap-southeast-1.aliyuncs.com/material/2025-01-24/3e1048ec9a7949b3be3727e71f4be645"
-        "/AutoTest-%E5%9B%BA%E5%AE%9AB-2025-01-24%20%E5%89%B5%E5%BB%BA%E7%9A%84Email12%E6%95%B0%E6%8D%AE%E6%A6%82%E8"
-        "%A7%88.xlsx")
-    print(eexcelxcel)

smartpush/felix_test.py

@@ -4,13 +4,13 @@ from smartpush.export.basic import ExcelExportChecker
 
 if __name__ == '__main__':
 
-    ossurl1 = "https://cdn.smartpushedm.com/material_ec2/2025-02-10/94202be5d244428aa5fd560ce7ede732/%E7%94%A8%E6%88%B7%E7%95%99%E5%AD%98.xlsx"
-    ossurl2 = "https://cdn.smartpushedm.com/material_ec2/2025-02-10/6df986e7855049f7846ae5fe1098c331/%E7%94%A8%E6%88%B7%E7%95%99%E5%AD%98.xlsx"
+    ossurl1 = "https://cdn.smartpushedm.com/material_ec2/2025-02-10/4f3c7f2ad92946a894e3df9176341e1c/%E7%94%A8%E6%88%B7%E7%95%99%E5%AD%98.xlsx"
+    ossurl2 = "https://cdn.smartpushedm.com/material_ec2/2025-02-10/238f1f143d34441e9cfd61ba68ce8dd1/%E7%94%A8%E6%88%B7%E7%95%99%E5%AD%98.xlsx"
     #
     # # a = ExcelExportChecker.read_excel_and_write_to_list(excel_data=ExcelExportChecker.read_excel_from_oss(url=ossurl1))
     # # b = ExcelExportChecker.read_excel_and_write_to_list(excel_data=ExcelExportChecker.read_excel_from_oss(url=ossurl2))
     # # print(ExcelExportChecker.check_excel(actual=a, expected=b))
-    print(ExcelExportChecker.check_excel(check_type="all", actual_oss=ossurl1, expected_oss=ossurl2))
+    print(ExcelExportChecker.check_excel(check_type="content", actual_oss=ossurl1, expected_oss=ossurl2))
 
     # a = ['2025-01-02', 1, '100%', 0.0, '0%', 0.0, '0%', nan, nan]
     # b = ['2025-01-02', 1, '100%', 0.0, '0%', 0.0, '0%', nan, nan]

{smartpush-1.0.6.dist-info → smartpush-1.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: smartpush
-Version: 1.0.6
+Version: 1.0.7
 Summary: 用于smartpush自动化测试工具包
 Author: 卢泽彬、邵宇飞、周彦龙
 

smartpush-1.0.7.dist-info/RECORD

@@ -0,0 +1,10 @@
+smartpush/__init__.py,sha256=XJrl1vhGATHSeSVqKmPXxYqxyseriUpvY5tLIXir3EE,24
+smartpush/felix_test.py,sha256=CpB1NMDZ4RAtE028XVYfhxTU7RQPSqlWN6ejGO7ww7I,1020
+smartpush/get_jira_info.py,sha256=dmCwkKa94xwyE2hegE1KBI3cV_LbrJ67P9osORUGPt4,2633
+smartpush/export/__init__.py,sha256=D9GbWcmwnetEndFDty5XbVienFK1WjqV2yYcQp3CM84,99
+smartpush/export/basic/ExcelExportChecker.py,sha256=T9eDPgNh5zekCAdKFu67aHjQPhKQKzK1BUGtn7UQuh0,12187
+smartpush/export/basic/__init__.py,sha256=6tcrS-2NSlsJo-UwEsnGUmwCf7jgOsh_UEbM0FD-gYE,70
+smartpush-1.0.7.dist-info/METADATA,sha256=yzrYvDW9A0LEV_wFXD39PwOEGo7JjwSf4e-qprMvcVg,145
+smartpush-1.0.7.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+smartpush-1.0.7.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
+smartpush-1.0.7.dist-info/RECORD,,

smartpush-1.0.6.dist-info/RECORD

@@ -1,10 +0,0 @@
-smartpush/__init__.py,sha256=XJrl1vhGATHSeSVqKmPXxYqxyseriUpvY5tLIXir3EE,24
-smartpush/felix_test.py,sha256=V6TMemTQDzz-tKRHEatUYQeEXLrbefKW7jLiBJ9wy7k,1016
-smartpush/get_jira_info.py,sha256=dmCwkKa94xwyE2hegE1KBI3cV_LbrJ67P9osORUGPt4,2633
-smartpush/export/__init__.py,sha256=D9GbWcmwnetEndFDty5XbVienFK1WjqV2yYcQp3CM84,99
-smartpush/export/basic/ExcelExportChecker.py,sha256=HsxDvEjrbz7eOqGUWFl0nstDfFNEMHeQcu4xL03nZuk,13818
-smartpush/export/basic/__init__.py,sha256=6tcrS-2NSlsJo-UwEsnGUmwCf7jgOsh_UEbM0FD-gYE,70
-smartpush-1.0.6.dist-info/METADATA,sha256=Gq0meSdGsWSClFVvUfb3q2nyJCvwU09DqdskXexIys0,145
-smartpush-1.0.6.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-smartpush-1.0.6.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
-smartpush-1.0.6.dist-info/RECORD,,