NotificationsYou must be signed in to change notification settings
Fork0
Star6

Commit7b6f013

committed

Merge branch 'main' ofhttps://github.com/coolcoder613eb/RustPython

2 parents1a28756 +830389f commit7b6f013Copy full SHA for 7b6f013

File tree

90 files changed

+6778

-2531

lines changed

.cspell.json
.github/workflows
- ci.yaml
.vscode
- launch.json
- tasks.json
Cargo.lock
Cargo.toml
Lib
benches
- execution.rs
common
- Cargo.toml
compiler
- Cargo.toml
- codegen
  - Cargo.toml
  - src
    - compile.rs
    - symboltable.rs
- core
  - Cargo.toml
  - src
    - marshal.rs
derive-impl
- Cargo.toml
- src
  - pyclass.rs
  - util.rs
derive
- Cargo.toml
extra_tests/snippets
- stdlib_sys.py
jit
- Cargo.toml
- src
  - instructions.rs
- tests
pylib
- Cargo.toml
- build.rs
src
- interpreter.rs
- lib.rs
- settings.rs
- shell.rs
- shell
  - helper.rs
stdlib
- Cargo.toml
- src
vm
- Cargo.toml
- src
  - builtins
  - frame.rs
  - function
    - mod.rs
    - protocol.rs
  - import.rs
  - lib.rs
  - macros.rs
  - object
    - core.rs
  - protocol
    - callable.rs
    - object.rs
  - stdlib
    - ast.rs
    - ast
      - gen.rs
    - imp.rs
    - itertools.rs
    - posix.rs
    - winapi.rs
  - vm
  - warn.rs
  - windows.rs
wapm.toml
wasm
- demo/src
  - index.js
- lib
  - Cargo.toml
  - src
    - lib.rs

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 number	Diff line number	Diff line change
`@@ -171,6 +171,8 @@`
`171`	`171`	`"scproxy",`
`172`	`172`	`"setattro",`
`173`	`173`	`"setcomp",`
	`174`	`+"showwarnmsg",`
	`175`	`+"warnmsg",`
`174`	`176`	`"stacklevel",`
`175`	`177`	`"subclasscheck",`
`176`	`178`	`"subclasshook",`

`‎.github/workflows/ci.yaml‎`

Lines changed: 12 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,11 @@ jobs:`
`127`	`127`	`shell:bash`
`128`	`128`	`run:\|`
`129`	`129`	`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`
`131`	`135`	`if:runner.os == 'Windows'`
`132`	`136`	`-name:Set up the Mac environment`
`133`	`137`	`run:brew install autoconf automake libtool`
`@@ -252,7 +256,11 @@ jobs:`
`252`	`256`	`shell:bash`
`253`	`257`	`run:\|`
`254`	`258`	`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`
`256`	`264`	`if:runner.os == 'Windows'`
`257`	`265`	`-name:Set up the Mac environment`
`258`	`266`	`run:brew install autoconf automake libtool openssl@3`
`@@ -308,14 +316,14 @@ jobs:`
`308`	`316`	`with:`
`309`	`317`	`components:rustfmt, clippy`
`310`	`318`	`-name:run rustfmt`
`311`		`-run:cargo fmt --all -- --check`
	`319`	`+run:cargo fmt --check`
`312`	`320`	`-name:run clippy on wasm`
`313`	`321`	`run:cargo clippy --manifest-path=wasm/lib/Cargo.toml -- -Dwarnings`
`314`	`322`	`-uses:actions/setup-python@v4`
`315`	`323`	`with:`
`316`	`324`	`python-version:${{ env.PYTHON_VERSION }}`
`317`	`325`	`-name:install ruff`
`318`		`-run:python -m pip install ruff`
	`326`	`+run:python -m pip install ruff==0.0.291# astral-sh/ruff#7778`
`319`	`327`	`-name:run python lint`
`320`	`328`	`run:ruff extra_tests wasm examples --exclude='./.*',./Lib,./vm/Lib,./benches/ --select=E9,F63,F7,F82 --show-source`
`321`	`329`	`-name:install prettier`

`‎.vscode/launch.json‎`

Lines changed: 12 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,6 @@`
`8`	`8`	`"type":"lldb",`
`9`	`9`	`"request":"launch",`
`10`	`10`	`"name":"Debug executable 'rustpython'",`
`11`		`-"cargo": {`
`12`		`-"args": [`
`13`		`-"build",`
`14`		`-"--package=rustpython"`
`15`		`- ],`
`16`		`- },`
`17`	`11`	`"preLaunchTask":"Build RustPython Debug",`
`18`	`12`	`"program":"target/debug/rustpython",`
`19`	`13`	`"args": [],`
`@@ -22,6 +16,18 @@`
`22`	`16`	`},`
`23`	`17`	`"cwd":"${workspaceFolder}"`
`24`	`18`	`},`
	`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`	`+ },`
`25`	`31`	`{`
`26`	`32`	`"type":"lldb",`
`27`	`33`	`"request":"launch",`

`‎.vscode/tasks.json‎`

Lines changed: 17 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,28 @@`
`1`	`1`	`{`
`2`	`2`	`"version":"2.0.0",`
`3`	`3`	`"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`	`+ },`
`4`	`19`	`{`
`5`	`20`	`"label":"Build RustPython Debug",`
`6`	`21`	`"type":"shell",`
`7`	`22`	`"command":"cargo",`
`8`	`23`	`"args": [`
`9`	`24`	`"build",`
	`25`	`+"--features=ssl"`
`10`	`26`	`],`
`11`	`27`	`"problemMatcher": [`
`12`	`28`	`"$rustc",`
`@@ -15,6 +31,6 @@`
`15`	`31`	`"kind":"build",`
`16`	`32`	`"isDefault":true,`
`17`	`33`	`},`
`18`		`- }`
	`34`	`+ },`
`19`	`35`	`],`
`20`	`36`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit7b6f013

File tree

90 files changed

Some content is hidden

90 files changed

`‎.cspell.json‎`

`‎.github/workflows/ci.yaml‎`

`‎.vscode/launch.json‎`

`‎.vscode/tasks.json‎`

0 commit comments