airflow-unicore-integration 0.1.7__tar.gz → 0.1.8__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 (21) hide show
  1. {airflow_unicore_integration-0.1.7/src/airflow_unicore_integration.egg-info → airflow_unicore_integration-0.1.8}/PKG-INFO +1 -1
  2. {airflow_unicore_integration-0.1.7 → airflow_unicore_integration-0.1.8}/pyproject.toml +1 -1
  3. {airflow_unicore_integration-0.1.7 → airflow_unicore_integration-0.1.8}/src/airflow_unicore_integration/executors/unicore_executor.py +3 -4
  4. {airflow_unicore_integration-0.1.7 → airflow_unicore_integration-0.1.8/src/airflow_unicore_integration.egg-info}/PKG-INFO +1 -1
  5. {airflow_unicore_integration-0.1.7 → airflow_unicore_integration-0.1.8}/LICENSE +0 -0
  6. {airflow_unicore_integration-0.1.7 → airflow_unicore_integration-0.1.8}/README.rst +0 -0
  7. {airflow_unicore_integration-0.1.7 → airflow_unicore_integration-0.1.8}/setup.cfg +0 -0
  8. {airflow_unicore_integration-0.1.7 → airflow_unicore_integration-0.1.8}/src/airflow_unicore_integration/__init__.py +0 -0
  9. {airflow_unicore_integration-0.1.7 → airflow_unicore_integration-0.1.8}/src/airflow_unicore_integration/executors/__init__.py +0 -0
  10. {airflow_unicore_integration-0.1.7 → airflow_unicore_integration-0.1.8}/src/airflow_unicore_integration/executors/run_task_via_supervisor.py +0 -0
  11. {airflow_unicore_integration-0.1.7 → airflow_unicore_integration-0.1.8}/src/airflow_unicore_integration/hooks/__init__.py +0 -0
  12. {airflow_unicore_integration-0.1.7 → airflow_unicore_integration-0.1.8}/src/airflow_unicore_integration/hooks/unicore_hooks.py +0 -0
  13. {airflow_unicore_integration-0.1.7 → airflow_unicore_integration-0.1.8}/src/airflow_unicore_integration/operators/__init__.py +0 -0
  14. {airflow_unicore_integration-0.1.7 → airflow_unicore_integration-0.1.8}/src/airflow_unicore_integration/operators/unicore_operators.py +0 -0
  15. {airflow_unicore_integration-0.1.7 → airflow_unicore_integration-0.1.8}/src/airflow_unicore_integration/policies/__init__.py +0 -0
  16. {airflow_unicore_integration-0.1.7 → airflow_unicore_integration-0.1.8}/src/airflow_unicore_integration/util/job.py +0 -0
  17. {airflow_unicore_integration-0.1.7 → airflow_unicore_integration-0.1.8}/src/airflow_unicore_integration.egg-info/SOURCES.txt +0 -0
  18. {airflow_unicore_integration-0.1.7 → airflow_unicore_integration-0.1.8}/src/airflow_unicore_integration.egg-info/dependency_links.txt +0 -0
  19. {airflow_unicore_integration-0.1.7 → airflow_unicore_integration-0.1.8}/src/airflow_unicore_integration.egg-info/entry_points.txt +0 -0
  20. {airflow_unicore_integration-0.1.7 → airflow_unicore_integration-0.1.8}/src/airflow_unicore_integration.egg-info/requires.txt +0 -0
  21. {airflow_unicore_integration-0.1.7 → airflow_unicore_integration-0.1.8}/src/airflow_unicore_integration.egg-info/top_level.txt +0 -0
{airflow_unicore_integration-0.1.7/src/airflow_unicore_integration.egg-info → airflow_unicore_integration-0.1.8}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: airflow-unicore-integration
3
- Version: 0.1.7
3
+ Version: 0.1.8
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.7 → airflow_unicore_integration-0.1.8}/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.7"
10
+ version = "0.1.8"
11
11
  authors = [
12
12
  { name="Christian Böttcher", email="c.boettcher@fz-juelich.de" },
13
13
  ]
{airflow_unicore_integration-0.1.7 → airflow_unicore_integration-0.1.8}/src/airflow_unicore_integration/executors/unicore_executor.py RENAMED
@@ -20,7 +20,7 @@ from airflow.executors.workloads import ExecuteTask
20
20
  from airflow.models.taskinstancekey import TaskInstanceKey
21
21
  from airflow.utils.state import TaskInstanceState
22
22
  from pyunicore import client
23
- from pyunicore import credentials
23
+ from pyunicore.credentials import create_credential
24
24
 
25
25
  from ..util.job import JobDescriptionGenerator
26
26
  from ..util.job import NaiveJobDescriptionGenerator
@@ -78,12 +78,11 @@ class UnicoreExecutor(BaseExecutor):
78
78
  overwrite_unicore_credential = executor_config.get( # type: ignore
79
79
  UnicoreExecutor.EXECUTOR_CONFIG_UNICORE_CREDENTIAL_KEY, None
80
80
  ) # task can provide a different credential to use, else default from connection is used
81
- user = conf.get("unicore.executor", "DEFAULT_USER", fallback="demouser")
82
- password = conf.get("unicore.executor", "DEFAULT_PASS", fallback="test123")
81
+ token = conf.get("unicore.executor", "AUTH_TOKEN", fallback="")
83
82
  base_url = conf.get(
84
83
  "unicore.executor", "DEFAULT_URL", fallback="http://localhost:8080/DEMO-SITE/rest/core"
85
84
  )
86
- credential = credentials.UsernamePassword(user, password)
85
+ credential = create_credential(token=token)
87
86
  if overwrite_unicore_site is not None:
88
87
  base_url = overwrite_unicore_site
89
88
  if overwrite_unicore_credential is not None:
{airflow_unicore_integration-0.1.7 → airflow_unicore_integration-0.1.8/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.7
3
+ Version: 0.1.8
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