smartpush 1.0.2.9__py3-none-any.whl → 1.0.3.1__py3-none-any.whl

smartpush/export/basic/ExcelExportChecker.py

@@ -1,8 +1,13 @@
 import os
+import re
 from io import BytesIO
 import pandas as pd
 import numpy as np
+import warnings
 from requests import request
+"""
+用于excel校验
+"""
 
 
 def read_excel_from_oss(method="get", url=""):
@@ -26,7 +31,9 @@ def read_excel_and_write_to_dict(excel_data=None, file_name=None):
             pass
         elif file_name is not None:
             excel_data = os.path.join(os.path.dirname(os.getcwd()) + "/check_file/" + file_name)
-        df = pd.read_excel(excel_data, engine="openpyxl")
+        with warnings.catch_warnings():
+            warnings.filterwarnings("ignore", category=UserWarning, module=re.escape('openpyxl.styles.stylesheet'))
+            df = pd.read_excel(excel_data, engine="openpyxl")
         # 将DataFrame转换为字典，以行为单位存储数据
         row_dict = {}  # 创建一个空字典来存储按行转换的数据
         for index, row in df.iterrows():  # 遍历DataFrame中的每一行
@@ -46,12 +53,15 @@ def read_excel_and_write_to_list(excel_data=None, file_name=None):
             pass
         elif file_name is not None:
             excel_data = os.path.join(os.path.dirname(os.getcwd()) + "/check_file/" + file_name)
-        df = pd.read_excel(excel_data, engine="openpyxl")
+
+        with warnings.catch_warnings():
+            warnings.filterwarnings("ignore", category=UserWarning, module=re.escape('openpyxl.styles.stylesheet'))
+            df = pd.read_excel(excel_data, engine="openpyxl")
         # 将DataFrame转换为字典，以行为单位存储数据
         rows_list = df.values.tolist()
         return rows_list
     except Exception as e:
-        print(f"excel写入dict时出错：{e}")
+        print(f"excel写入list时出错：{e}")
 
 
 def read_excel_and_write_to_csv(excel_data, file_name):
@@ -72,7 +82,7 @@ def check_excel(actual, expected):
     """
     try:
         if actual == expected:
-            return True
+            return True, ["完全匹配"]
         else:
             errors = []
             # 断言1：校验行数
@@ -80,7 +90,7 @@ def check_excel(actual, expected):
             expected_num = len(expected)
             check_row = actual_num - expected_num
             if check_row == 0:
-                pass
+                errors.append("预期和实际行数相等，为" + str(actual_num) + "行")
             else:
                 errors.append(
                     "行数和预期对比差" + check_row.__str__() + "行" + ", 实际:" + str(actual_num) + "预期: " + str(
@@ -99,6 +109,7 @@ def check_excel(actual, expected):
             return False, errors
     except Exception as e:
         print(f"对比excel：{e}")
+        return False, [e]
 
 
 def del_temp_file(file_name=""):

smartpush/felix_test.py

@@ -1,8 +1,11 @@
+import requests
+
 from smartpush.export.basic import ExcelExportChecker
 
 if __name__ == '__main__':
 
     ossurl = "https://sl-smartfile.oss-ap-southeast-1.aliyuncs.com/material_ec2/2025-01-16/8556e34c8d4d45f0bb2d42dc8871a90b/%E8%A1%A8%E5%8D%95%E4%BB%BB%E5%8A%A1%E6%95%B0%E6%8D%AE%E6%A6%82%E8%A7%88.xlsx"
     excelOss = ExcelExportChecker.read_excel_from_oss(url=ossurl)
-    excelList = ExcelExportChecker.read_excel_and_write_to_list(excel_data=excelOss)
+    excelList = ExcelExportChecker.read_excel_and_write_to_dict(excel_data=excelOss)
     print(excelList)
+

{smartpush-1.0.2.9.dist-info → smartpush-1.0.3.1.dist-info}/METADATA

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

smartpush-1.0.3.1.dist-info/RECORD

@@ -0,0 +1,10 @@
+smartpush/__init__.py,sha256=XJrl1vhGATHSeSVqKmPXxYqxyseriUpvY5tLIXir3EE,24
+smartpush/felix_test.py,sha256=5ke2JOal9FWC5GK4Qpdzlt7Tdlab1vb4LJyBLTd3hYk,476
+smartpush/get_jira_info.py,sha256=dmCwkKa94xwyE2hegE1KBI3cV_LbrJ67P9osORUGPt4,2633
+smartpush/export/__init__.py,sha256=D9GbWcmwnetEndFDty5XbVienFK1WjqV2yYcQp3CM84,99
+smartpush/export/basic/ExcelExportChecker.py,sha256=N_vQL2AWX2CfakfH6QJLhkx3EcRiqFmAdX7F5HJRlMk,4794
+smartpush/export/basic/__init__.py,sha256=6tcrS-2NSlsJo-UwEsnGUmwCf7jgOsh_UEbM0FD-gYE,70
+smartpush-1.0.3.1.dist-info/METADATA,sha256=cuwVFc6-wYLsmDg9y3KQRb86JuwJ89nfdFSrzAXpg30,147
+smartpush-1.0.3.1.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+smartpush-1.0.3.1.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
+smartpush-1.0.3.1.dist-info/RECORD,,

smartpush-1.0.2.9.dist-info/RECORD

@@ -1,10 +0,0 @@
-smartpush/__init__.py,sha256=XJrl1vhGATHSeSVqKmPXxYqxyseriUpvY5tLIXir3EE,24
-smartpush/felix_test.py,sha256=AaLMo_SWsm_NQLj-SbcPcoSpcf-wluCLWdr3hm0_BCI,458
-smartpush/get_jira_info.py,sha256=dmCwkKa94xwyE2hegE1KBI3cV_LbrJ67P9osORUGPt4,2633
-smartpush/export/__init__.py,sha256=D9GbWcmwnetEndFDty5XbVienFK1WjqV2yYcQp3CM84,99
-smartpush/export/basic/ExcelExportChecker.py,sha256=t1_28uY0LB1rUgOfIlyXUtH5y8id85zkLvGCmAIPQCE,4305
-smartpush/export/basic/__init__.py,sha256=6tcrS-2NSlsJo-UwEsnGUmwCf7jgOsh_UEbM0FD-gYE,70
-smartpush-1.0.2.9.dist-info/METADATA,sha256=AqcfMMuqlv0vOAmIXAI1GfC0DFrzaxkLeruueb9c62s,147
-smartpush-1.0.2.9.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-smartpush-1.0.2.9.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
-smartpush-1.0.2.9.dist-info/RECORD,,