airflow-unicore-integration 0.1.11__tar.gz → 0.1.12__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (22) hide show
  1. {airflow_unicore_integration-0.1.11/src/airflow_unicore_integration.egg-info → airflow_unicore_integration-0.1.12}/PKG-INFO +1 -1
  2. {airflow_unicore_integration-0.1.11 → airflow_unicore_integration-0.1.12}/pyproject.toml +1 -1
  3. {airflow_unicore_integration-0.1.11 → airflow_unicore_integration-0.1.12}/src/airflow_unicore_integration/util/job.py +6 -0
  4. {airflow_unicore_integration-0.1.11 → airflow_unicore_integration-0.1.12/src/airflow_unicore_integration.egg-info}/PKG-INFO +1 -1
  5. {airflow_unicore_integration-0.1.11 → airflow_unicore_integration-0.1.12}/LICENSE +0 -0
  6. {airflow_unicore_integration-0.1.11 → airflow_unicore_integration-0.1.12}/README.rst +0 -0
  7. {airflow_unicore_integration-0.1.11 → airflow_unicore_integration-0.1.12}/setup.cfg +0 -0
  8. {airflow_unicore_integration-0.1.11 → airflow_unicore_integration-0.1.12}/src/airflow_unicore_integration/__init__.py +0 -0
  9. {airflow_unicore_integration-0.1.11 → airflow_unicore_integration-0.1.12}/src/airflow_unicore_integration/executors/__init__.py +0 -0
  10. {airflow_unicore_integration-0.1.11 → airflow_unicore_integration-0.1.12}/src/airflow_unicore_integration/executors/run_task_via_supervisor.py +0 -0
  11. {airflow_unicore_integration-0.1.11 → airflow_unicore_integration-0.1.12}/src/airflow_unicore_integration/executors/unicore_executor.py +0 -0
  12. {airflow_unicore_integration-0.1.11 → airflow_unicore_integration-0.1.12}/src/airflow_unicore_integration/hooks/__init__.py +0 -0
  13. {airflow_unicore_integration-0.1.11 → airflow_unicore_integration-0.1.12}/src/airflow_unicore_integration/hooks/unicore_hooks.py +0 -0
  14. {airflow_unicore_integration-0.1.11 → airflow_unicore_integration-0.1.12}/src/airflow_unicore_integration/operators/__init__.py +0 -0
  15. {airflow_unicore_integration-0.1.11 → airflow_unicore_integration-0.1.12}/src/airflow_unicore_integration/operators/unicore_operators.py +0 -0
  16. {airflow_unicore_integration-0.1.11 → airflow_unicore_integration-0.1.12}/src/airflow_unicore_integration/policies/__init__.py +0 -0
  17. {airflow_unicore_integration-0.1.11 → airflow_unicore_integration-0.1.12}/src/airflow_unicore_integration/util/launch_script_content.py +0 -0
  18. {airflow_unicore_integration-0.1.11 → airflow_unicore_integration-0.1.12}/src/airflow_unicore_integration.egg-info/SOURCES.txt +0 -0
  19. {airflow_unicore_integration-0.1.11 → airflow_unicore_integration-0.1.12}/src/airflow_unicore_integration.egg-info/dependency_links.txt +0 -0
  20. {airflow_unicore_integration-0.1.11 → airflow_unicore_integration-0.1.12}/src/airflow_unicore_integration.egg-info/entry_points.txt +0 -0
  21. {airflow_unicore_integration-0.1.11 → airflow_unicore_integration-0.1.12}/src/airflow_unicore_integration.egg-info/requires.txt +0 -0
  22. {airflow_unicore_integration-0.1.11 → airflow_unicore_integration-0.1.12}/src/airflow_unicore_integration.egg-info/top_level.txt +0 -0
{airflow_unicore_integration-0.1.11/src/airflow_unicore_integration.egg-info → airflow_unicore_integration-0.1.12}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: airflow-unicore-integration
3
- Version: 0.1.11
3
+ Version: 0.1.12
4
4
  Summary: Running Unicore Jobs from airflow DAGs.
5
5
  Author-email: Christian Böttcher <c.boettcher@fz-juelich.de>
6
6
  License-Expression: BSD-3-Clause
{airflow_unicore_integration-0.1.11 → airflow_unicore_integration-0.1.12}/pyproject.toml RENAMED
@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
7
7
 
8
8
  [project]
9
9
  name = "airflow-unicore-integration"
10
- version = "0.1.11"
10
+ version = "0.1.12"
11
11
  authors = [
12
12
  { name="Christian Böttcher", email="c.boettcher@fz-juelich.de" },
13
13
  ]
{airflow_unicore_integration-0.1.11 → airflow_unicore_integration-0.1.12}/src/airflow_unicore_integration/util/job.py RENAMED
@@ -25,6 +25,7 @@ class JobDescriptionGenerator:
25
25
  EXECUTOR_CONFIG_PROJECT = "Project" # gets added to the unicore job description
26
26
  EXECUTOR_CONFIG_PRE_COMMANDS = "precommands" # gets added to the unicore job description
27
27
  EXECUTOR_CONFIG_POST_COMMANDS = "postcommands" # gets added to the unicore job descirption
28
+ EXECUTOR_CONFIG_JOB_TYPE = "job_type"
28
29
  EXECUTOR_CONFIG_UNICORE_CONN_KEY = (
29
30
  "unicore_connection_id" # alternative connection id for the Unicore connection to use
30
31
  )
@@ -59,6 +60,7 @@ class NaiveJobDescriptionGenerator(JobDescriptionGenerator):
59
60
  user_added_pre_commands: list[str] = executor_config.get(JobDescriptionGenerator.EXECUTOR_CONFIG_PRE_COMMANDS, []) # type: ignore
60
61
  user_defined_python_env: str = workload.ti.executor_config.get(JobDescriptionGenerator.EXECUTOR_CONFIG_PYTHON_ENV_KEY, None) # type: ignore
61
62
  user_added_post_commands: list[str] = executor_config.get(JobDescriptionGenerator.EXECUTOR_CONFIG_POST_COMMANDS, []) # type: ignore
63
+ user_defined_job_type: str = executor_config.get(JobDescriptionGenerator.EXECUTOR_CONFIG_JOB_TYPE, None) # type: ignore
62
64
  # get local dag path from cmd and fix dag path in arguments
63
65
  dag_rel_path = str(workload.dag_rel_path)
64
66
  if dag_rel_path.startswith("DAG_FOLDER"):
@@ -71,6 +73,10 @@ class NaiveJobDescriptionGenerator(JobDescriptionGenerator):
71
73
  )
72
74
  logger.debug(f"Server is {server}")
73
75
 
76
+ # set job type
77
+ if user_defined_job_type:
78
+ job_descr_dict["Job type"] = user_defined_job_type
79
+
74
80
  # check which python virtualenv to use
75
81
  if user_defined_python_env:
76
82
  python_env = user_defined_python_env
{airflow_unicore_integration-0.1.11 → airflow_unicore_integration-0.1.12/src/airflow_unicore_integration.egg-info}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: airflow-unicore-integration
3
- Version: 0.1.11
3
+ Version: 0.1.12
4
4
  Summary: Running Unicore Jobs from airflow DAGs.
5
5
  Author-email: Christian Böttcher <c.boettcher@fz-juelich.de>
6
6
  License-Expression: BSD-3-Clause