Merge branch 'master' into merge-master

Signed-off-by: Daniel Lok <[email protected]>

.github/ISSUE_TEMPLATE/bug_report_template.yaml

@@ -27,17 +27,6 @@ body:
         - Other
     validations:
       required: true
-  - type: dropdown
-    id: contribution
-    attributes:
-      label: Willingness to contribute
-      description: The MLflow Community encourages bug fix contributions. Would you or another member of your organization be willing to contribute a fix for this bug to the MLflow code base?
-      options:
-        - Yes. I can contribute a fix for this bug independently.
-        - Yes. I would be willing to contribute a fix for this bug with guidance from the MLflow community.
-        - No. I cannot contribute a bug fix at this time.
-    validations:
-      required: true
 
   - type: textarea
     validations:

.github/ISSUE_TEMPLATE/ui_bug_report_template.yaml

@@ -9,15 +9,7 @@ body:
       value: |
         Thank you for submitting an issue. Please refer to our [issue policy](https://github.com/mlflow/mlflow/blob/master/ISSUE_POLICY.md) for additional information about bug reports. For help with debugging your code, please refer to [Stack Overflow](https://stackoverflow.com/questions/tagged/mlflow).
         #### Please fill in this UI bug report template to ensure a timely and thorough response.
-  - type: dropdown
-    id: contribution
-    attributes:
-      label: Willingness to contribute
-      description: The MLflow Community encourages bug fix contributions. Would you or another member of your organization be willing to contribute a fix for this bug to the MLflow code base?
-      options:
-        - Yes. I can contribute a fix for this bug independently.
-        - Yes. I would be willing to contribute a fix for this bug with guidance from the MLflow community.
-        - No. I cannot contribute a bug fix at this time.
+
     validations:
       required: true
 

.github/workflows/autoformat.js

@@ -25,7 +25,7 @@ const shouldAutoformat = (comment) => {
   return isNewCommand(comment) || isOldCommand(comment);
 };
 
-const getPullInformation = async (context, github) => {
+const getPullInfo = async (context, github) => {
   const { owner, repo } = context.repo;
   const pull_number = context.issue.number;
   const pr = await github.rest.pulls.get({ owner, repo, pull_number });
@@ -68,7 +68,7 @@ const createReaction = async (context, github) => {
 };
 
 const createStatus = async (context, github, core) => {
-  const { head_sha, head_ref, repository } = await getPullInformation(context, github);
+  const { head_sha, head_ref, repository } = await getPullInfo(context, github);
   if (repository === "mlflow/mlflow" && head_ref === "master") {
     core.setFailed("Running autoformat bot against master branch of mlflow/mlflow is not allowed.");
   }
@@ -83,7 +83,7 @@ const updateStatus = async (context, github, sha, needs) => {
 
 module.exports = {
   shouldAutoformat,
-  getPullInformation,
+  getPullInfo,
   createReaction,
   createStatus,
   updateStatus,

.github/workflows/autoformat.yml

@@ -48,6 +48,7 @@ jobs:
               await autoformat.createReaction(context, github);
               await autoformat.createStatus(context, github, core);
             }
+            const pullInfo = await autoformat.getPullInfo(context, github);
             return { ...pullInfo, shouldAutoformat };
 
   format:

.github/workflows/examples.yml

@@ -91,7 +91,6 @@ jobs:
 
       - name: Remove conda environments
         run: |
-          conda remove --all --yes --name test-environment
           ./dev/remove-conda-envs.sh
 
       - name: Show disk usage

.github/workflows/lint.yml

@@ -11,6 +11,9 @@ on:
     branches:
       - master
       - branch-[0-9]+.[0-9]+
+  merge_group:
+    types:
+      - checks_requested
 
 permissions:
   contents: read

.github/workflows/patch.js

@@ -51,7 +51,7 @@ module.exports = async ({ context, github, core }) => {
   const version = releases.data[0].tag_name.replace("v", "");
   const [major, minor, micro] = version.replace(/rc\d+$/, "").split(".");
   const nextMicro = version.includes("rc") ? micro : (parseInt(micro) + 1).toString();
-  const label = `patch-${major}.${minor}.${nextMicro}`;
+  const label = `v${major}.${minor}.${nextMicro}`;
   await github.rest.issues.addLabels({
     owner,
     repo,

.github/workflows/protect.yml

@@ -1,3 +1,6 @@
+# This job prevents accidental auto-merging of PRs when jobs that are conditionally
+# triggered (for example, those defined in `cross-version-tests.yml`) are either still
+# in the process of running or have resulted in failures.
 name: Protect
 
 on:
@@ -7,6 +10,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
+  merge_group:
+    types:
+      - checks_requested
 
 permissions:
   contents: read
@@ -17,9 +23,8 @@ concurrency:
 
 jobs:
   protect:
-    # This job prevents accidental auto-merging of PRs when jobs that are conditionally
-    # triggered (for example, those defined in `cross-version-tests.yml`) are either still
-    # in the process of running or have resulted in failures.
+    # Skip this job in a merge queue
+    if: github.event_name == 'pull_request'
     runs-on: ubuntu-latest
     timeout-minutes: 120
     steps:

.github/workflows/protobuf-cross-test.yml

@@ -9,12 +9,14 @@ on:
       - ready_for_review
     paths:
       - "mlflow/protos/**"
+      - .github/workflows/protobuf-cross-test.yml
   push:
     branches:
       - master
       - branch-[0-9]+.[0-9]+
     paths:
       - "mlflow/protos/**"
+      - .github/workflows/protobuf-cross-test.yml
 
 permissions:
   contents: read
@@ -68,7 +70,7 @@ jobs:
           # Install TensorFlow to test TensorFlow dataset usage with MLflow dataset tracking
           pip install tensorflow
           # Install torch and transformers to test metrics
-          pip install torch transformers
+          pip install torch transformers tf-keras
           pip install -r requirements/test-requirements.txt
           # Test the latest minor version in protobuf_major_version
           pip install "protobuf==${{ matrix.protobuf_major_version }}.*"

.github/workflows/protos.yml

@@ -11,7 +11,9 @@ on:
       - .github/workflows/protos.yml
       - mlflow/protos/**
       - mlflow/java/client/src/main/java/com/databricks/api/proto/**
-      - mlflow/server/graphql/** # graphql related code changes could trigger changes in the autogenerated schema
+      # graphql related code changes could trigger changes in the autogenerated schema
+      - mlflow/server/graphql/**
+      - mlflow/server/js/src/graphql/**
       - requirements/skinny-requirements.txt
       - requirements/core-requirements.txt
 

.github/workflows/require-core-maintainer-approval.js

@@ -6,6 +6,7 @@ const CORE_MAINTAINERS = new Set([
   "gabrielfu",
   "harupy",
   "serena-ruan",
+  "TomeHirata",
   "WeichenXu123",
   "xq-yin",
 ]);

.github/workflows/slow-tests.yml

@@ -71,7 +71,8 @@ jobs:
           source ./dev/install-common-deps.sh --ml
           # transformers requires `tf-keras` when keras 3.0 is installed.
           # See https://github.com/huggingface/transformers/issues/27377 for more details.
-          python -m pip install langchain_experimental tf-keras
+          # Installing pyarrow < 18 to prevent lightgbm test pip installation resolution conflicts.
+          python -m pip install langchain_experimental tf-keras "pyarrow<18"
       - uses: ./.github/actions/show-versions
       - uses: ./.github/actions/pipdeptree
       - name: Run tests

.github/workflows/team-review.yml

@@ -22,6 +22,7 @@ jobs:
               "daniellok-db",
               "harupy",
               "serena-ruan",
+              "TomeHirata",
               "WeichenXu123",
               "xq-yin",
             ];

CONTRIBUTING.md

@@ -66,6 +66,7 @@ MLflow is currently maintained by the following core members with significant co
 - [Serena Ruan](https://github.com/serena-ruan)
 - [Yuki Watanabe](https://github.com/B-Step62)
 - [Daniel Lok](https://github.com/daniellok-db)
+- [Tomu Hirata](https://github.com/TomeHirata)
 - [Gabriel Fu](https://github.com/gabrielfu)
 
 ## Contribution process

README.rst

@@ -78,7 +78,7 @@ Packages
 
 Job Statuses
 
-|examples| |cross-version-tests| |r-devel| |test-requirements| |stale| |push-images| |slow-tests| |website-e2e|
+|examples| |cross-version-tests| |r-devel| |test-requirements| |push-images| |slow-tests| |website-e2e|
 
 .. |examples| image:: https://img.shields.io/github/actions/workflow/status/mlflow-automation/mlflow/examples.yml.svg?branch=master&event=schedule&label=Examples&style=for-the-badge&logo=github
     :target: https://github.com/mlflow-automation/mlflow/actions/workflows/examples.yml?query=workflow%3AExamples+event%3Aschedule
@@ -89,8 +89,6 @@ Job Statuses
     :target: https://github.com/mlflow-automation/mlflow/actions/workflows/r.yml?query=workflow%3AR+event%3Aschedule
 .. |test-requirements| image:: https://img.shields.io/github/actions/workflow/status/mlflow-automation/mlflow/requirements.yml.svg?branch=master&event=schedule&label=test%20requirements&logo=github&style=for-the-badge
     :target: https://github.com/mlflow-automation/mlflow/actions/workflows/requirements.yml?query=workflow%3A"Test+requirements"+event%3Aschedule
-.. |stale| image:: https://img.shields.io/github/actions/workflow/status/mlflow/mlflow/stale.yml.svg?branch=master&event=schedule&label=stale&logo=github&style=for-the-badge
-    :target: https://github.com/mlflow/mlflow/actions?query=workflow%3AStale+event%3Aschedule
 .. |push-images| image:: https://img.shields.io/github/actions/workflow/status/mlflow/mlflow/push-images.yml.svg?event=release&label=push-images&logo=github&style=for-the-badge
     :target: https://github.com/mlflow/mlflow/actions/workflows/push-images.yml?query=event%3Arelease
 .. |slow-tests| image:: https://img.shields.io/github/actions/workflow/status/mlflow-automation/mlflow/slow-tests.yml.svg?branch=master&event=schedule&label=slow-tests&logo=github&style=for-the-badge
@@ -215,3 +213,4 @@ MLflow is currently maintained by the following core members with significant co
 - `Serena Ruan <https://github.com/serena-ruan>`_
 - `Weichen Xu <https://github.com/WeichenXu123>`_
 - `Yuki Watanabe <https://github.com/B-Step62>`_
+- `Tomu Hirata <https://github.com/TomeHirata>`_

dev/check_patch_prs.py

@@ -65,9 +65,9 @@ def is_closed(pr):
 
 def fetch_patch_prs(version):
     """
-    Fetch PRs labeled with `patch-{version}` from the MLflow repository.
+    Fetch PRs labeled with `v{version}` from the MLflow repository.
     """
-    label = f"patch-{version}"
+    label = f"v{version}"
     per_page = 100
     page = 1
     pulls = []

dev/clint/src/clint/__init__.py

@@ -35,7 +35,7 @@ def main():
     args = Args.parse()
     with ProcessPoolExecutor() as pool:
         futures = [
-            pool.submit(lint_file, Path(f))
+            pool.submit(lint_file, Path(f), config)
             for f in args.files
             if not EXCLUDE_REGEX.match(f) and os.path.exists(f)
         ]

dev/clint/src/clint/config.py

@@ -8,10 +8,13 @@
 @dataclass
 class Config:
     exclude: list[str]
+    # Path -> List of modules that should not be imported globally under that path
+    forbidden_top_level_imports: dict[str, list[str]]
 
     @classmethod
     def load(cls) -> Config:
         with open("pyproject.toml", "rb") as f:
             data = tomli.load(f)
             exclude = data["tool"]["clint"]["exclude"]
-            return cls(exclude)
+            forbidden_imports = data["tool"]["clint"]["forbidden-top-level-imports"]
+            return cls(exclude, forbidden_imports)