diff --git a/__init__.py b/__init__.py deleted file mode 100644 index cc9c0d2..0000000 --- a/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -import sys -sys.path.insert(0, '/opt/airflow/dags/repo') diff --git a/dags/business/amap_key_generate_dag.py b/dags/business/amap_key_generate_dag.py index 131be72..9bd2397 100644 --- a/dags/business/amap_key_generate_dag.py +++ b/dags/business/amap_key_generate_dag.py @@ -3,18 +3,15 @@ sys.path.insert(0, '/opt/airflow/dags/repo') from airflow.operators.bash import BashOperator import pendulum -from dags.my_dag import MyDAG -import logging -log = logging.getLogger(__name__) +from airflow import DAG -with MyDAG( +with DAG( "amap_key_generate_dag", # 每天运行 schedule_interval="0 2 * * *", start_date=pendulum.datetime(2023, 3, 11, tz="Asia/Shanghai"), catchup=True, ) as dag: - log.info("enter in MyDAG CHILD") t1 = BashOperator( task_id='amap_key_generate', bash_command='python /opt/airflow/dags/repo/dags/business/business/amap_key_generate.py', diff --git a/dags/business/business/amap_key_generate.py b/dags/business/business/amap_key_generate.py index f91f4a7..6e00770 100644 --- a/dags/business/business/amap_key_generate.py +++ b/dags/business/business/amap_key_generate.py @@ -1,6 +1,9 @@ from goojia_utils import REDIS_CLIENT import json +import dags.install as install +install() + """ 高德key每日定时生成 """ diff --git a/dags/install.py b/dags/install.py new file mode 100644 index 0000000..039743c --- /dev/null +++ b/dags/install.py @@ -0,0 +1,8 @@ +import logging +import os +log = logging.getLogger(__name__) + + +log.info("begin install requirements") +os.system("pip install -I -r /opt/airflow/dags/repo/dags/requirements.txt -i https://repo.fangjia.com/repository/pypi-public/simple/") +log.info("finish install requirements") \ No newline at end of file diff --git a/dags/my_dag.py b/dags/my_dag.py deleted file mode 100644 index b45f972..0000000 --- a/dags/my_dag.py +++ /dev/null @@ -1,26 +0,0 @@ -from datetime import datetime -from airflow.operators.bash import BashOperator - -from airflow.models import DAG -import logging -log = logging.getLogger(__name__) - - -class MyDAG(DAG): - pass - - -class MyDAG(DAG): - log.info("enter in MyDAG") - - def __init__(self, *args, **kwargs): - log.info('SUCCESS') - super().__init__( - *args, **kwargs - ) - install = BashOperator( - task_id='install_required', - bash_command='pip install -I -r requirements.txt -i https://repo.fangjia.com/repository/pypi-public/simple/', - ) - install - log.info('OK') \ No newline at end of file diff --git a/requirements.txt b/dags/requirements.txt similarity index 100% rename from requirements.txt rename to dags/requirements.txt diff --git a/install.bat b/install.bat deleted file mode 100644 index 87831a0..0000000 --- a/install.bat +++ /dev/null @@ -1 +0,0 @@ -pip install -I -r requirements.txt -i https://repo.fangjia.com/repository/pypi-public/simple/