浏览代码

重构目录结构

赵小蒙 1 年之前
父节点
当前提交
789918dffb
共有 4 个文件被更改,包括 3 次插入4 次删除
  1. 2 2
      app/common/s3.py
  2. 0 0
      pipeline/__init__.py
  3. 1 2
      test/test_commons.py
  4. 0 0
      test/test_para/__init__.py

+ 2 - 2
spark/s3_tools.py → app/common/s3.py

@@ -2,10 +2,10 @@
 import boto3
 from botocore.client import Config
 
-from spark import s3_buckets, s3_clusters, get_cluster_name, s3_users
+from app.common import s3_buckets, s3_clusters, get_cluster_name, s3_users
 import re
 import random
-from typing import Dict, Iterator, List, Tuple, Union
+from typing import List, Union
 
 __re_s3_path = re.compile("^s3a?://([^/]+)(?:/(.*))?$")
 def get_s3_config(path: Union[str, List[str]], outside=False):

+ 0 - 0
test/__init__.py → pipeline/__init__.py


+ 1 - 2
test/test_commons.py

@@ -1,10 +1,9 @@
 import io
 import json
 import os
-import unittest
 from libs.commons import fitz
 
-from spark.s3_tools import get_s3_config, get_s3_client
+from app.common.s3 import get_s3_config, get_s3_client
 from libs.commons import join_path, json_dump_path, read_file, parse_bucket_key
 from loguru import logger
 

+ 0 - 0
test/test_para/__init__.py