Skip to content

Commit 7076d1b

Browse files
Merge branch 'opensearch-project:main' into fix-cve
2 parents 0e9a0c0 + 425b916 commit 7076d1b

12 files changed

+18
-18
lines changed

.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @dhrubo-os @greaa-aws @ylwu-amzn @b4sjoo @jngz-es @rbhavna
1+
* @dhrubo-os @greaa-aws @ylwu-amzn @b4sjoo @jngz-es @rbhavna @Yerzhaisang

.github/workflows/backport.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
installation_id: 22958780
2323

2424
- name: Backport
25-
uses: VachaShah/backport@v1.1.4
25+
uses: VachaShah/backport@v2.2.0
2626
with:
2727
github_token: ${{ steps.github_app_token.outputs.token }}
2828
branch_name: backport/backport-${{ github.event.number }}

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Checkout Repository
1414
uses: actions/checkout@v2
1515
- name: Set up Python 3
16-
uses: actions/setup-python@v2
16+
uses: actions/setup-python@v5
1717
with:
1818
python-version: '3.x'
1919
- name: Install dependencies
@@ -31,7 +31,7 @@ jobs:
3131
- name: Checkout Repository
3232
uses: actions/checkout@v1
3333
- name: Set Up Python
34-
uses: actions/setup-python@v2
34+
uses: actions/setup-python@v5
3535
with:
3636
python-version: '3.x'
3737
- name: Install build tools

.github/workflows/dco.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
steps:
1010
- name: Get PR Commits
1111
id: 'get-pr-commits'
12-
uses: tim-actions/get-pr-commits@v1.1.0
12+
uses: tim-actions/get-pr-commits@v1.3.1
1313
with:
1414
token: ${{ secrets.GITHUB_TOKEN }}
1515
- name: DCO Check

.github/workflows/integration.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Integ ${{ matrix.cluster }} secured=${{ matrix.secured }} version=${{matrix.entry.opensearch_version}}
2626
run: "./.ci/run-tests ${{ matrix.cluster }} ${{ matrix.secured }} ${{ matrix.entry.opensearch_version }} test"
2727
- name: Upload coverage to Codecov
28-
uses: codecov/codecov-action@v2
28+
uses: codecov/codecov-action@v5
2929
with:
3030
token: ${{ secrets.CODECOV_TOKEN }}
3131
files: ./junit/opensearch-py-ml-codecov.xml

.github/workflows/model_uploader.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ jobs:
148148
- name: Checkout Repository
149149
uses: actions/checkout@v4
150150
- name: Set Up Python
151-
uses: actions/setup-python@v2
151+
uses: actions/setup-python@v5
152152
with:
153153
python-version: '3.x'
154154
- name: Configure AWS Credentials
@@ -349,7 +349,7 @@ jobs:
349349
- name: Checkout Repository
350350
uses: actions/checkout@v4
351351
- name: Set Up Python
352-
uses: actions/setup-python@v2
352+
uses: actions/setup-python@v5
353353
with:
354354
python-version: '3.x'
355355
- name: Install Packages
@@ -383,7 +383,7 @@ jobs:
383383
echo "EOF" >> $GITHUB_OUTPUT
384384
echo "${pr_body@E}"
385385
- name: Create a Branch & Raise a PR
386-
uses: peter-evans/create-pull-request@v5
386+
uses: peter-evans/create-pull-request@v7
387387
id: create_pr
388388
with:
389389
committer: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

.github/workflows/release-drafter.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
issue-body: "Please approve or deny the release of opensearch-py-ml. **Tag**: ${{ github.ref_name }} **Commit**: ${{ github.sha }}"
2828
exclude-workflow-initiator-as-approver: true
2929
- name: Set up Python 3
30-
uses: actions/setup-python@v4
30+
uses: actions/setup-python@v5
3131
with:
3232
python-version: '3.x'
3333
- name: Install build tools

.github/workflows/update_model_listing.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
done
5353
echo $(ls config_folder)
5454
- name: Set Up Python
55-
uses: actions/setup-python@v2
55+
uses: actions/setup-python@v5
5656
with:
5757
python-version: '3.x'
5858
- name: Update pretrained_models_all_versions.json
@@ -79,7 +79,7 @@ jobs:
7979
echo "EOF" >> $GITHUB_OUTPUT
8080
echo "${pr_body@E}"
8181
- name: Create a Branch & Raise a PR
82-
uses: peter-evans/create-pull-request@v5
82+
uses: peter-evans/create-pull-request@v7
8383
id: create_pr
8484
with:
8585
committer: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
4949
- Update model upload history - opensearch-project/opensearch-neural-sparse-encoding-v2-distill (v.1.0.0)(TORCH_SCRIPT) by @dhrubo-os ([#419](https://github.com/opensearch-project/opensearch-py-ml/pull/419))
5050
- Upgrade GitHub Actions workflows to use `@v4` to prevent deprecation issues with `@v3` by @yerzhaisang ([#428](https://github.com/opensearch-project/opensearch-py-ml/pull/428))
5151
- Bump pandas from 1.5.3 to the latest stable version by @yerzhaisang ([#422](https://github.com/opensearch-project/opensearch-py-ml/pull/422))
52-
52+
- Upgrade mypy, sphinx, sphinx-rtd-theme, and multiple GitHub Actions (setup-python, backport, codecov-action, create-pull-request, get-pr-commits) by @yerzhaisang([#437](https://github.com/opensearch-project/opensearch-py-ml/pull/437))
5353

5454
### Fixed
5555
- Fix the wrong final zip file name in model_uploader workflow, now will name it by the upload_prefix alse.([#413](https://github.com/opensearch-project/opensearch-py-ml/pull/413/files))

MAINTAINERS.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
1212
| Bhavana Goud Ramaram | [rbhavna](https://github.com/rbhavna) | Amazon |
1313
| Jing Zhang | [jngz-es](https://github.com/jngz-es) | Amazon |
1414
| Sicheng Song | [b4sjoo](https://github.com/b4sjoo) | Amazon |
15-
15+
| Yerzhaisang Taskali | [Yerzhaisang](https://github.com/Yerzhaisang) | |
1616

1717

1818
## Emeritus

opensearch_py_ml/ml_commons/validators.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Any modifications Copyright OpenSearch Contributors. See
66
# GitHub history for details.
77

8-
""" Module for validating model access control parameters """
8+
"""Module for validating model access control parameters"""
99

1010
from typing import List, Optional
1111

requirements-dev.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ scikit-learn
3030
#
3131
pyyaml
3232
nox
33-
mypy==1.3.0
34-
sphinx==6.1.3
35-
sphinx-rtd-theme==1.2.2
33+
mypy==1.14.1
34+
sphinx==7.1.2
35+
sphinx-rtd-theme==3.0.2
3636

0 commit comments

Comments
 (0)