From 52e4c77ec1074148737f12687246d1c359237fed Mon Sep 17 00:00:00 2001 From: Serhii Kupriienko Date: Mon, 25 Nov 2024 19:06:24 +0200 Subject: [PATCH 1/6] 2.17.2 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ec437aa..1be0f67 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "mlflow" %} -{% set version = "2.16.2" %} +{% set version = "2.17.2" %} # MLFlow offers two variants, a "normal" install and a "skinny" install with # a reduced installation and fewer dependencies. The skinny installation is obtained @@ -23,7 +23,7 @@ package: source: # Using github as source for mlflow-skinny which does not exist on PyPI url: https://github.com/mlflow/mlflow/archive/refs/tags/v{{ version }}.zip - sha256: d101bf639b7671408d67d357f4af207e8655a41d50ca3befa951026d49751e39 + sha256: 84c6cad59877f1de177175ef619c0e0d6fe3e617b060cc75fbd2696b9e50e380 build: number: 0 From 6d5c0a8696262153b7d5a50768671a4fdf5c2593 Mon Sep 17 00:00:00 2001 From: Serhii Kupriienko Date: Tue, 26 Nov 2024 10:23:47 +0200 Subject: [PATCH 2/6] 2.18.0 --- recipe/meta.yaml | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1be0f67..2f1d883 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "mlflow" %} -{% set version = "2.17.2" %} +{% set version = "2.18.0" %} # MLFlow offers two variants, a "normal" install and a "skinny" install with # a reduced installation and fewer dependencies. The skinny installation is obtained @@ -23,13 +23,11 @@ package: source: # Using github as source for mlflow-skinny which does not exist on PyPI url: https://github.com/mlflow/mlflow/archive/refs/tags/v{{ version }}.zip - sha256: 84c6cad59877f1de177175ef619c0e0d6fe3e617b060cc75fbd2696b9e50e380 + sha256: 910ad1e2fce93b412063637d465e9291c99678a3bbccbf2b4f7736887321f44b build: number: 0 - entry_points: - - mlflow=mlflow.cli:cli - skip: true # [py<38 or s390x] + skip: true # [py<39 or s390x] script: | {% if mlflow_variant == "skinny" %} export MLFLOW_SKINNY=1 # [not win] @@ -44,6 +42,8 @@ build: cp orig_pyproject.toml pyproject.toml # [not win] copy orig_pyproject.toml pyproject.toml # [win] {% endif %} + entry_points: + - mlflow=mlflow.cli:cli requirements: host: @@ -80,7 +80,7 @@ requirements: - matplotlib-base <4 - numpy <3 - pandas <3 - - pyarrow <18,>=4.0.0 + - pyarrow <19,>=4.0.0 - scikit-learn <2 - scipy <2 - sqlalchemy >=1.4.0,<3 @@ -88,10 +88,12 @@ requirements: {% endif %} run_constrained: - mlflow{{ mlflow_other }} <0a0 + # extras - google-cloud-storage >=1.30.0 - azureml-core >=1.2.0 - - mlserver >=1.2.0, !=1.3.1, <1.4.0 - - mlserver-mlflow >=1.2.0,!=1.3.1,<1.4.0 + # mlserver + - mlserver >=1.2.0, !=1.3.1 + - mlserver-mlflow >=1.2.0,!=1.3.1 # mlflow-gateway, mlflow-skinny-gateway, genai - pydantic >=1.0,<3 - fastapi <1 @@ -105,6 +107,8 @@ requirements: - azure-storage-file-datalake >12 - google-cloud-storage >=1.30.0 - boto3 >1 + # langchain + - langchain >=0.1.0,<=0.3.7 test: imports: @@ -125,20 +129,28 @@ test: {% endif %} source_files: - tests/artifacts + requires: + - pip + - pytest + - pillow + - numpy commands: - mlflow --help + - mlflow --version - pip check # these tests come from the conda-forge recipe {% if mlflow_variant != "skinny" %} - mlflow recipes --help # This should not be packaged - - test ! -f $SP_DIR/pylint_plugins # [unix] + - test ! -f $SP_DIR/pylint_plugins # [unix] + - echo "Checking 'mlflow' exists..." # [unix] - pip list | grep "mlflow \+${PKG_VERSION}" # [unix] # smoke tests # skip test_log_artifact_windows_path_with_hostname (run only for win) # because needs a data file - pytest -vv tests/artifacts -k "not test_log_artifact_windows_path_with_hostname" {% else %} + - echo "Checking 'mlflow-skinny' exists..." # [unix] - pip list | grep "mlflow-skinny \+${PKG_VERSION}" # [unix] # smoke tests # skip test_load_image because numpy is not included in the skinny variant @@ -148,11 +160,6 @@ test: {% endif %} # test from .github/workflows/test-package-build.yml#L97 - python -c "import mlflow; print(mlflow.__version__); assert(mlflow.__version__ == '{{ version }}');" - requires: - - pip - - pytest - - pillow - - numpy about: home: https://mlflow.org From 0f1eb9d2bd5a181f0e55212f09cf2cb63cd95a92 Mon Sep 17 00:00:00 2001 From: Serhii Kupriienko Date: Tue, 26 Nov 2024 11:15:08 +0200 Subject: [PATCH 3/6] Fix indenation --- recipe/conda_build_config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 30ba264..8db4b96 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,3 +1,3 @@ mlflow_variant: - - default - - skinny + - default + - skinny From 38c3a037cb119f09ecfd3b367ee4499d1458c2db Mon Sep 17 00:00:00 2001 From: Serhii Kupriienko Date: Tue, 26 Nov 2024 12:09:52 +0200 Subject: [PATCH 4/6] Rewrite jinja2 set variable --- recipe/meta.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2f1d883..6a8038f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,10 +10,10 @@ {% if mlflow_variant == "skinny" %} {% set mlflow_suffix = "-skinny" %} -{% set mlflow_other = "" %} +{% set mlflow_other = "mlflow" %} {% else %} {% set mlflow_suffix = "" %} -{% set mlflow_other = "-skinny" %} +{% set mlflow_other = "mlflow-skinny" %} {% endif %} package: @@ -37,7 +37,7 @@ build: cp {{ SRC_DIR }}/pyproject.skinny.toml pyproject.toml # [not win] copy {{ SRC_DIR }}\pyproject.skinny.toml pyproject.toml # [win] {% endif %} - {{ PYTHON }} -m pip install . --no-deps --no-build-isolation --ignore-installed --no-cache-dir -vvv + {{ PYTHON }} -m pip install . --no-deps --no-build-isolation --ignore-installed --no-cache-dir -vv {% if mlflow_variant == "skinny" %} cp orig_pyproject.toml pyproject.toml # [not win] copy orig_pyproject.toml pyproject.toml # [win] @@ -87,7 +87,7 @@ requirements: - waitress <4 # [win] {% endif %} run_constrained: - - mlflow{{ mlflow_other }} <0a0 + - {{ mlflow_other }} <0a0 # extras - google-cloud-storage >=1.30.0 - azureml-core >=1.2.0 From a529f4b2692323e0fd49e37a0f0f77f58bcd7597 Mon Sep 17 00:00:00 2001 From: Serhii Kupriienko Date: Wed, 27 Nov 2024 15:31:33 +0200 Subject: [PATCH 5/6] Revert changes in mlflow_other set variable --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6a8038f..c0f91b7 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,10 +10,10 @@ {% if mlflow_variant == "skinny" %} {% set mlflow_suffix = "-skinny" %} -{% set mlflow_other = "mlflow" %} +{% set mlflow_other = "" %} {% else %} {% set mlflow_suffix = "" %} -{% set mlflow_other = "mlflow-skinny" %} +{% set mlflow_other = "-skinny" %} {% endif %} package: From 844e021b42cf78a29dd15c20fa1e48b96f7ac492 Mon Sep 17 00:00:00 2001 From: Serhii Kupriienko Date: Wed, 27 Nov 2024 15:36:52 +0200 Subject: [PATCH 6/6] Revert changes of mlflow in run_constrained --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c0f91b7..fb0213f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -87,7 +87,7 @@ requirements: - waitress <4 # [win] {% endif %} run_constrained: - - {{ mlflow_other }} <0a0 + - mlflow{{ mlflow_other }} <0a0 # extras - google-cloud-storage >=1.30.0 - azureml-core >=1.2.0