smartpush 1.0.2.8__py3-none-any.whl → 1.0.3__py3-none-any.whl

smartpush/export/basic/ExcelExportChecker.py

@@ -3,9 +3,11 @@ from io import BytesIO
 import pandas as pd
 import numpy as np
 from requests import request
+"""
+用于excel校验
+"""
 
-
-def read_excel_from_oss(method, url):
+def read_excel_from_oss(method="get", url=""):
     """读取oss的excel内容并写入到本地csv"""
     try:
         result = request(method=method, url=url)
@@ -72,7 +74,7 @@ def check_excel(actual, expected):
     """
     try:
         if actual == expected:
-            return True
+            return True, ["完全匹配"]
         else:
             errors = []
             # 断言1：校验行数
@@ -99,6 +101,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

@@ -0,0 +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)
+    print(excelList)
+

smartpush/get_jira_info.py

@@ -1,64 +1,74 @@
 from jira import JIRA
+import re
 
+def get_jira_info(jira_user, jira_api_key):
+    """
+    获取jira对象
+    @return:
+    """
+    # api_key = "ATATT3xFfGF0JPzR4t2coi53yM2eKZfUy5eXJSbZHqWmbX9PzStyaNCM2lEjn_uP5TkOl_p4pqZCICH5ZqdWkdmfSxJmTsn6AOcU7I3vVWnDl0i1PRktMdSSqWs1yg1JVSVtlGCrMKfZaztsJOjAQsp3Jd6hHdKpB4A4nVBBkmB7sDOpsNbTNeY=910B5249"
 
-def get_custom_fields(jira):
-    all_fields = jira.fields()
-    # print(all_fields)
+    # Jira 服务器的 URL
+    jira_url = "https://shopline.atlassian.net/"
+    # # Jira API 密钥
+    # jira_api_key = api_key
+    # # Jira 用户名
+    # jira_user = "lu.lu@shopline.com"
+
+    # 连接到 Jira 服务器
+    jira = JIRA(server=jira_url, basic_auth=(jira_user, jira_api_key))
+    return jira
+
+
+def get_jira_prodcut(jira, project_key):
+    project = jira.project(str(project_key))
+    print(f"Project: {project.key} - {project.name}")
+    return project
+
+
+def get_custom_fields(jira_obj, project_key='10559'):
+    """
+    查询指定项目jira中的自定义字段，smartpush项目是 10559
+    @param project_id: 项目id
+    @param jira_obj: 对象
+    @return:
+    """
+    all_fields = jira_obj.fields()
+    # print("all_fields:",all_fields)
     custom_fields = {}
     for field in all_fields:
         try:
-            # print(field)
             if field.get('custom'):
-                if field['scope']['project']['id'] == '10559':
+                if field['scope']['project']['id'] == str(project_key):
                     custom_fields[field['id']] = field['name']
         except:
             continue
-    print(custom_fields)
+    print("custom_fields:", custom_fields)
     return custom_fields
 
 
-if __name__ == '__main__':
-    api_key = "ATATT3xFfGF0YeIApQYdm4c671OUkhg5ggVISNgIb0D1Iqpd2dwwunzff98Pc5VQjb74ZN997uXvvxi6LpmNGJx1kW1BLh5AaudMj5RuWTe6uozsGqGpx_QkySeU2HF-JB37kkza9PREOpOSbiDFZxrI0eqYPV9Fe-bJP0RM16V_GSyDPib0wmw=FE3DE2B1"
-
-    # Jira 服务器的 URL
-    jira_url = "https://shopline.atlassian.net/"
-    # Jira API 密钥
-    jira_api_key = api_key
-    # Jira 用户名
-    jira_user = "lu.lu@shopline.com"
-
-    # 连接到 Jira 服务器
-    jira = JIRA(server=jira_url, basic_auth=(jira_user, jira_api_key))
-
-    # 获取一个项目的信息
-    project_key = 10559  # 替换为你想要获取的项目的 key
-    project = jira.project(project_key)
-    print(f"Project: {project.key} - {project.name}")
-
-    all_fields = jira.fields()
-    # print(all_fields)
-
+def get_custom_fields_map(jira, project_key=10559):
     # 获取项目的问题
     issues = jira.search_issues(f"project={project_key}")
     issue = jira.issue(issues[0])
-    # print("Issue Key:", issue.key)
-    # print("Summary:", issue.fields.summary)
-    # # print("Description:", issue.fields.description)
-    # print("Assignee:", issue.fields.assignee.displayName if issue.fields.assignee else "Unassigned")
-    # print("Reporter:", issue.fields.reporter.displayName)
-    # print("Status:", issue.fields.status.name)
-    # print("Priority:", issue.fields.priority.name)
-    # print("Created:", issue.fields.created)
-    # print("Updated:", issue.fields.updated)
-    # print("Due Date:", issue.fields.duedate)
-    # print("Labels:", issue.fields.labels)
-    # print("Components:", [component.name for component in issue.fields.components])
-    # print(issue.fields.__dict__.items())
-    custom_fields = get_custom_fields(jira)
+    custom_fields = get_custom_fields(jira, project_key)
+    print(custom_fields)
+    fields_map = {}
     for field_name, field_value in issue.fields.__dict__.items():
         try:
-            # if field_name.startswith("customfield_"):
-                # continue
-            print(f"Custom Field ID: {field_name}, NAME:{custom_fields[field_name]}, Value: {field_value}")
+            if field_name.startswith("customfield_"):
+                fields_map[custom_fields[field_name]] = field_value
+                print(f"Custom Field ID: {field_name}, NAME:{custom_fields[field_name]}, Value: {field_value}")
+            else:
+                fields_map[field_name] = field_value
+                print(f"ID: {field_name},Value: {field_value}")
         except:
+            # raise
             continue
+    print('fields_map:',fields_map)
+if __name__ == '__main__':
+    api_key = "ATATT3xFfGF0JPzR4t2coi53yM2eKZfUy5eXJSbZHqWmbX9PzStyaNCM2lEjn_uP5TkOl_p4pqZCICH5ZqdWkdmfSxJmTsn6AOcU7I3vVWnDl0i1PRktMdSSqWs1yg1JVSVtlGCrMKfZaztsJOjAQsp3Jd6hHdKpB4A4nVBBkmB7sDOpsNbTNeY=910B5249"
+    # Jira 用户名
+    jira_user = "lu.lu@shopline.com"
+    jira = get_jira_info(jira_user, api_key)
+    get_custom_fields_map(jira)

{smartpush-1.0.2.8.dist-info → smartpush-1.0.3.dist-info}/METADATA

@@ -1,11 +1,6 @@
 Metadata-Version: 2.1
 Name: smartpush
-Version: 1.0.2.8
+Version: 1.0.3
 Summary: 用于smartpush自动化测试工具包
-Home-page: UNKNOWN
 Author: 卢泽彬、邵宇飞、周彦龙
-License: UNKNOWN
-Platform: UNKNOWN
-
-UNKNOWN
 

smartpush-1.0.3.dist-info/RECORD

@@ -0,0 +1,10 @@
+smartpush/__init__.py,sha256=XJrl1vhGATHSeSVqKmPXxYqxyseriUpvY5tLIXir3EE,24
+smartpush/felix_test.py,sha256=I7DkMnqRUa48ALyawoJtPh74zRR86OO3oRnkBi9qJRQ,476
+smartpush/get_jira_info.py,sha256=dmCwkKa94xwyE2hegE1KBI3cV_LbrJ67P9osORUGPt4,2633
+smartpush/export/__init__.py,sha256=D9GbWcmwnetEndFDty5XbVienFK1WjqV2yYcQp3CM84,99
+smartpush/export/basic/ExcelExportChecker.py,sha256=3brXFECXhTMuVnB-CLnaLBK5CZPW2TuooL0n_B6iigg,4374
+smartpush/export/basic/__init__.py,sha256=6tcrS-2NSlsJo-UwEsnGUmwCf7jgOsh_UEbM0FD-gYE,70
+smartpush-1.0.3.dist-info/METADATA,sha256=TgyZqa2PcOcQ3t1sG7qiGoGW10kwhoSji2z9mQ76pZM,145
+smartpush-1.0.3.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+smartpush-1.0.3.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
+smartpush-1.0.3.dist-info/RECORD,,

{smartpush-1.0.2.8.dist-info → smartpush-1.0.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.36.2)
+Generator: bdist_wheel (0.38.4)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

smartpush-1.0.2.8.dist-info/RECORD

@@ -1,9 +0,0 @@
-smartpush/__init__.py,sha256=XJrl1vhGATHSeSVqKmPXxYqxyseriUpvY5tLIXir3EE,24
-smartpush/get_jira_info.py,sha256=zXp5OB9fVY5e0RbYcqlcq3ClqwLBAEvAVPZ1A_PrdMg,2416
-smartpush/export/__init__.py,sha256=D9GbWcmwnetEndFDty5XbVienFK1WjqV2yYcQp3CM84,99
-smartpush/export/basic/ExcelExportChecker.py,sha256=tN4WG5WeP_T3zmeKMTyIVBBUGdzLcQZKeXila5rqb-8,4296
-smartpush/export/basic/__init__.py,sha256=6tcrS-2NSlsJo-UwEsnGUmwCf7jgOsh_UEbM0FD-gYE,70
-smartpush-1.0.2.8.dist-info/METADATA,sha256=FfjUIvI_50v9HSZ2ccW1oA2ega5WZAsSeAR-CyDzlVg,210
-smartpush-1.0.2.8.dist-info/WHEEL,sha256=OqRkF0eY5GHssMorFjlbTIq072vpHpF60fIQA6lS9xA,92
-smartpush-1.0.2.8.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
-smartpush-1.0.2.8.dist-info/RECORD,,