Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Netflix/metaflow
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2.11.6
Choose a base ref
...
head repository: Netflix/metaflow
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2.11.7
Choose a head ref
  • 5 commits
  • 3 files changed
  • 1 contributor

Commits on Mar 26, 2024

  1. fix access to name and kwargs (#1773)

    @madhur-ob
    madhur-ob authored Mar 26, 2024
    Loading
    Loading status checks…

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8289829 View commit details

Commits on Mar 27, 2024

  1. fix log options (#1777) 

    * fix log options

* initialise before
    @madhur-ob
    madhur-ob authored Mar 27, 2024
    Loading
    Loading status checks…

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5e68258 View commit details

  2. inject keyrings.google-artifactregistry-auth for private GCP PyPi reg… 

    …istry (#1772)

* inject keyrings.google-artifactregistry-auth for private GCP PyPi registry

* fix bug with get_pinned_conda_libs and disable/enable --no-input
    @madhur-ob
    madhur-ob authored Mar 27, 2024
    Loading
    Loading status checks…

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    208897c View commit details

  3. Revert "inject keyrings.google-artifactregistry-auth for private GCP … 

    …PyPi reg…" (#1779)

This reverts commit 208897c.
    @madhur-ob
    madhur-ob authored Mar 27, 2024
    Loading
    Loading status checks…

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9ced231 View commit details

  4. Bump version to 2.11.7 (#1780)

    @madhur-ob
    madhur-ob authored Mar 27, 2024
    Loading
    Loading status checks…

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4d855ab View commit details
Showing with 13 additions and 11 deletions.
  1. +2 −2 metaflow/parameters.py
  2. +10 −8 metaflow/plugins/aws/batch/batch_client.py
  3. +1 −1 metaflow/version.py
4 changes: 2 additions & 2 deletions metaflow/parameters.py
View file
Original file line number Diff line number Diff line change
@@ -342,10 +342,10 @@ def __init__(
)

def __repr__(self):
return "metaflow.Parameter(name=%s, kwargs=%s)" % (name, kwargs)
return "metaflow.Parameter(name=%s, kwargs=%s)" % (self.name, self.kwargs)

def __str__(self):
return "metaflow.Parameter(name=%s, kwargs=%s)" % (name, kwargs)
return "metaflow.Parameter(name=%s, kwargs=%s)" % (self.name, self.kwargs)

def option_kwargs(self, deploy_mode):
kwargs = self.kwargs
18 changes: 10 additions & 8 deletions metaflow/plugins/aws/batch/batch_client.py
View file
Original file line number Diff line number Diff line change
@@ -206,14 +206,16 @@ def _register_job_definition(
k, v = each_log_option.split(":", 1)
log_options_dict[k] = v

job_definition["containerProperties"]["logConfiguration"] = {
"logDriver": log_driver if log_driver is not None else "awslogs",
"options": log_options_dict
if log_options is not None
else {
"awslogs-group": "aws/batch/job",
},
}
if log_driver is not None or log_options is not None:
job_definition["containerProperties"]["logConfiguration"] = {}
if log_driver is not None:
job_definition["containerProperties"]["logConfiguration"][
"logDriver"
] = log_driver
if log_options is not None:
job_definition["containerProperties"]["logConfiguration"][
"options"
] = log_options_dict

if platform == "FARGATE" or platform == "FARGATE_SPOT":
if num_parallel > 1:
2 changes: 1 addition & 1 deletion metaflow/version.py
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
metaflow_version = "2.11.6"
metaflow_version = "2.11.7"