RustPython · windelbouwman · Jul 28, 2019 · Jul 5, 2019 · Jul 6, 2019 · Jul 6, 2019
diff --git a/.dockerignore b/.dockerignore
@@ -1,2 +1,19 @@
-target
-**/node_modules
+**/target/
+**/*.rs.bk
+**/*.bytecode
+**/__pycache__/*
+**/*.pytest_cache
+.*sw*
+.repl_history.txt
+.vscode
+wasm-pack.log
+.idea/
+tests/snippets/resources
+
+flame-graph.html
+flame.txt
+flamescope.json
+
+**/node_modules/
+wasm/**/dist/
+wasm/lib/pkg/
diff --git a/.gitignore b/.gitignore
@@ -9,4 +9,8 @@ __pycache__
 .vscode
 wasm-pack.log
 .idea/
-tests/snippets/resources
+tests/snippets/resources
+
+flame-graph.html
+flame.txt
+flamescope.json
diff --git a/.travis.yml b/.travis.yml
@@ -1,56 +1,90 @@
-language: rust
-rust: stable
-cache: cargo
+before_cache: |
+  if command -v cargo; then
+    ! command -v cargo-sweep && cargo install cargo-sweep
+    cargo sweep -i
+    cargo sweep -t 15
+  fi
 
 matrix:
   fast_finish: true
   include:
-    - name: rust unittests and doctests
+    - name: Run Rust tests
       language: rust
       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=1
 
     # To test the snippets, we use Travis' Python environment (because
     # installing rust ourselves is a lot easier than installing Python)
-    - name: python test snippets
+    - name: Python test snippets
       language: python
       python: 3.6
       cache:
-        pip: true
-        # Because we're using the Python Travis environment, we can't use
-        # the built-in cargo cacher
-        directories:
-          - /home/travis/.cargo
-          - target
+        - pip
+        - cargo
       env:
+        - JOBCACHE=2
         - TRAVIS_RUST_VERSION=stable
         - CODE_COVERAGE=false
       script: tests/.travis-runner.sh
-    - name: rustfmt
+
+    - name: Check Rust code style with rustfmt
       language: rust
       rust: stable
       cache: cargo
       before_script:
-        - rustup component add rustfmt-preview
+        - rustup component add rustfmt
       script:
-        # Code references the generated python.rs, so put something in
-        # place to make `cargo fmt` happy.  (We use `echo` rather than
-        # `touch` because rustfmt complains about the empty file touch
-        # creates.)
-        - echo > parser/src/python.rs
         - cargo fmt --all -- --check
-    - name: publish documentation
+      env:
+        - JOBCACHE=3
+
+    - name: Lint Rust code with clippy
+      language: rust
+      rust: stable
+      cache: cargo
+      before_script:
+        - rustup component add clippy
+      script:
+        - cargo clippy --all -- -Dwarnings
+      env:
+        - JOBCACHE=8
+
+    - name: Lint Python code with flake8
+      language: python
+      python: 3.6
+      cache: pip
+      env: JOBCACHE=9
+      install: pip install flake8
+      script:
+        flake8 . --count --exclude=./.*,./Lib,./vm/Lib  --select=E9,F63,F7,F82
+        --show-source --statistics
+
+    - name: Publish documentation
       language: rust
       rust: stable
       cache: cargo
       script:
         - cargo doc --no-deps --all
       if: branch = release
       env:
-        - DEPLOY_DOC=true
+        - JOBCACHE=4
+      deploy:
+        - provider: pages
+          repo: RustPython/website
+          target-branch: master
+          local-dir: target/doc
+          skip-cleanup: true
+          # Set in the settings page of your repository, as a secure variable
+          github-token: $WEBSITE_GITHUB_TOKEN
+          keep-history: true
+
     - name: WASM online demo
       language: rust
       rust: stable
@@ -65,42 +99,38 @@ matrix:
         - npm run dist
       if: branch = release
       env:
-        - DEPLOY_DEMO=true
-    - name: cargo-clippy
-      language: rust
-      rust: stable
-      cache: cargo
-      before_script:
-        - rustup component add clippy
-      script:
-        - cargo clippy
+        - 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
+
     - name: Code Coverage
       language: python
       python: 3.6
       cache:
-        pip: true
-        # Because we're using the Python Travis environment, we can't use
-        # the built-in cargo cacher
-        directories:
-          - /home/travis/.cargo
-          - target
+        - pip
+        - cargo
       script:
         - tests/.travis-runner.sh
       # Only do code coverage on master via a cron job.
       if: branch = master AND type = cron
       env:
+        - JOBCACHE=6
         - TRAVIS_RUST_VERSION=nightly
         - CODE_COVERAGE=true
-    - name: test WASM
+
+    - name: Test WASM
       language: python
       python: 3.6
       cache:
-        pip: true
-        # Because we're using the Python Travis environment, we can't use
-        # the built-in cargo cacher
-        directories:
-          - /home/travis/.cargo
-          - target
+        - pip
+        - cargo
       addons:
         firefox: latest
       install:
@@ -109,30 +139,5 @@ matrix:
       script:
         - wasm/tests/.travis-runner.sh
       env:
+        - JOBCACHE=7
         - TRAVIS_RUST_VERSION=stable
-  allow_failures:
-    - name: cargo-clippy
-
-deploy:
-  - provider: pages
-    repo: RustPython/website
-    target-branch: master
-    local-dir: target/doc
-    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
-      condition: $DEPLOY_DOC = true
-  - 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
-      condition: $DEPLOY_DEMO = true