Skip to content

Commit b6d3b28

Browse files
authored
pyversion fix (#161)
* pyversion fix * Update mapping * Actually get the thing to pares * Run inteagration tests * Drop integartion test
1 parent 1139d66 commit b6d3b28

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

truss/templates/base.Dockerfile.jinja

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ WORKDIR $APP_HOME
8888
# https://github.com/AleksTk/table-logger/blob/v0.3.6/table_logger/table_logger.py#L80
8989
# Monkey patch table_logger here. Ultimately we should move away from kfserving,
9090
# perhaps to kserve.
91-
RUN if [ -f "/usr/local/lib/python{{python_version}}/site-packages/table_logger/table_logger.py" ]; then \
92-
sed -i '80d;86d' /usr/local/lib/python{{python_version}}/site-packages/table_logger/table_logger.py; \
91+
RUN if [ -f "/usr/local/lib/python{{config.canonical_python_version}}/site-packages/table_logger/table_logger.py" ]; then \
92+
sed -i '80d;86d' /usr/local/lib/python{{config.canonical_python_version}}/site-packages/table_logger/table_logger.py; \
9393
fi
9494

9595

truss/truss_config.py

+8
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,14 @@ class TrussConfig:
123123
spec_version: str = DEFAULT_SPEC_VERSION
124124
train: Train = field(default_factory=Train)
125125

126+
@property
127+
def canonical_python_version(self) -> str:
128+
return {
129+
"py39": "3.9",
130+
"py38": "3.8",
131+
"py37": "3.7",
132+
}[self.python_version]
133+
126134
@staticmethod
127135
def from_dict(d):
128136
config = TrussConfig(

truss/truss_spec.py

+4
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,10 @@ def spec_version(self) -> str:
7676
def python_version(self) -> str:
7777
return self._config.python_version
7878

79+
@property
80+
def canonical_python_version(self) -> str:
81+
return self._config.canonical_python_version
82+
7983
@property
8084
def cpu(self) -> str:
8185
return self._config.resources.cpu

0 commit comments

Comments
 (0)