Skip to content

Commit 49d2fb6

Browse files
ShaharNavehShaharNaveh
committed
Merge remote-tracking branch 'upstream/main' into macro-newtype-oparg
2 parents 9fbc6d3 + 82432be commit 49d2fb6

9 files changed

Lines changed: 49 additions & 37 deletions

File tree

‎.github/dependabot.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ updates:
55
directory: /
66
schedule:
77
interval: weekly
8+
cooldown:
9+
default-days: 7
10+
semver-major-days: 30
11+
semver-minor-days: 7
12+
semver-patch-days: 3
813
groups:
914
criterion:
1015
patterns:
@@ -143,7 +148,14 @@ updates:
143148
directory: /
144149
schedule:
145150
interval: weekly
151+
cooldown:
152+
default-days: 7
146153
- package-ecosystem: npm
147154
directory: /
148155
schedule:
149156
interval: weekly
157+
cooldown:
158+
default-days: 7
159+
semver-major-days: 30
160+
semver-minor-days: 7
161+
semver-patch-days: 3

‎.github/workflows/ci.yaml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ jobs:
230230
with:
231231
save-if: ${{ github.ref == 'refs/heads/main' }}
232232

233-
- uses: actions/setup-python@v6.2.0
233+
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
234234
with:
235235
python-version: ${{ env.PYTHON_VERSION }}
236236

@@ -324,7 +324,7 @@ jobs:
324324
with:
325325
persist-credentials: false
326326

327-
- uses: actions/setup-python@v6.2.0
327+
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
328328
with:
329329
python-version: ${{ env.PYTHON_VERSION }}
330330

@@ -426,9 +426,11 @@ jobs:
426426
wget https://github.com/mozilla/geckodriver/releases/download/v0.36.0/geckodriver-v0.36.0-linux64.tar.gz
427427
mkdir geckodriver
428428
tar -xzf geckodriver-v0.36.0-linux64.tar.gz -C geckodriver
429-
- uses: actions/setup-python@v6.2.0
429+
430+
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
430431
with:
431432
python-version: ${{ env.PYTHON_VERSION }}
433+
432434
- run: python -m pip install -r requirements.txt
433435
working-directory: ./wasm/tests
434436
- uses: actions/setup-node@v6
@@ -514,7 +516,7 @@ jobs:
514516
with:
515517
persist-credentials: false
516518

517-
- uses: cargo-bins/cargo-binstall@1800853f2578f8c34492ec76154caef8e163fbca # v1.17.7
519+
- uses: cargo-bins/cargo-binstall@113a77a4ce971c41332f2129c3d995df993cf746 # v1.17.8
518520

519521
- run: cargo binstall --no-confirm cargo-shear
520522

‎.github/workflows/lib-deps-check.yaml‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
7575
- name: Setup Python
7676
if: steps.changed-files.outputs.modules != ''
77-
uses: actions/setup-python@v6.2.0
77+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
7878
with:
7979
python-version: "${{ env.PYTHON_VERSION }}"
8080

@@ -83,22 +83,15 @@ jobs:
8383
id: deps-check
8484
run: |
8585
# Run deps for all modules at once
86-
python scripts/update_lib deps ${{ steps.changed-files.outputs.modules }} --depth 2 > /tmp/deps_output.txt 2>&1 || true
87-
88-
# Read output for GitHub Actions
89-
echo "deps_output<<EOF" >> $GITHUB_OUTPUT
90-
cat /tmp/deps_output.txt >> $GITHUB_OUTPUT
91-
echo "EOF" >> $GITHUB_OUTPUT
92-
93-
# Check if there's any meaningful output
94-
if [ -s /tmp/deps_output.txt ]; then
95-
echo "has_output=true" >> $GITHUB_OUTPUT
96-
else
97-
echo "has_output=false" >> $GITHUB_OUTPUT
98-
fi
86+
echo "deps_output<<EOF" >> "$GITHUB_OUTPUT"
87+
output=$(python scripts/update_lib deps "${MODULES}" --depth 2 2>&1 || true)
88+
echo "$output" >> "$GITHUB_OUTPUT"
89+
echo "EOF" >> "$GITHUB_OUTPUT"
90+
env:
91+
MODULES: ${{ steps.changed-files.outputs.modules }}
9992

10093
- name: Post comment
101-
if: steps.deps-check.outputs.has_output == 'true'
94+
if: steps.deps-check.outputs.deps_output != ''
10295
uses: marocchino/sticky-pull-request-comment@v3
10396
with:
10497
header: lib-deps-check

‎.github/workflows/update-doc-db.yml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
name: Update doc DB
22

3-
permissions:
4-
contents: write
5-
pull-requests: write
3+
permissions: {}
64

75
on:
86
workflow_dispatch:
@@ -22,6 +20,8 @@ defaults:
2220

2321
jobs:
2422
generate:
23+
permissions:
24+
contents: read
2525
runs-on: ${{ matrix.os }}
2626
strategy:
2727
matrix:
@@ -54,17 +54,19 @@ jobs:
5454
merge:
5555
runs-on: ubuntu-latest
5656
needs: generate
57+
permissions:
58+
contents: write
59+
pull-requests: write
5760
steps:
5861
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5962
with:
6063
persist-credentials: true
6164
ref: ${{ inputs.base-ref }}
62-
token: ${{ secrets.AUTO_COMMIT_PAT }}
6365

6466
- name: Create update branch
67+
run: git switch -c "update-doc-${PYTHON_VERSION}"
6568
env:
6669
PYTHON_VERSION: ${{ inputs.python-version }}
67-
run: git switch -c "update-doc-${PYTHON_VERSION}"
6870

6971
- name: Download generated doc DBs
7072
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
@@ -107,7 +109,7 @@ jobs:
107109

108110
- name: Commit, push and create PR
109111
env:
110-
GH_TOKEN: ${{ secrets.AUTO_COMMIT_PAT }}
112+
GH_TOKEN: ${{ github.token }}
111113
PYTHON_VERSION: ${{ inputs.python-version }}
112114
BASE_REF: ${{ inputs.base-ref }}
113115
run: |

‎.github/workflows/upgrade-pylib.lock.yml‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.lock‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎crates/compiler-core/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ itertools = { workspace = true }
2020
malachite-bigint = { workspace = true }
2121
num-complex = { workspace = true }
2222

23-
lz4_flex = "0.12"
23+
lz4_flex = "0.13"
2424

2525
[lints]
2626
workspace = true

‎crates/stdlib/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ oid-registry = { version = "0.8", features = ["x509", "pkcs1", "nist_algs"], opt
139139
pkcs8 = { version = "0.10", features = ["encryption", "pkcs5", "pem"], optional = true }
140140

141141
[target.'cfg(not(any(target_os = "android", target_arch = "wasm32")))'.dependencies]
142-
libsqlite3-sys = { version = "0.36", features = ["bundled"], optional = true }
142+
libsqlite3-sys = { version = "0.37", features = ["bundled"], optional = true }
143143
liblzma = "0.4"
144144
liblzma-sys = "0.4"
145145

‎src/lib.rs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ mod interpreter;
5656
mod settings;
5757
mod shell;
5858

59+
#[cfg(feature = "rustpython-pylib")]
60+
pub use rustpython_pylib as pylib;
61+
5962
use rustpython_vm::{AsObject, PyObjectRef, PyResult, VirtualMachine, scope::Scope};
6063
use std::env;
6164
use std::io::IsTerminal;

0 commit comments

Comments
 (0)