Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

soopervisor --skip-docker should use the configured repository when running with AWS Batch #132

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

soopervisor --skip-docker should use the configured repository when running with AWS Batch #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bf5607b
soopervisor --skip-docker should use the configured repository when r…
meprem Jan 24, 2025
085fa3a
Merge pull request #1 from meprem/meprem-patch-1
meprem Jan 24, 2025
f28b581
skip-docker should use the configured repository when running with AW…
meprem Jan 27, 2025
ae57755
Fix build
meprem Feb 17, 2025
dbe16df
Update python 3.8 to 3.9
meprem Feb 17, 2025
f8e54e2
Test build on all three platforms after removing latest PyYAML and cy…
meprem Feb 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/soopervisor/assets/airflow/kubernetes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from airflow import DAG
from airflow.utils.dates import days_ago
from airflow.providers.cncf.kubernetes.operators.kubernetes_pod import (
from airflow.providers.cncf.kubernetes.operators.pod import (
KubernetesPodOperator,
)

Expand Down
3 changes: 2 additions & 1 deletion src/soopervisor/aws/batch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,8 @@ def _export(
pkg_name, version = source.find_package_name_and_version()
default_image_key = get_default_image_key()
if default_image_key:
image_local = f"{pkg_name}:{version}-"
# Use image from ECR repository from the config file.
image_local = f"{cfg.repository}:{version}"
f"{docker.modify_wildcard(default_image_key)}"
image_map = {}
image_map[default_image_key] = image_local
Expand Down
2 changes: 1 addition & 1 deletion tests/airflow/test_airflow_export.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import json

from airflow import DAG
from airflow.providers.cncf.kubernetes.operators.kubernetes_pod import (
from airflow.providers.cncf.kubernetes.operators.pod import (
KubernetesPodOperator,
)
from airflow.operators.bash import BashOperator
Expand Down
2 changes: 1 addition & 1 deletion tests/assets/callables/environment.lock.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ channels:
- conda-forge

dependencies:
- python=3.8
- python=3.9
- pip

- pip:
Expand Down
2 changes: 1 addition & 1 deletion tests/assets/my_project/environment.lock.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ channels:
- conda-forge

dependencies:
- python=3.8
- python=3.9
- pip
2 changes: 1 addition & 1 deletion tests/assets/my_project/environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ channels:
- conda-forge

dependencies:
- python=3.8
- python=3.9
- pip
2 changes: 1 addition & 1 deletion tests/assets/sample_project/environment.lock.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: sample-project-env

dependencies:
# change the version here if you need to
- python=3.8
- python=3.9
# add dependencies here
- numpy
- pandas
Expand Down
2 changes: 1 addition & 1 deletion tests/assets/sample_project/environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: sample-project-env

dependencies:
# change the version here if you need to
- python=3.8
- python=3.9
# add dependencies here
- numpy
- pandas
Expand Down
2 changes: 1 addition & 1 deletion tutorials/airflow/ml-intermediate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

from airflow import DAG
from airflow.utils.dates import days_ago
from airflow.providers.cncf.kubernetes.operators.kubernetes_pod import (
from airflow.providers.cncf.kubernetes.operators.pod import (
KubernetesPodOperator,
)

Expand Down
Loading