From 53bef1a0e099a0bb0dd9986454fd20cc0f3cbcb3 Mon Sep 17 00:00:00 2001
From: Micha Reiser <micha@reiser.io>
Date: Tue, 25 Apr 2023 14:46:21 -0600
Subject: [PATCH] Delete commented out code

---
 .github/workflows/ci.yaml | 155 --------------------------------------
 Cargo.toml                |  70 -----------------
 2 files changed, 225 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index bc5e562367a..da04f4be1f1 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -224,81 +224,6 @@ jobs:
         with:
           command: check
 
-#  snippets_cpython:
-#    if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip:ci') }}
-#    needs: lalrpop
-#    env:
-#      RUST_BACKTRACE: full
-#    name: Run snippets and cpython tests
-#    runs-on:  ${{ matrix.os }}
-#    strategy:
-#      matrix:
-#        os: [macos-latest, ubuntu-latest, windows-latest]
-#      fail-fast: false
-#    steps:
-#      - uses: actions/checkout@v3
-#      - name: Cache generated parser
-#        uses: actions/cache@v3
-#        with:
-#          path: compiler/parser/python.rs
-#          key: lalrpop-${{ hashFiles('compiler/parser/python.lalrpop') }}
-#
-#      - uses: dtolnay/rust-toolchain@stable
-#      - uses: actions/setup-python@v4
-#        with:
-#          python-version: "3.11"
-#      - name: Set up the Windows environment
-#        shell: bash
-#        run: |
-#          choco install llvm openssl
-#          echo "OPENSSL_DIR=C:\Program Files\OpenSSL-Win64" >>$GITHUB_ENV
-#        if: runner.os == 'Windows'
-#      - name: Set up the Mac environment
-#        run: brew install autoconf automake libtool openssl@3
-#        if: runner.os == 'macOS'
-#
-#      - uses: Swatinem/rust-cache@v2
-#      - name: build rustpython
-#        run: cargo build --release --verbose --features=threading ${{ env.CARGO_ARGS }}
-#      - uses: actions/setup-python@v4
-#        with:
-#          python-version: "3.11"
-#      - name: run snippets
-#        run: python -m pip install -r requirements.txt && pytest -v
-#        working-directory: ./extra_tests
-#      - if: runner.os == 'Linux'
-#        name: run cpython platform-independent tests
-#        run:
-#          target/release/rustpython -m test -j 1 -u all --slowest --fail-env-changed -v ${{ env.PLATFORM_INDEPENDENT_TESTS }}
-#      - if: runner.os != 'Windows'
-#        name: run cpython platform-dependent tests
-#        run: target/release/rustpython -m test -j 1 -u all --slowest --fail-env-changed -v -x ${{ env.PLATFORM_INDEPENDENT_TESTS }}
-#      - if: runner.os == 'Windows'
-#        name: run cpython platform-dependent tests (windows partial - fixme)
-#        run:
-#          target/release/rustpython -m test -j 1 -u all --slowest --fail-env-changed -v -x ${{ env.PLATFORM_INDEPENDENT_TESTS }}
-#            test_glob
-#            test_importlib
-#            test_io
-#            test_iter
-#            test_os
-#            test_pathlib
-#            test_posixpath
-#            test_shutil
-#            test_venv
-#      - if: runner.os != 'Windows'
-#        name: check that --install-pip succeeds
-#        run: |
-#          mkdir site-packages
-#          target/release/rustpython --install-pip ensurepip --user
-#      - if: runner.os != 'Windows'
-#        name: Check that ensurepip succeeds.
-#        run: |
-#          target/release/rustpython -m ensurepip
-#          target/release/rustpython -c "import pip"
-#      - name: Check whats_left is not broken
-#        run: python -I whats_left.py
-
   lalrpop:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip:ci') }}
     name: Generate parser with lalrpop
@@ -385,83 +310,3 @@ jobs:
       - uses: Swatinem/rust-cache@v2
       - name: Run tests under miri
         run: cargo +nightly miri test -p rustpython-parser -- miri_test
-
-#  wasm:
-#    if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip:ci') }}
-#    name: Check the WASM package and demo
-#    needs: lalrpop
-#    runs-on: ubuntu-latest
-#    steps:
-#      - uses: actions/checkout@v3
-#      - name: Cache generated parser
-#        uses: actions/cache@v3
-#        with:
-#          path: compiler/parser/python.rs
-#          key: lalrpop-${{ hashFiles('compiler/parser/python.lalrpop') }}
-#      - uses: dtolnay/rust-toolchain@stable
-#
-#      - uses: Swatinem/rust-cache@v2
-#      - name: install wasm-pack
-#        run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
-#      - name: install geckodriver
-#        run: |
-#          wget https://github.com/mozilla/geckodriver/releases/download/v0.30.0/geckodriver-v0.30.0-linux64.tar.gz
-#          mkdir geckodriver
-#          tar -xzf geckodriver-v0.30.0-linux64.tar.gz -C geckodriver
-#      - uses: actions/setup-python@v4
-#        with:
-#          python-version: "3.11"
-#      - run: python -m pip install -r requirements.txt
-#        working-directory: ./wasm/tests
-#      - uses: actions/setup-node@v3
-#      - name: run test
-#        run: |
-#          export PATH=$PATH:`pwd`/../../geckodriver
-#          npm install
-#          npm run test
-#        env:
-#          NODE_OPTIONS: "--openssl-legacy-provider"
-#        working-directory: ./wasm/demo
-#      - name: build notebook demo
-#        if: github.ref == 'refs/heads/release'
-#        run: |
-#          npm install
-#          npm run dist
-#          mv dist ../demo/dist/notebook
-#        env:
-#          NODE_OPTIONS: "--openssl-legacy-provider"
-#        working-directory: ./wasm/notebook
-#      - name: Deploy demo to Github Pages
-#        if: success() && github.ref == 'refs/heads/release'
-#        uses: peaceiris/actions-gh-pages@v2
-#        env:
-#          ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEMO_DEPLOY_KEY }}
-#          PUBLISH_DIR: ./wasm/demo/dist
-#          EXTERNAL_REPOSITORY: RustPython/demo
-#          PUBLISH_BRANCH: master
-#
-#  wasm-wasi:
-#    if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip:ci') }}
-#    name: Run snippets and cpython tests on wasm-wasi
-#    needs: lalrpop
-#    runs-on: ubuntu-latest
-#    steps:
-#      - uses: actions/checkout@v3
-#      - name: Cache generated parser
-#        uses: actions/cache@v3
-#        with:
-#          path: compiler/parser/python.rs
-#          key: lalrpop-${{ hashFiles('compiler/parser/python.lalrpop') }}
-#      - uses: dtolnay/rust-toolchain@stable
-#        with:
-#          target: wasm32-wasi
-#
-#      - uses: Swatinem/rust-cache@v2
-#      - name: Setup Wasmer
-#        uses: wasmerio/setup-wasmer@v2
-#      - name: Install clang
-#        run: sudo apt-get update && sudo apt-get install clang -y
-#      - name: build rustpython
-#        run: cargo build --release --target wasm32-wasi --features freeze-stdlib,stdlib --verbose
-#      - name: run snippets
-#        run: wasmer run --dir . target/wasm32-wasi/release/rustpython.wasm -- extra_tests/snippets/stdlib_random.py
diff --git a/Cargo.toml b/Cargo.toml
index 39ec98e2e7c..0dd2bd6c5c9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,14 +1,3 @@
-#[package]
-#name = "rustpython"
-#version = "0.2.0"
-#authors = ["RustPython Team"]
-#edition = "2021"
-#rust-version = "1.67.1"
-#description = "A python interpreter written in rust."
-#repository = "https://github.com/RustPython/RustPython"
-#license = "MIT"
-#include = ["LICENSE", "Cargo.toml", "src/**/*.rs"]
-
 [workspace]
 resolver = "2"
 members = [
@@ -55,60 +44,6 @@ thread_local = "1.1.4"
 unicode_names2 = { version = "0.6.0", git = "https://github.com/youknowone/unicode_names2.git", rev = "4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde" }
 widestring = "0.5.1"
 
-#[features]
-#default = ["threading", "stdlib", "zlib", "importlib", "encodings", "rustpython-parser/lalrpop"]
-#importlib = ["rustpython-vm/importlib"]
-#encodings = ["rustpython-vm/encodings"]
-#stdlib = ["rustpython-stdlib", "rustpython-pylib"]
-#flame-it = ["rustpython-vm/flame-it", "flame", "flamescope"]
-#freeze-stdlib = ["rustpython-vm/freeze-stdlib", "rustpython-pylib?/freeze-stdlib"]
-#jit = ["rustpython-vm/jit"]
-#threading = ["rustpython-vm/threading", "rustpython-stdlib/threading"]
-#zlib = ["stdlib", "rustpython-stdlib/zlib"]
-#bz2 = ["stdlib", "rustpython-stdlib/bz2"]
-#ssl = ["rustpython-stdlib/ssl"]
-#ssl-vendor = ["rustpython-stdlib/ssl-vendor"]
-
-#[dependencies]
-#rustpython-compiler = { path = "compiler", version = "0.2.0" }
-#rustpython-parser = { path = "compiler/parser", version = "0.2.0" }
-#rustpython-pylib = { path = "pylib", optional = true, default-features = false }
-#rustpython-stdlib = { path = "stdlib", optional = true, default-features = false }
-#rustpython-vm = { path = "vm", version = "0.2.0", default-features = false, features = ["compiler"] }
-
-#atty = { workspace = true }
-#cfg-if = { workspace = true }
-#log = { workspace = true }
-#flame = { workspace = true, optional = true }
-#
-#clap = "2.34"
-#dirs = { package = "dirs-next", version = "2.0.0" }
-#env_logger = { version = "0.9.0", default-features = false, features = ["atty", "termcolor"] }
-#flamescope = { version = "0.1.2", optional = true }
-#
-#[target.'cfg(windows)'.dependencies]
-#libc = { workspace = true }
-#
-#[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-#rustyline = { workspace = true }
-#
-#[dev-dependencies]
-#cpython = "0.7.0"
-#criterion = "0.3.5"
-#python3-sys = "0.7.0"
-
-#[[bench]]
-#name = "execution"
-#harness = false
-#
-#[[bench]]
-#name = "microbenchmarks"
-#harness = false
-#
-#[[bin]]
-#name = "rustpython"
-#path = "src/main.rs"
-
 [profile.dev.package."*"]
 opt-level = 3
 
@@ -124,8 +59,3 @@ opt-level = 3
 
 [profile.release]
 lto = "thin"
-
-[patch.crates-io]
-# REDOX START, Uncomment when you want to compile/check with redoxer
-# nix = { git = "https://github.com/coolreader18/nix", branch = "0.26.2-redox" }
-# REDOX END