Skip to content

Commit 8157e21

Browse files
bschoenmaeckersbschoenmaeckers
committed
Merge branch 'main' into c-api
2 parents 6566194 + fb9c099 commit 8157e21

56 files changed

Lines changed: 2809 additions & 797 deletions

Some content is hidden

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

‎.github/workflows/ci.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -839,7 +839,7 @@ jobs:
839839

840840
- name: reviewdog
841841
if: ${{ !cancelled() }}
842-
uses: reviewdog/action-suggester@c387862ad6765a9729f2b40ee4d8b5769f2145c7 # v1.26.1
842+
uses: reviewdog/action-suggester@8219e3d2e54a63ddecf1318659aa541bd1fa7202 # v1.26.2
843843
with:
844844
level: warning
845845
fail_level: error
@@ -949,7 +949,7 @@ jobs:
949949
- run: python -m pip install -r requirements.txt
950950
working-directory: ./wasm/tests
951951

952-
- uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
952+
- uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
953953
with:
954954
package-manager-cache: false
955955

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@ jobs:
7878

7979
- name: collect tests data
8080
run: target/release/rustpython extra_tests/jsontests.py
81-
env:
82-
RUSTPYTHONPATH: ${{ github.workspace }}/Lib
8381

8482
- name: upload tests data to the website
8583
if: ${{ github.event_name != 'pull_request' }}

‎.github/workflows/pyperformance.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ jobs:
172172
# repo's context. This artifact is the hand-off.
173173
- name: Upload the comparison
174174
if: always()
175-
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
175+
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
176176
with:
177177
name: pyperformance-diff
178178
path: |

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
if: runner.os == 'Windows'
8787

8888
- name: Upload Binary Artifacts
89-
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
89+
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
9090
with:
9191
name: rustpython-release-${{ runner.os }}-${{ matrix.target }}
9292
path: target/rustpython-release-${{ runner.os }}-${{ matrix.target }}*
@@ -113,15 +113,15 @@ jobs:
113113
run: cp target/wasm32-wasip1/release/rustpython.wasm target/rustpython-release-wasm32-wasip1.wasm
114114

115115
- name: Upload Binary Artifacts
116-
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
116+
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
117117
with:
118118
name: rustpython-release-wasm32-wasip1
119119
path: target/rustpython-release-wasm32-wasip1.wasm
120120

121121
- name: install wasm-pack
122122
run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
123123

124-
- uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
124+
- uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
125125
with:
126126
package-manager-cache: false
127127

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- name: Generate docs
4444
run: python crates/doc/generate.py
4545

46-
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
46+
- uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
4747
with:
4848
name: doc-db-${{ inputs.python-version }}-${{ matrix.os }}
4949
path: "crates/doc/generated/*.json"
@@ -99,7 +99,7 @@ jobs:
9999
echo '];'
100100
} > "$OUTPUT_FILE"
101101
102-
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
102+
- uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
103103
with:
104104
name: doc-db-${{ inputs.python-version }}
105105
path: "crates/doc/src/data.inc.rs"

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

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

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ repos:
7777
priority: 0
7878

7979
- repo: https://github.com/rbubley/mirrors-prettier
80-
rev: v3.9.9
80+
rev: v3.9.10
8181
hooks:
8282
- id: prettier
8383
files: '^wasm/.*$'

‎Cargo.lock‎

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

‎Cargo.toml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,11 @@ required-features = [
101101
[profile.dev.package."*"]
102102
opt-level = 3
103103

104+
# Unoptimized opcode dispatch leaves oversized native frames active during
105+
# imports and callbacks. Keep the evaluator compact without changing dev guards.
106+
[profile.dev.package.rustpython-vm]
107+
opt-level = 3
108+
104109
[profile.test]
105110
opt-level = 3
106111
# https://github.com/rust-lang/rust/issues/92869
@@ -197,10 +202,10 @@ rustpython-wtf8 = { path = "crates/wtf8", version = "0.6.1" }
197202
rustpython-doc = { path = "crates/doc", version = "0.6.1" }
198203

199204
# Use the RustPython Ruff fork for RustPython public `_ast` metadata.
200-
ruff_python_parser = { package = "rustpython-ruff_python_parser", version = "0.16.10" }
201-
ruff_python_ast = { package = "rustpython-ruff_python_ast", version = "0.16.10" }
202-
ruff_text_size = { package = "rustpython-ruff_text_size", version = "0.16.10" }
203-
ruff_source_file = { package = "rustpython-ruff_source_file", version = "0.16.10" }
205+
ruff_python_parser = { package = "rustpython-ruff_python_parser", git = "https://github.com/RustPython/ruff.git", rev = "9290a8849542134d83f77e9360e7f0b93897fd93" }
206+
ruff_python_ast = { package = "rustpython-ruff_python_ast", git = "https://github.com/RustPython/ruff.git", rev = "9290a8849542134d83f77e9360e7f0b93897fd93" }
207+
ruff_text_size = { package = "rustpython-ruff_text_size", git = "https://github.com/RustPython/ruff.git", rev = "9290a8849542134d83f77e9360e7f0b93897fd93" }
208+
ruff_source_file = { package = "rustpython-ruff_source_file", git = "https://github.com/RustPython/ruff.git", rev = "9290a8849542134d83f77e9360e7f0b93897fd93" }
204209

205210
der = { version = "0.8", features = ["alloc", "oid", "pem", "zeroize"] }
206211
phf = { version = "0.14.0", default-features = false, features = ["macros"]}

‎Lib/test/test_cmd_line.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1369,7 +1369,6 @@ def test_presite(self):
13691369
proc = assert_python_ok("-X", f"presite={entrypoint}", "-c", "pass")
13701370
self.assertEqual(proc.out.rstrip(), b"presite func")
13711371

1372-
@unittest.expectedFailure # TODO: RUSTPYTHON; explicit PYTHONHOME startup path configuration and fatal encodings failure reporting are not implemented
13731372
def test_dump_path_config(self):
13741373
# gh-151253: At the first import (import encodings) during Python
13751374
# startup, if the import fails, dump the Python path configuration.

0 commit comments

Comments
 (0)