Skip to content

Commit 437a75b

Browse files
author
dohear
committed
Merge branch 'main' of https://github.com/dohear/RustPython into int-mul/div-stable
2 parents c93bcd7 + cf50932 commit 437a75b

243 files changed

Lines changed: 7677 additions & 1512 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.

‎.devcontainer/devcontainer.json‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
{
2-
"image": "mcr.microsoft.com/devcontainers/universal:2",
3-
"features": {
4-
"ghcr.io/devcontainers/features/rust:1": {}
5-
}
6-
}
2+
"image": "mcr.microsoft.com/devcontainers/base:jammy",
3+
"onCreateCommand": "curl https://sh.rustup.rs -sSf | sh -s -- -y"
4+
}

‎.github/workflows/ci.yaml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
pull_request:
55
types: [unlabeled, opened, synchronize, reopened]
66
merge_group:
7+
workflow_dispatch:
78

89
name: CI
910

@@ -15,7 +16,7 @@ concurrency:
1516
cancel-in-progress: true
1617

1718
env:
18-
CARGO_ARGS: --no-default-features --features stdlib,zlib,importlib,encodings,sqlite,ssl
19+
CARGO_ARGS: --no-default-features --features stdlib,importlib,encodings,sqlite,ssl
1920
# Skip additional tests on Windows. They are checked on Linux and MacOS.
2021
# test_glob: many failing tests
2122
# test_io: many failing tests
@@ -360,15 +361,18 @@ jobs:
360361
run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
361362
- name: install geckodriver
362363
run: |
363-
wget https://github.com/mozilla/geckodriver/releases/download/v0.34.0/geckodriver-v0.34.0-linux64.tar.gz
364+
wget https://github.com/mozilla/geckodriver/releases/download/v0.36.0/geckodriver-v0.36.0-linux64.tar.gz
364365
mkdir geckodriver
365-
tar -xzf geckodriver-v0.34.0-linux64.tar.gz -C geckodriver
366+
tar -xzf geckodriver-v0.36.0-linux64.tar.gz -C geckodriver
366367
- uses: actions/setup-python@v5
367368
with:
368369
python-version: ${{ env.PYTHON_VERSION }}
369370
- run: python -m pip install -r requirements.txt
370371
working-directory: ./wasm/tests
371372
- uses: actions/setup-node@v4
373+
with:
374+
cache: "npm"
375+
cache-dependency-path: "wasm/demo/package-lock.json"
372376
- name: run test
373377
run: |
374378
export PATH=$PATH:`pwd`/../../geckodriver
@@ -378,7 +382,7 @@ jobs:
378382
NODE_OPTIONS: "--openssl-legacy-provider"
379383
working-directory: ./wasm/demo
380384
- uses: mwilliamson/setup-wabt-action@v3
381-
with: { wabt-version: "1.0.30" }
385+
with: { wabt-version: "1.0.36" }
382386
- name: check wasm32-unknown without js
383387
run: |
384388
cd wasm/wasm-unknown-test

‎.github/workflows/cron-ci.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
name: Periodic checks/tasks
77

88
env:
9-
CARGO_ARGS: --no-default-features --features stdlib,zlib,importlib,encodings,ssl,jit
9+
CARGO_ARGS: --no-default-features --features stdlib,importlib,encodings,ssl,jit
1010
PYTHON_VERSION: "3.13.1"
1111

1212
jobs:
@@ -24,7 +24,7 @@ jobs:
2424
python-version: ${{ env.PYTHON_VERSION }}
2525
- run: sudo apt-get update && sudo apt-get -y install lcov
2626
- name: Run cargo-llvm-cov with Rust tests.
27-
run: cargo llvm-cov --no-report --workspace --exclude rustpython_wasm --verbose --no-default-features --features stdlib,zlib,importlib,encodings,ssl,jit
27+
run: cargo llvm-cov --no-report --workspace --exclude rustpython_wasm --verbose --no-default-features --features stdlib,importlib,encodings,ssl,jit
2828
- name: Run cargo-llvm-cov with Python snippets.
2929
run: python scripts/cargo-llvm-cov.py
3030
continue-on-error: true

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ permissions:
1616
contents: write
1717

1818
env:
19-
CARGO_ARGS: --no-default-features --features stdlib,zlib,importlib,encodings,sqlite,ssl
19+
CARGO_ARGS: --no-default-features --features stdlib,importlib,encodings,sqlite,ssl
2020

2121
jobs:
2222
build:

‎Cargo.lock‎

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

‎Cargo.toml‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,14 @@ repository.workspace = true
1010
license.workspace = true
1111

1212
[features]
13-
default = ["threading", "stdlib", "zlib", "importlib"]
13+
default = ["threading", "stdlib", "importlib"]
1414
importlib = ["rustpython-vm/importlib"]
1515
encodings = ["rustpython-vm/encodings"]
1616
stdlib = ["rustpython-stdlib", "rustpython-pylib", "encodings"]
1717
flame-it = ["rustpython-vm/flame-it", "flame", "flamescope"]
1818
freeze-stdlib = ["stdlib", "rustpython-vm/freeze-stdlib", "rustpython-pylib?/freeze-stdlib"]
1919
jit = ["rustpython-vm/jit"]
2020
threading = ["rustpython-vm/threading", "rustpython-stdlib/threading"]
21-
zlib = ["stdlib", "rustpython-stdlib/zlib"]
2221
bz2 = ["stdlib", "rustpython-stdlib/bz2"]
2322
sqlite = ["rustpython-stdlib/sqlite"]
2423
ssl = ["rustpython-stdlib/ssl"]
@@ -103,7 +102,7 @@ members = [
103102
[workspace.package]
104103
version = "0.4.0"
105104
authors = ["RustPython Team"]
106-
edition = "2021"
105+
edition = "2024"
107106
rust-version = "1.85.0"
108107
repository = "https://github.com/RustPython/RustPython"
109108
license = "MIT"
@@ -190,13 +189,7 @@ wasm-bindgen = "0.2.100"
190189
[workspace.lints.rust]
191190
unsafe_code = "allow"
192191
unsafe_op_in_unsafe_fn = "deny"
193-
194-
# rust_2024_compatibility
195-
missing_unsafe_on_extern = "deny"
196-
unsafe_attr_outside_unsafe = "deny"
197-
deprecated_safe_2024 = "deny"
198-
rust_2024_incompatible_pat = "deny"
199-
keyword_idents_2024 = "deny"
192+
elided_lifetimes_in_paths = "warn"
200193

201194
[workspace.lints.clippy]
202195
perf = "warn"

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2020 RustPython Team
3+
Copyright (c) 2025 RustPython Team
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)