Skip to content

Commit 7b6f013

Browse files
coolcoder613ebcoolcoder613eb
committed
2 parents 1a28756 + 830389f commit 7b6f013

Some content is hidden

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

90 files changed

+6778
-2531
lines changed

‎.cspell.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,8 @@
171171
"scproxy",
172172
"setattro",
173173
"setcomp",
174+
"showwarnmsg",
175+
"warnmsg",
174176
"stacklevel",
175177
"subclasscheck",
176178
"subclasshook",

‎.github/workflows/ci.yaml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,11 @@ jobs:
127127
shell: bash
128128
run: |
129129
choco install llvm openssl --no-progress
130-
echo "OPENSSL_DIR=C:\Program Files\OpenSSL" >>$GITHUB_ENV
130+
if [[ -d "C:\Program Files\OpenSSL-Win64" ]]; then
131+
echo "OPENSSL_DIR=C:\Program Files\OpenSSL-Win64" >> $GITHUB_ENV
132+
else
133+
echo "OPENSSL_DIR=C:\Program Files\OpenSSL" >> $GITHUB_ENV
134+
fi
131135
if: runner.os == 'Windows'
132136
- name: Set up the Mac environment
133137
run: brew install autoconf automake libtool
@@ -252,7 +256,11 @@ jobs:
252256
shell: bash
253257
run: |
254258
choco install llvm openssl --no-progress
255-
echo "OPENSSL_DIR=C:\Program Files\OpenSSL" >>$GITHUB_ENV
259+
if [[ -d "C:\Program Files\OpenSSL-Win64" ]]; then
260+
echo "OPENSSL_DIR=C:\Program Files\OpenSSL-Win64" >> $GITHUB_ENV
261+
else
262+
echo "OPENSSL_DIR=C:\Program Files\OpenSSL" >> $GITHUB_ENV
263+
fi
256264
if: runner.os == 'Windows'
257265
- name: Set up the Mac environment
258266
run: brew install autoconf automake libtool openssl@3
@@ -308,14 +316,14 @@ jobs:
308316
with:
309317
components: rustfmt, clippy
310318
- name: run rustfmt
311-
run: cargo fmt --all -- --check
319+
run: cargo fmt --check
312320
- name: run clippy on wasm
313321
run: cargo clippy --manifest-path=wasm/lib/Cargo.toml -- -Dwarnings
314322
- uses: actions/setup-python@v4
315323
with:
316324
python-version: ${{ env.PYTHON_VERSION }}
317325
- name: install ruff
318-
run: python -m pip install ruff
326+
run: python -m pip install ruff==0.0.291 # astral-sh/ruff#7778
319327
- name: run python lint
320328
run: ruff extra_tests wasm examples --exclude='./.*',./Lib,./vm/Lib,./benches/ --select=E9,F63,F7,F82 --show-source
321329
- name: install prettier

‎.vscode/launch.json

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@
88
"type": "lldb",
99
"request": "launch",
1010
"name": "Debug executable 'rustpython'",
11-
"cargo": {
12-
"args": [
13-
"build",
14-
"--package=rustpython"
15-
],
16-
},
1711
"preLaunchTask": "Build RustPython Debug",
1812
"program": "target/debug/rustpython",
1913
"args": [],
@@ -22,6 +16,18 @@
2216
},
2317
"cwd": "${workspaceFolder}"
2418
},
19+
{
20+
"type": "lldb",
21+
"request": "launch",
22+
"name": "Debug executable 'rustpython' without SSL",
23+
"preLaunchTask": "Build RustPython Debug without SSL",
24+
"program": "target/debug/rustpython",
25+
"args": [],
26+
"env": {
27+
"RUST_BACKTRACE": "1"
28+
},
29+
"cwd": "${workspaceFolder}"
30+
},
2531
{
2632
"type": "lldb",
2733
"request": "launch",

‎.vscode/tasks.json

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,28 @@
11
{
22
"version": "2.0.0",
33
"tasks": [
4+
{
5+
"label": "Build RustPython Debug without SSL",
6+
"type": "shell",
7+
"command": "cargo",
8+
"args": [
9+
"build",
10+
],
11+
"problemMatcher": [
12+
"$rustc",
13+
],
14+
"group": {
15+
"kind": "build",
16+
"isDefault": true,
17+
},
18+
},
419
{
520
"label": "Build RustPython Debug",
621
"type": "shell",
722
"command": "cargo",
823
"args": [
924
"build",
25+
"--features=ssl"
1026
],
1127
"problemMatcher": [
1228
"$rustc",
@@ -15,6 +31,6 @@
1531
"kind": "build",
1632
"isDefault": true,
1733
},
18-
}
34+
},
1935
],
2036
}

0 commit comments

Comments
 (0)