Skip to content

Commit

Permalink
fix api endpoint method. adjust build scripts (#95)
Browse files Browse the repository at this point in the history
  • Loading branch information
scrowley-Datirium authored Oct 25, 2023
1 parent 4597176 commit 974fb9b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions cwl_airflow/components/api/backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@ def post_dags_dag_runs(self, body: dict):
workflow_data = None if body['workflow_data'] is None else body['workflow_data']
dag_id = None if workflow_data['dag_id'] is None else workflow_data['dag_id']
run_id = None if workflow_data['run_id'] is None else workflow_data['run_id']
project_id = None if run_data['proj_id'] is None else run_data['proj_id']
conf = None if run_data['conf'] is None else run_data['conf']
project_id = None if workflow_data['proj_id'] is None else workflow_data['proj_id']
conf = None if workflow_data['conf'] is None else workflow_data['conf']
logging.info(f"Call post_dags_dag_runs with dag_id={dag_id}, run_id={run_id}, conf={conf}")
conf = "{\"job\":{}}" if conf is None else conf # safety measure if conf wasn't provided
if not self.simulation_mode:
Expand Down
4 changes: 2 additions & 2 deletions packaging/portable/linux/pack_linux_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

CENTOS_VERSION=${1:-"7"} # Shouldn't influence on the results. We need it only to unpack AppImage. Better to keep 7 for manylinux2014
MANYLINUX_VERSION=${2:-"2014"} # This means that downloaded python version has been built in CentOS 7. See https://www.python.org/dev/peps/pep-0599/ for details.
PYTHON_VERSION=${3:-"3.8.12"} # Three digits. Before build check the latest available versions on https://github.com/niess/python-appimage/tags
CWL_AIRFLOW_VERSION=${4:-`git rev-parse --abbrev-ref HEAD`} # Will be always pulled from GitHub. Doesn't support build from local directory
PYTHON_VERSION=${3:-"3.8.18"} # Three digits. Before build check the latest available versions on https://github.com/niess/python-appimage/tags
CWL_AIRFLOW_VERSION=${4:-"master"} #-`git rev-parse --abbrev-ref HEAD`} # Will be always pulled from GitHub. Doesn't support build from local directory

WORKING_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
echo "Packing CWL-Airflow ($CWL_AIRFLOW_VERSION) for Python ${PYTHON_VERSION} in dockerized Centos $CENTOS_VERSION"
Expand Down
3 changes: 2 additions & 1 deletion packaging/portable/linux/private/pack_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ echo "Updating permissions to u+w for python3 folder"
chmod -R u+w python3

echo "Compressing relocatable Python ${PYTHON_VERSION} with installed CWL-Airflow ($CWL_AIRFLOW_VERSION) to tar.gz"
OUTPUT_NAME="python_${PYTHON_VERSION}_cwl_airflow_${CWL_AIRFLOW_VERSION}_linux.tar.gz"
OUTPUT_NAME="python_${PYTHON_VERSION}_cwl_airflow_master_linux.tar.gz"
#"python_${PYTHON_VERSION}_cwl_airflow_${CWL_AIRFLOW_VERSION}_linux.tar.gz"
tar -zcf $OUTPUT_NAME python3
rm -rf python3

0 comments on commit 974fb9b

Please sign in to comment.