Skip to content

Commit dfa9461

Browse files
Image build script flag and remove 2.7 from travis, bug for serialize (#106)
1 parent fe5b620 commit dfa9461

4 files changed

Lines changed: 7 additions & 4 deletions

File tree

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
language: python
22
python:
3-
- "2.7"
43
- "3.6"
54
install:
65
- pip install -r requirements.txt

flytekit/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
from __future__ import absolute_import
22
import flytekit.plugins
33

4-
__version__ = '0.7.1b0'
4+
__version__ = '0.7.1b1'

flytekit/clis/sdk_in_container/serialize.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ def serialize_tasks_only(project, domain, pkgs, version, folder=None):
5151
fname_index = str(i).zfill(zero_padded_length)
5252
fname = '{}_{}.pb'.format(fname_index, entity._id.name)
5353
click.echo(' Writing {} to\n {}'.format(entity._id, fname))
54+
if folder:
55+
fname = _os.path.join(folder, fname)
5456
_write_proto_to_file(serialized, fname)
5557

5658
identifier_fname = '{}_{}.identifier.pb'.format(fname_index, entity._id.name)
@@ -62,7 +64,7 @@ def serialize_tasks_only(project, domain, pkgs, version, folder=None):
6264
@system_entry_point
6365
def serialize_all(project, domain, pkgs, version, folder=None):
6466
"""
65-
In order to register, we have to comply with Admin's endpoints. Those endpoints take the following object. These
67+
In order to register, we have to comply with Admin's endpoints. Those endpoints take the following objects. These
6668
flyteidl.admin.launch_plan_pb2.LaunchPlanSpec
6769
flyteidl.admin.workflow_pb2.WorkflowSpec
6870
flyteidl.admin.task_pb2.TaskSpec
@@ -105,6 +107,8 @@ def serialize_all(project, domain, pkgs, version, folder=None):
105107
fname_index = str(i).zfill(zero_padded_length)
106108
fname = '{}_{}.pb'.format(fname_index, entity._id.name)
107109
click.echo(' Writing {} to\n {}'.format(entity._id, fname))
110+
if folder:
111+
fname = _os.path.join(folder, fname)
108112
_write_proto_to_file(serialized, fname)
109113

110114
# Not everything serialized will necessarily have an identifier field in it, even though some do (like the

scripts/flytekit_build_image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ if [ -n "$REGISTRY" ]; then
5858
echo "${IMAGE_NAME}:latest also tagged with ${FLYTE_INTERNAL_IMAGE}"
5959

6060
# Also push if there's a registry to push to
61-
if [[ "${REGISTRY}" == "docker.io"* ]]; then
61+
if [[ "${REGISTRY}" == "docker.io"* && -z "${NOPUSH}" ]]; then
6262
docker login --username="${DOCKERHUB_USERNAME}" --password="${DOCKERHUB_PASSWORD}"
6363
fi
6464
docker push "${FLYTE_INTERNAL_IMAGE}"

0 commit comments

Comments
 (0)