Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit98cb249

Browse files
authored
Merge branch 'RustPython:main' into impl-nb-bytes
2 parents52dd4ee +8f56c06 commit98cb249

File tree

150 files changed

+18992
-9237
lines changed

Some content is hidden

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

150 files changed

+18992
-9237
lines changed

‎.github/workflows/ci.yaml

Lines changed: 30 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ concurrency:
1414

1515
env:
1616
CARGO_ARGS:--features ssl,jit
17-
NON_WASM_PACKAGES:>
17+
NON_WASM_PACKAGES:>-
1818
-p rustpython-bytecode
1919
-p rustpython-common
2020
-p rustpython-compiler
@@ -52,7 +52,7 @@ jobs:
5252
fail-fast:false
5353
steps:
5454
-uses:actions/checkout@v2
55-
-uses:actions-rs/toolchain@v1
55+
-uses:dtolnay/rust-toolchain@stable
5656
-name:Set up the Windows environment
5757
shell:bash
5858
run:|
@@ -64,26 +64,17 @@ jobs:
6464
if:runner.os == 'macOS'
6565
-uses:Swatinem/rust-cache@v1
6666
-name:run rust tests
67-
uses:actions-rs/cargo@v1
68-
with:
69-
command:test
70-
args:--workspace --exclude rustpython_wasm --verbose ${{ env.CARGO_ARGS }} ${{ env.NON_WASM_PACKAGES }}
67+
run:cargo test --workspace --exclude rustpython_wasm --verbose ${{ env.CARGO_ARGS }} ${{ env.NON_WASM_PACKAGES }}
7168
-name:check compilation without threading
72-
uses:actions-rs/cargo@v1
73-
with:
74-
command:check
75-
args:${{ env.CARGO_ARGS }} --no-default-features
69+
run:cargo check ${{ env.CARGO_ARGS }} --no-default-features
7670

7771
-name:prepare AppleSilicon build
78-
uses:actions-rs/toolchain@v1
72+
uses:dtolnay/rust-toolchain@stable
7973
with:
8074
target:aarch64-apple-darwin
8175
if:runner.os == 'macOS'
8276
-name:Check compilation for Apple Silicon
83-
uses:actions-rs/cargo@v1
84-
with:
85-
command:check
86-
args:--target aarch64-apple-darwin
77+
run:cargo check --target aarch64-apple-darwin
8778
if:runner.os == 'macOS'
8879

8980
exotic_targets:
@@ -92,67 +83,49 @@ jobs:
9283
steps:
9384
-uses:actions/checkout@v2
9485

95-
-uses:actions-rs/toolchain@v1
86+
-uses:dtolnay/rust-toolchain@stable
9687
with:
9788
target:i686-unknown-linux-gnu
9889

9990
-name:Install gcc-multilib and musl-tools
10091
run:sudo apt-get update && sudo apt-get install gcc-multilib musl-tools
10192
-name:Check compilation for x86 32bit
102-
uses:actions-rs/cargo@v1
103-
with:
104-
command:check
105-
args:--target i686-unknown-linux-gnu
93+
run:cargo check --target i686-unknown-linux-gnu
10694

107-
-uses:actions-rs/toolchain@v1
95+
-uses:dtolnay/rust-toolchain@stable
10896
with:
10997
target:aarch64-linux-android
11098

11199
-name:Check compilation for android
112-
uses:actions-rs/cargo@v1
113-
with:
114-
command:check
115-
args:--target aarch64-linux-android
100+
run:cargo check --target aarch64-linux-android
116101

117-
-uses:actions-rs/toolchain@v1
102+
-uses:dtolnay/rust-toolchain@stable
118103
with:
119104
target:i686-unknown-linux-musl
120105

121106
-name:Check compilation for musl
122-
uses:actions-rs/cargo@v1
123-
with:
124-
command:check
125-
args:--target i686-unknown-linux-musl
107+
run:cargo check --target i686-unknown-linux-musl
126108

127-
-uses:actions-rs/toolchain@v1
109+
-uses:dtolnay/rust-toolchain@stable
128110
with:
129111
target:x86_64-unknown-freebsd
130112

131113
-name:Check compilation for freebsd
132-
uses:actions-rs/cargo@v1
133-
with:
134-
command:check
135-
args:--target x86_64-unknown-freebsd
114+
run:cargo check --target x86_64-unknown-freebsd
136115

137-
-uses:actions-rs/toolchain@v1
116+
-uses:dtolnay/rust-toolchain@stable
138117
with:
139118
target:wasm32-unknown-unknown
140119

141120
-name:Check compilation for wasm32
142-
uses:actions-rs/cargo@v1
143-
with:
144-
command:check
145-
args:--target wasm32-unknown-unknown --no-default-features
121+
run:cargo check --target wasm32-unknown-unknown --no-default-features
146122

147-
-uses:actions-rs/toolchain@v1
123+
-uses:dtolnay/rust-toolchain@stable
148124
with:
149125
target:x86_64-unknown-freebsd
150126

151127
-name:Check compilation for freeBSD
152-
uses:actions-rs/cargo@v1
153-
with:
154-
command:check
155-
args:--target x86_64-unknown-freebsd
128+
run:cargo check --target x86_64-unknown-freebsd
156129

157130
-name:Prepare repository for redox compilation
158131
run:bash scripts/redox/uncomment-cargo.sh
@@ -173,7 +146,7 @@ jobs:
173146
fail-fast:false
174147
steps:
175148
-uses:actions/checkout@v2
176-
-uses:actions-rs/toolchain@v1
149+
-uses:dtolnay/rust-toolchain@stable
177150
-uses:actions/setup-python@v2
178151
with:
179152
python-version:"3.10"
@@ -188,22 +161,12 @@ jobs:
188161
if:runner.os == 'macOS'
189162
-uses:Swatinem/rust-cache@v1
190163
-name:build rustpython
191-
uses:actions-rs/cargo@v1
192-
with:
193-
command:build
194-
args:--release --verbose ${{ env.CARGO_ARGS }}
164+
run:cargo build --release --verbose ${{ env.CARGO_ARGS }}
195165
-uses:actions/setup-python@v2
196166
with:
197167
python-version:"3.10"
198-
-name:Install pipenv
199-
run:|
200-
python -V
201-
python -m pip install --upgrade pip
202-
python -m pip install pipenv
203-
-run:pipenv install --python "3.10"
204-
working-directory:./extra_tests
205168
-name:run snippets
206-
run:pipenv run pytest -v
169+
run:python -m pip install -r requirements.txt && pytest -v
207170
working-directory:./extra_tests
208171
-if:runner.os == 'Linux'
209172
name:run cpython platform-independent tests
@@ -244,26 +207,15 @@ jobs:
244207
runs-on:ubuntu-latest
245208
steps:
246209
-uses:actions/checkout@v2
247-
-uses:actions-rs/toolchain@v1
210+
-uses:dtolnay/rust-toolchain@stable
248211
with:
249-
profile:minimal
250212
components:rustfmt, clippy
251-
override:true
252213
-name:run rustfmt
253-
uses:actions-rs/cargo@v1
254-
with:
255-
command:fmt
256-
args:--all -- --check
214+
run:cargo fmt --all -- --check
257215
-name:run clippy
258-
uses:actions-rs/cargo@v1
259-
with:
260-
command:clippy
261-
args:${{ env.CARGO_ARGS }} ${{ env.NON_WASM_PACKAGES }} -- -Dwarnings
216+
run:cargo clippy ${{ env.CARGO_ARGS }} ${{ env.NON_WASM_PACKAGES }} -- -Dwarnings
262217
-name:run clippy on wasm
263-
uses:actions-rs/cargo@v1
264-
with:
265-
command:clippy
266-
args:--manifest-path=wasm/lib/Cargo.toml -- -Dwarnings
218+
run:cargo clippy --manifest-path=wasm/lib/Cargo.toml -- -Dwarnings
267219
-uses:actions/setup-python@v2
268220
with:
269221
python-version:"3.10"
@@ -281,12 +233,10 @@ jobs:
281233
runs-on:ubuntu-latest
282234
steps:
283235
-uses:actions/checkout@v2
284-
-uses:actions-rs/toolchain@v1
236+
-uses:dtolnay/rust-toolchain@master
285237
with:
286-
profile:minimal
287238
toolchain:nightly
288239
components:miri
289-
override:true
290240
-uses:Swatinem/rust-cache@v1
291241
-name:Run tests under miri
292242
# miri-ignore-leaks because the type-object circular reference means that there will always be
@@ -299,7 +249,7 @@ jobs:
299249
runs-on:ubuntu-latest
300250
steps:
301251
-uses:actions/checkout@v2
302-
-uses:actions-rs/toolchain@v1
252+
-uses:dtolnay/rust-toolchain@stable
303253
-name:Cache cargo dependencies
304254
uses:actions/cache@v2
305255
with:
@@ -320,12 +270,7 @@ jobs:
320270
-uses:actions/setup-python@v2
321271
with:
322272
python-version:"3.10"
323-
-name:Install pipenv
324-
run:|
325-
python -V
326-
python -m pip install --upgrade pip
327-
python -m pip install pipenv
328-
-run:pipenv install
273+
-run:python -m pip install -r requirements.txt
329274
working-directory:./wasm/tests
330275
-uses:actions/setup-node@v1
331276
-name:run test
@@ -355,11 +300,9 @@ jobs:
355300
runs-on:ubuntu-latest
356301
steps:
357302
-uses:actions/checkout@v2
358-
-uses:actions-rs/toolchain@v1
303+
-uses:dtolnay/rust-toolchain@stable
359304
with:
360-
toolchain:stable
361305
target:wasm32-wasi
362-
override:true
363306
-name:Setup Wasmer
364307
uses:wasmerio/setup-wasmer@v1
365308
-name:Install clang
@@ -375,9 +318,6 @@ jobs:
375318
restore-keys:|
376319
${{ runner.os }}-debug_opt3-${{ hashFiles('**/Cargo.lock') }}
377320
-name:build rustpython
378-
uses:actions-rs/cargo@v1
379-
with:
380-
command:build
381-
args:--release --target wasm32-wasi --features freeze-stdlib,stdlib --verbose
321+
run:cargo build --release --target wasm32-wasi --features freeze-stdlib,stdlib --verbose
382322
-name:run snippets
383323
run:wasmer run --dir . target/wasm32-wasi/release/rustpython.wasm -- extra_tests/snippets/stdlib_random.py

‎.github/workflows/cron-ci.yaml

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,20 @@ jobs:
1414
runs-on:ubuntu-latest
1515
steps:
1616
-uses:actions/checkout@v2
17-
-uses:actions-rs/toolchain@v1
17+
-uses:dtolnay/rust-toolchain@stable
1818
with:
1919
components:llvm-tools-preview
2020
-run:sudo apt-get update && sudo apt-get -y install lcov
21-
-uses:actions-rs/cargo@v1
22-
with:
23-
command:build
24-
args:--release --verbose ${{ env.CARGO_ARGS }}
21+
-run:cargo build --release --verbose ${{ env.CARGO_ARGS }}
2522
env:
2623
RUSTC_WRAPPER:'./scripts/codecoverage-rustc-wrapper.sh'
2724
-uses:actions/setup-python@v2
2825
with:
2926
python-version:"3.10"
30-
-name:Install pipenv
31-
run:|
32-
python -V
33-
python -m pip install --upgrade pip
34-
python -m pip install pipenv
35-
-run:pipenv install
27+
-run:python -m pip install pytest
3628
working-directory:./extra_tests
3729
-name:run snippets
38-
run:LLVM_PROFILE_FILE="$PWD/snippet-%p.profraw"pipenv runpytest -v
30+
run:LLVM_PROFILE_FILE="$PWD/snippet-%p.profraw" pytest -v
3931
working-directory:./extra_tests
4032
-name:run cpython tests
4133
run:LLVM_PROFILE_FILE="$PWD/regrtest.profraw" target/release/rustpython -m test -v
@@ -58,12 +50,9 @@ jobs:
5850
runs-on:ubuntu-latest
5951
steps:
6052
-uses:actions/checkout@v2
61-
-uses:actions-rs/toolchain@v1
53+
-uses:dtolnay/rust-toolchain@stable
6254
-name:build rustpython
63-
uses:actions-rs/cargo@v1
64-
with:
65-
command:build
66-
args:--release --verbose
55+
run:cargo build --release --verbose
6756
-name:collect tests data
6857
run:cargo run --release extra_tests/jsontests.py
6958
env:
@@ -89,12 +78,9 @@ jobs:
8978
runs-on:ubuntu-latest
9079
steps:
9180
-uses:actions/checkout@v2
92-
-uses:actions-rs/toolchain@v1
81+
-uses:dtolnay/rust-toolchain@stable
9382
-name:build rustpython
94-
uses:actions-rs/cargo@v1
95-
with:
96-
command:build
97-
args:--release --verbose
83+
run:cargo build --release --verbose
9884
-name:Collect what is left data
9985
run:|
10086
chmod +x ./whats_left.sh
@@ -123,7 +109,7 @@ jobs:
123109
runs-on:ubuntu-latest
124110
steps:
125111
-uses:actions/checkout@v2
126-
-uses:actions-rs/toolchain@v1
112+
-uses:dtolnay/rust-toolchain@stable
127113
-uses:actions/setup-python@v2
128114
with:
129115
python-version:3.9

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp