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

Jump to bottom

Fix integration tests #843

Merged
merged 3 commits into from
Feb 28, 2024
Merged

Fix integration tests #843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b70d9ee
add pathspec to pyproject
helenlyang Feb 28, 2024
2de3772
poetry lock --no-update
helenlyang Feb 28, 2024
080f13d
fix calc_patch call
helenlyang Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ inquirerpy = "^0.3.4"
google-cloud-storage = "2.10.0"
loguru = ">=0.7.2"
uvloop = "^0.19.0"
pathspec = ">=0.9.0"


[tool.poetry.group.builder.dependencies]
Expand All @@ -64,6 +65,7 @@ huggingface_hub = ">=0.19.4"
google-cloud-storage = "2.10.0"
boto3 = "^1.26.157"
loguru = ">=0.7.2"
pathspec = ">=0.9.0"

[tool.poetry.dev-dependencies]
ipython = "^7.16"
Expand Down
10 changes: 8 additions & 2 deletions truss/truss_handle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,12 @@
from truss.truss_config import BaseImage, ExternalData, ExternalDataItem, TrussConfig
from truss.truss_spec import TrussSpec
from truss.types import Example, PatchDetails, PatchRequest
from truss.util.path import copy_file_path, copy_tree_path, get_max_modified_time_of_dir
from truss.util.path import (
copy_file_path,
copy_tree_path,
get_max_modified_time_of_dir,
load_trussignore_patterns,
)
from truss.validation import validate_secret_name

logger: logging.Logger = logging.getLogger(__name__)
Expand Down Expand Up @@ -891,7 +896,8 @@ def _try_patch(self):
"Truss supports patching and a running "
"container found: attempting to patch the container"
)
patch_details = self.calc_patch(running_truss_hash)
truss_ignore_patterns = load_trussignore_patterns()
patch_details = self.calc_patch(running_truss_hash, truss_ignore_patterns)
if patch_details is None:
logger.info("Unable to calculate patch.")
return None
Expand Down