Merge master branch

Author: windelbouwman

.travis.yml

@@ -1,26 +1,22 @@
 language: rust
-
-rust:
-  - stable
-  - beta
-  - nightly
-
-script:
-  - cargo build --verbose --all
-  - cargo test --verbose --all
-
-env:
-  # This is used to only capture the regular nightly test in allow_failures
-  - REGULAR_TEST=true
-
+rust: stable
 cache: cargo
 
 matrix:
   fast_finish: true
   include:
+    - name: rust unittests and doctests
+      language: rust
+      rust: stable
+      cache: cargo
+      script:
+        - cargo build --verbose --all
+        - cargo test --verbose --all
+
     # To test the snippets, we use Travis' Python environment (because
     # installing rust ourselves is a lot easier than installing Python)
-    - language: python
+    - name: python test snippets
+      language: python
       python: 3.6
       cache:
         pip: true
@@ -31,21 +27,6 @@ matrix:
           - target
       env:
         - TRAVIS_RUST_VERSION=stable
-        - REGULAR_TEST=false
-        - CODE_COVERAGE=false
-      script: tests/.travis-runner.sh
-    - 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
-      env:
-        - TRAVIS_RUST_VERSION=beta
-        - REGULAR_TEST=false
         - CODE_COVERAGE=false
       script: tests/.travis-runner.sh
     - name: rustfmt
@@ -61,8 +42,6 @@ matrix:
         # creates.)
         - echo > parser/src/python.rs
         - cargo fmt --all -- --check
-      env:
-        - REGULAR_TEST=false
     - name: publish documentation
       language: rust
       rust: stable
@@ -71,11 +50,10 @@ matrix:
         - cargo doc --no-deps --all
       if: branch = release
       env:
-        - REGULAR_TEST=false
         - DEPLOY_DOC=true
     - name: WASM online demo
       language: rust
-      rust: nightly
+      rust: stable
       cache: cargo
       install:
         - nvm install node
@@ -87,7 +65,6 @@ matrix:
         - npm run dist
       if: branch = release
       env:
-        - REGULAR_TEST=false
         - DEPLOY_DEMO=true
     - name: cargo-clippy
       language: rust
@@ -97,8 +74,6 @@ matrix:
         - rustup component add clippy
       script:
         - cargo clippy
-      env:
-        - REGULAR_TEST=true
     - name: Code Coverage
       language: python
       python: 3.6
@@ -111,9 +86,10 @@ matrix:
           - target
       script:
         - tests/.travis-runner.sh
+      # Only do code coverage on master via a cron job.
+      if: branch = master AND type = cron
       env:
         - TRAVIS_RUST_VERSION=nightly
-        - REGULAR_TEST=false
         - CODE_COVERAGE=true
     - name: test WASM
       language: python
@@ -133,11 +109,8 @@ matrix:
       script:
         - wasm/tests/.travis-runner.sh
       env:
-        - REGULAR_TEST=true
         - TRAVIS_RUST_VERSION=stable
   allow_failures:
-    - rust: nightly
-      env: REGULAR_TEST=true
     - name: cargo-clippy
 
 deploy:

Cargo.lock

@@ -1,11 +1,11 @@
 [package]
 name = "rustpython"
 version = "0.0.1"
-authors = ["Windel Bouwman", "Shing Lyu <[email protected]>"]
+authors = ["Windel Bouwman <[email protected]>", "Shing Lyu <[email protected]>"]
 edition = "2018"
 
 [workspace]
-members = [".", "derive", "vm", "wasm/lib", "parser", "compiler"]
+members = [".", "derive", "vm", "wasm/lib", "parser", "compiler", "bytecode"]
 
 [[bench]]
 name = "bench"