RustPython · windelbouwman · Feb 4, 2020 · Dec 28, 2019 · Dec 28, 2019 · Dec 28, 2019
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+Lib/* linguist-vendored
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -0,0 +1,159 @@
+on:
+  push:
+    branches: [master, release]
+  pull_request:  
+
+name: CI
+
+jobs:
+  rust_tests:
+    name: Run rust tests
+    runs-on:  ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-latest, ubuntu-latest, windows-latest]
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@master
+      - name: Convert symlinks to hardlink (windows only)
+        run: powershell.exe scripts/symlinks-to-hardlinks.ps1
+        if: runner.os == 'Windows'
+      - name: Cache cargo dependencies
+        uses: actions/cache@v1
+        with:
+          key: ${{ runner.os }}-rust_tests-${{ hashFiles('Cargo.lock') }}
+          path: target
+          restore-keys: |
+            ${{ runner.os }}-rust_tests-
+      - name: run rust tests
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --verbose --all
+
+  snippets:
+    name: Run snippets tests
+    runs-on:  ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-latest, ubuntu-latest, windows-latest]
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@master
+      - name: Convert symlinks to hardlink (windows only)
+        run: powershell.exe scripts/symlinks-to-hardlinks.ps1
+        if: runner.os == 'Windows'
+      - name: Cache cargo dependencies
+        uses: actions/cache@v1
+        with:
+          key: ${{ runner.os }}-snippets-${{ hashFiles('Cargo.lock') }}
+          path: target
+          restore-keys: |
+            ${{ runner.os }}-snippets-
+      - name: build rustpython
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: --release --verbose --all
+      - uses: actions/setup-python@v1
+        with:
+          python-version: 3.6
+      - name: Install pipenv
+        run: |
+          python -V
+          python -m pip install --upgrade pip
+          python -m pip install pipenv
+      - run: pipenv install
+        working-directory: ./tests
+      - name: run snippets
+        run: pipenv run pytest -v
+        working-directory: ./tests
+
+  format:
+    name: Check Rust code with rustfmt and clippy
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - uses: actions-rs/toolchain@v1
+        with:
+            profile: minimal
+            toolchain: stable
+            components: rustfmt
+            override: true
+      - name: run rustfmt
+        uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --all -- --check
+      - name: run clippy
+        uses: actions-rs/cargo@v1
+        with:
+          command: clippy
+          args: --all -- -Dwarnings
+
+  lint:
+    name: Lint Python code with flake8
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - uses: actions/setup-python@v1
+        with:
+          python-version: 3.6
+      - name: install flake8
+        run: python -m pip install flake8
+      - name: run lint
+        run: flake8 . --count --exclude=./.*,./Lib,./vm/Lib  --select=E9,F63,F7,F82 --show-source --statistics
+
+  cpython:
+    name: Run CPython test suite
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: build rustpython
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: --verbose --all
+      - name: run tests
+        run: |
+          export RUSTPYTHONPATH=`pwd`/Lib
+          cargo run -- -m test -v
+
+  wasm:
+    name: Check the WASM package and demo
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - 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.24.0/geckodriver-v0.24.0-linux32.tar.gz
+          mkdir geckodriver
+          tar -xzf geckodriver-v0.24.0-linux32.tar.gz -C geckodriver
+      - uses: actions/setup-python@v1
+        with:
+          python-version: 3.6
+      - name: Install pipenv
+        run: |
+          python -V
+          python -m pip install --upgrade pip
+          python -m pip install pipenv
+      - run: pipenv install
+        working-directory: ./wasm/tests
+      - uses: actions/setup-node@v1
+      - name: run test
+        run: |
+          export PATH=$PATH:`pwd`/../../geckodriver
+          npm install
+          npm run test
+        working-directory: ./wasm/demo
+      - 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
+
diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,5 @@ tests/snippets/resources
 flame-graph.html
 flame.txt
 flamescope.json
+/wapm.lock
+/wapm_packages
diff --git a/.travis.yml b/.travis.yml
@@ -1,15 +1,26 @@
-before_cache: |
-  if command -v cargo; then
-    ! command -v cargo-sweep && cargo install cargo-sweep
-    cargo sweep -i
-    cargo sweep -t 15
-  fi
+branches:
+  only:
+    - master
+    - release
+    - redox-release
 
-matrix:
+before_cache:
+  - |
+    if command -v cargo; then
+      if ! command -v cargo-sweep; then
+        cargo install cargo-sweep
+      fi
+      cargo sweep -i
+      cargo sweep -t 15
+    fi
+  - rm -rf ~/.cargo/registry/src
+
+jobs:
   fast_finish: true
   include:
-    - name: Run Rust tests
+    - name: Run Rust tests(linux)
       language: rust
+      os: linux
       rust: stable
       cache: cargo
       script:
@@ -20,11 +31,24 @@ matrix:
         # See: https://docs.travis-ci.com/user/caching/#caches-and-build-matrices
         - JOBCACHE=1
 
+    - name: Run Rust tests(osx)
+      language: rust
+      os: osx
+      rust: stable
+      cache: cargo
+      script:
+        - cargo build --verbose --all
+        - cargo test --verbose --all
+      env:
+        # Prevention of cache corruption.
+        # See: https://docs.travis-ci.com/user/caching/#caches-and-build-matrices
+        - JOBCACHE=11
+
     # To test the snippets, we use Travis' Python environment (because
     # installing rust ourselves is a lot easier than installing Python)
     - name: Python test snippets
       language: python
-      python: 3.6
+      python: 3.8
       cache:
         - pip
         - cargo
@@ -34,31 +58,22 @@ matrix:
         - CODE_COVERAGE=false
       script: tests/.travis-runner.sh
 
-    - name: Check Rust code style with rustfmt
+    - name: Check Rust code with rustfmt and clippy
       language: rust
       rust: stable
       cache: cargo
       before_script:
         - rustup component add rustfmt
-      script:
-        - cargo fmt --all -- --check
-      env:
-        - JOBCACHE=3
-
-    - name: Lint Rust code with clippy
-      language: rust
-      rust: stable
-      cache: cargo
-      before_script:
         - rustup component add clippy
       script:
+        - cargo fmt --all -- --check
         - cargo clippy --all -- -Dwarnings
       env:
-        - JOBCACHE=8
+        - JOBCACHE=3
 
     - name: Lint Python code with flake8
       language: python
-      python: 3.6
+      python: 3.8
       cache: pip
       env: JOBCACHE=9
       install: pip install flake8
@@ -87,36 +102,9 @@ matrix:
           on:
             branch: release
 
-    - name: WASM online demo
-      language: rust
-      rust: stable
-      cache: cargo
-      install:
-        - nvm install node
-        # install wasm-pack
-        - curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
-      script:
-        - cd wasm/demo
-        - npm install
-        - npm run dist
-      if: branch = release
-      env:
-        - JOBCACHE=5
-      deploy:
-        - provider: pages
-          repo: RustPython/demo
-          target-branch: master
-          local-dir: wasm/demo/dist
-          skip-cleanup: true
-          # Set in the settings page of your repository, as a secure variable
-          github-token: $WEBSITE_GITHUB_TOKEN
-          keep-history: true
-          on:
-            branch: release
-
     - name: Code Coverage
       language: python
-      python: 3.6
+      python: 3.8
       cache:
         - pip
         - cargo
@@ -131,7 +119,7 @@ matrix:
 
     - name: Test WASM
       language: python
-      python: 3.6
+      python: 3.8
       cache:
         - pip
         - cargo
@@ -145,3 +133,58 @@ matrix:
       env:
         - JOBCACHE=7
         - TRAVIS_RUST_VERSION=stable
+
+    - name: Ensure compilation on Redox OS with Redoxer
+      # language: minimal so that it actually uses bionic rather than xenial;
+      # rust isn't yet available on bionic
+      language: minimal
+      dist: bionic
+      if: type = cron
+      cache:
+        cargo: true
+        directories:
+          - $HOME/.redoxer
+          - $HOME/.cargo
+      before_install:
+        # install rust as travis does for language: rust
+        - curl -sSf https://build.travis-ci.org/files/rustup-init.sh | sh -s --
+          --default-toolchain=$TRAVIS_RUST_VERSION -y
+        - export PATH=${TRAVIS_HOME}/.cargo/bin:$PATH
+        - rustc --version
+        - rustup --version
+        - cargo --version
+
+        - sudo apt-get update -qq
+        - sudo apt-get install libfuse-dev
+      install:
+        - if ! command -v redoxer; then cargo install redoxfs redoxer; fi
+        - redoxer install
+      script:
+        - bash redox/uncomment-cargo.sh
+        - redoxer build --verbose
+        - bash redox/comment-cargo.sh
+      before_cache:
+        - |
+          if ! command -v cargo-sweep; then
+            rustup install stable
+            cargo +stable install cargo-sweep
+          fi
+        - cargo sweep -t 15
+        - rm -rf ~/.cargo/registry/src
+      env:
+        - JOBCACHE=10
+        - TRAVIS_RUST_VERSION=nightly
+
+    - name: Run CPython test suite
+      language: rust
+      os: linux
+      rust: stable
+      cache: cargo
+      script:
+        - cargo build --verbose --all
+        - export RUSTPYTHONPATH=`pwd`/Lib
+        - cargo run -- -m test -v
+      env:
+        # Prevention of cache corruption.
+        # See: https://docs.travis-ci.com/user/caching/#caches-and-build-matrices
+        - JOBCACHE=12