Skip to content

Commit 00ec7de

Browse files
authored
Merge branch 'python-telegram-bot:master' into master
2 parents 2259ced + fd2d35f commit 00ec7de

77 files changed

Lines changed: 1098 additions & 429 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/renovate.json5

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,13 @@
1919
// Update the lock files:
2020
"lockFileMaintenance": {
2121
"enabled": true,
22-
"schedule": ["* * * * 1,4"], // Run sometime on Monday and Thursday
22+
"schedule": ["* 0-3 1 * *"], // https://docs.renovatebot.com/presets-schedule/#schedulemonthly
2323
"automerge": true
2424
},
2525

26+
// Enable automerge globally:
27+
"automerge": true,
28+
2629
// Group package updates together:
2730
"packageRules": [
2831
// Linting dependencies in pyproject.toml in sync with the pre-commit-config hooks:
@@ -47,16 +50,17 @@
4750
"matchPackageNames": ["chango", "Bibo-Joshi/chango"],
4851
"groupName": "Chango"
4952
},
50-
// Automerge PR's for minor/patch/pin/digest (except major) updates:
53+
54+
// Don't automerge major updates for project dependencies:
5155
{
52-
"matchUpdateTypes": ["minor", "patch", "pin", "digest"],
53-
"automerge": true
56+
"matchUpdateTypes": ["major"],
57+
"matchDepTypes": ["project.dependencies", "project.optional-dependencies"],
58+
"automerge": false
5459
},
5560

56-
// Apply the "dependencies" label to all updates of optional-dependencies:
61+
// Apply the "dependencies" label to all updates of optional/required dependencies:
5762
{
58-
"matchDepTypes": ["project.optional-dependencies"],
59-
"automerge": false,
63+
"matchDepTypes": ["project.optional-dependencies", "project.dependencies"],
6064
"labels": ["⚙️ dependencies"]
6165
}
6266
],

.github/workflows/chango.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
# Run `chango release` if applicable - needs some additional setup.
4646
- name: Set up Python
4747
if: steps.check_title.outputs.IS_RELEASE_PR == 'true'
48-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
48+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
4949
with:
5050
python-version: "3.x"
5151

.github/workflows/copilot-setup-steps.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ jobs:
3131
persist-credentials: false
3232

3333
- name: Install uv
34-
uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4
34+
uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
3535
with:
3636
# Install a specific version of uv.
37-
version: "0.8.17"
37+
version: "0.8.22"
3838
# Install 3.13:
3939
python-version: 3.13
4040

.github/workflows/docs-admonitions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
with:
2929
persist-credentials: false
3030
- name: Set up Python ${{ matrix.python-version }}
31-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
31+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
3232
with:
3333
python-version: ${{ matrix.python-version }}
3434
cache: 'pip'

.github/workflows/docs-linkcheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
with:
2424
persist-credentials: false
2525
- name: Set up Python ${{ matrix.python-version }}
26-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
26+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
2727
with:
2828
python-version: ${{ matrix.python-version }}
2929
- name: Install dependencies

.github/workflows/gha_security.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ jobs:
2121
with:
2222
persist-credentials: false
2323
- name: Install the latest version of uv
24-
uses: astral-sh/setup-uv@557e51de59eb14aaaba2ed9621916900a91d50c6 # v6.6.1
24+
uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
2525
- name: Run zizmor
2626
run: uvx zizmor --persona=pedantic --format sarif . > results.sarif
2727
env:
2828
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2929
- name: Upload SARIF file
30-
uses: github/codeql-action/upload-sarif@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
30+
uses: github/codeql-action/upload-sarif@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
3131
with:
3232
sarif_file: results.sarif
3333
category: zizmor

.github/workflows/release_pypi.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
with:
2222
persist-credentials: false
2323
- name: Set up Python
24-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
24+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
2525
with:
2626
python-version: "3.x"
2727
- name: Install pypa/build

.github/workflows/release_test_pypi.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
with:
2222
persist-credentials: false
2323
- name: Set up Python
24-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
24+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
2525
with:
2626
python-version: "3.x"
2727
- name: Install pypa/build

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
# For adding labels and closing
1313
issues: write
1414
steps:
15-
- uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
15+
- uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0
1616
with:
1717
# PRs never get stale
1818
days-before-stale: 3

.github/workflows/test_official.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
with:
2828
persist-credentials: false
2929
- name: Set up Python ${{ matrix.python-version }}
30-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
30+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
3131
with:
3232
python-version: ${{ matrix.python-version }}
3333
- name: Install dependencies

0 commit comments

Comments
 (0)