Skip to content

Commit fbbdd3a

Browse files
chore(sdk): Bump up pyfunc package versions (#649)
# Description Given that the current release of Merlin is `v0.48.3`, we need to update the default version of the `merlin-batch-predictor` and `merlin-pyfunc-server` Python packages. ## Additional Unrelated Changes 🚨 Due to the upgrading of `numpy` in this PR [here](#641 (comment)), Python 3.8 is no longer supported. The CICD pipeline fails because Python 3.8 is currently still being used. This draft (at the time of writing) PR #639 is supposed to include changes to remove support for Python 3.8 but is temporarily paused due to other changes. @naufalandika To fix the CICD pipeline for the moment, this PR copies the existing changes in that PR to remove support entirely for Python 3.8 (and includes other changes to other tests/examples that mention Python 3.8). # Modifications - `python/sdk/merlin/model.py` - Bumped up max version of the `merlin-batch-predictor` and `merlin-pyfunc-server` Python packages # Tests <!-- Besides the existing / updated automated tests, what specific scenarios should be tested? Consider the backward compatibility of the changes, whether corner cases are covered, etc. Please describe the tests and check the ones that have been completed. Eg: - [x] Deploying new and existing standard models - [ ] Deploying PyFunc models --> # Checklist - [x] Added PR label - [ ] Added unit test, integration, and/or e2e tests - [x] Tested locally - [ ] Updated documentation - [ ] Update Swagger spec if the PR introduce API changes - [ ] Regenerated Golang and Python client if the PR introduces API changes # Release Notes ```release-note NONE ```
1 parent 3985d21 commit fbbdd3a

File tree

33 files changed

+53
-47
lines changed

33 files changed

+53
-47
lines changed

.github/workflows/merlin.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
strategy:
4444
fail-fast: false
4545
matrix:
46-
python-version: ["3.8", "3.9", "3.10"]
46+
python-version: ["3.9", "3.10"]
4747
env:
4848
PIPENV_DEFAULT_PYTHON_VERSION: ${{ matrix.python-version }}
4949
PIPENV_VENV_IN_PROJECT: true
@@ -78,7 +78,7 @@ jobs:
7878
strategy:
7979
fail-fast: false
8080
matrix:
81-
python-version: ["3.8", "3.9", "3.10"]
81+
python-version: ["3.9", "3.10"]
8282
env:
8383
PIPENV_DEFAULT_PYTHON_VERSION: ${{ matrix.python-version }}
8484
PIPENV_VENV_IN_PROJECT: true

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- uses: actions/checkout@v4
2525
- uses: actions/setup-python@v5
2626
with:
27-
python-version: 3.8
27+
python-version: 3.9
2828
cache: pip
2929
- name: Install dependencies
3030
working-directory: ./python/sdk
@@ -51,7 +51,7 @@ jobs:
5151
fetch-depth: 0
5252
- uses: actions/setup-python@v5
5353
with:
54-
python-version: 3.8
54+
python-version: 3.9
5555
cache: pip
5656
- name: Install dependencies
5757
working-directory: ./python/pyfunc-server
@@ -79,7 +79,7 @@ jobs:
7979
fetch-depth: 0
8080
- uses: actions/setup-python@v5
8181
with:
82-
python-version: 3.8
82+
python-version: 3.9
8383
cache: pip
8484
- name: Install dependencies
8585
working-directory: ./python/batch-predictor
@@ -101,7 +101,7 @@ jobs:
101101
strategy:
102102
fail-fast: false
103103
matrix:
104-
python-version: ["3.8", "3.9", "3.10"]
104+
python-version: ["3.9", "3.10"]
105105
needs:
106106
- publish-python-sdk
107107
steps:

.readthedocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ sphinx:
1111

1212
# Optionally set the version of Python and requirements required to build your docs
1313
python:
14-
version: 3.8
14+
version: 3.9
1515
install:
1616
- requirements: python/sdk/docs/requirements_docs.txt

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ TEST_TAGS?=
1212
GOLANGCI_LINT_VERSION="v1.58.1"
1313
PROTOC_GEN_GO_JSON_VERSION="v1.1.0"
1414
PROTOC_GEN_GO_VERSION="v1.26"
15-
PYTHON_VERSION ?= "39" #set as 38 39 310 for 3.8-3.10 respectively
15+
PYTHON_VERSION ?= "39" #set as 39 310 for 3.9-3.10 respectively
1616

1717
all: setup init-dep lint test clean build run
1818

api/api/versions_api.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"gorm.io/gorm"
2929
)
3030

31-
const DEFAULT_PYTHON_VERSION = "3.8.*"
31+
const DEFAULT_PYTHON_VERSION = "3.9.*"
3232

3333
type VersionsController struct {
3434
*AppContext

api/config/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ type ImageBuilderConfig struct {
230230
MaximumRetry int32 `validate:"required" default:"3"`
231231
K8sConfig *mlpcluster.K8sConfig `validate:"required" default:"-"`
232232
SafeToEvict bool `default:"false"`
233-
// Supported Python versions for image builder. Example: ["3.8.*", "3.9.*", "3.10.*"]
233+
// Supported Python versions for image builder. Example: ["3.9.*", "3.10.*"]
234234
SupportedPythonVersions []string
235235
}
236236

api/config/config_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ func TestLoad(t *testing.T) {
449449
Name: "dev-server",
450450
},
451451
SafeToEvict: false,
452-
SupportedPythonVersions: []string{"3.8.*", "3.9.*", "3.10.*"},
452+
SupportedPythonVersions: []string{"3.9.*", "3.10.*"},
453453
},
454454
BatchConfig: BatchConfig{
455455
Tolerations: []v1.Toleration{

api/config/testdata/base-configs-1.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ ImageBuilderConfig:
8181
provideClusterInfo: true
8282
SafeToEvict: false
8383
SupportedPythonVersions:
84-
- 3.8.*
8584
- 3.9.*
8685
- 3.10.*
8786
BatchConfig:

api/pkg/imagebuilder/imagebuilder_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ const (
5656
testArtifactURISuffix = "://bucket-name/mlflow/11/68eb8538374c4053b3ecad99a44170bd/artifacts"
5757
testCondaEnvUrlSuffix = testArtifactURISuffix + "/model/conda.yaml"
5858
testCondaEnvContent = `dependencies:
59-
- python=3.8.*
59+
- python=3.9.*
6060
- pip:
6161
- mlflow
6262
- joblib
@@ -121,7 +121,7 @@ var (
121121
"--use-new-run",
122122
}
123123

124-
defaultSupportedPythonVersions = []string{"3.8.*", "3.9.*", "3.10.*"}
124+
defaultSupportedPythonVersions = []string{"3.9.*", "3.10.*"}
125125

126126
configWithGCRPushRegistry = Config{
127127
BuildNamespace: testBuildNamespace,

docs/developer/e2e-test.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Run E2E test as part of github actions workflow. This E2E test will be triggered
1111
- Pull merlin repository
1212
- Pull mlp repository
1313
- Setup go
14-
- Setup python 3.8
14+
- Setup python 3.9
1515
- Setup cluster
1616
- Setup mlp namespace
1717
- Deploy mlp

0 commit comments

Comments
 (0)