Merge branch 'develop' into feature/format_float

# Conflicts:
#	vm/src/cformat.rs

Author: ChJR

.github/workflows/ci.yaml

@@ -78,6 +78,8 @@ jobs:
         if: runner.os == 'macOS'
       - name: Cache cargo dependencies
         uses: actions/cache@v2
+        # cache gets corrupted for some reason on mac
+        if: runner.os != 'macOS'
         with:
           path: |
               ~/.cargo/registry
@@ -108,12 +110,20 @@ jobs:
           RUSTPYTHONPATH: ${{ github.workspace }}/Lib
         if: runner.os == 'Linux'
       - name: run cpython tests (macOS lightweight)
-        run: target/release/rustpython -m test -x test_argparse -x test_json -x test_bytes -x test_long -v
+        run:
+          target/release/rustpython -m test -v -x
+            test_argparse test_json test_bytes test_bytearray test_long test_unicode test_array
+            test_asyncgen test_list test_complex test_json test_set test_dis test_calendar
         env:
           RUSTPYTHONPATH: ${{ github.workspace }}/Lib
         if: runner.os == 'macOS'
       - name: run cpython tests (windows partial - fixme)
-        run: target/release/rustpython -m test -x test_argparse -x test_json -x test_bytes -x test_long -x test_pwd -x test_bool -x test_cgi -x test_complex -x test_exception_hierarchy -x test_glob -x test_importlib -x test_iter -x test_list -x test_os -x test_pathlib -x test_py_compile -x test_set -x test_shutil -x test_sys -x test_unicode -x test_unittest -x test_venv -x test_zipimport -v
+        run:
+          target/release/rustpython -m test -v -x
+            test_argparse test_json test_bytes test_long test_pwd test_bool test_cgi test_complex
+            test_exception_hierarchy test_glob test_iter test_list test_os test_pathlib
+            test_py_compile test_set test_shutil test_sys test_unicode test_unittest test_venv
+            test_zipimport test_importlib test_io
         env:
           RUSTPYTHONPATH: ${{ github.workspace }}/Lib
         if: runner.os == 'Windows'

Cargo.lock

@@ -9,7 +9,10 @@ license = "MIT"
 include = ["LICENSE", "Cargo.toml", "src/**/*.rs"]
 
 [workspace]
-members = [".", "derive", "vm", "wasm/lib", "parser", "compiler", "bytecode", "vm/pylib-crate", "common", "jit"]
+members = [
+    ".", "ast", "bytecode", "common", "compiler", "compiler/porcelain",
+    "derive", "jit", "parser", "vm", "vm/pylib-crate", "wasm/lib",
+]
 
 [[bench]]
 name = "bench"
@@ -28,7 +31,7 @@ ssl = ["rustpython-vm/ssl"]
 log = "0.4"
 env_logger = "0.7"
 clap = "2.33"
-rustpython-compiler = { path = "compiler", version = "0.1.1" }
+rustpython-compiler = { path = "compiler/porcelain", version = "0.1.1" }
 rustpython-parser = { path = "parser", version = "0.1.1" }
 rustpython-vm = { path = "vm", version = "0.1.1", default-features = false, features = ["compile-parse"] }
 pylib = { package = "rustpython-pylib", path = "vm/pylib-crate", version = "0.1.0", default-features = false, optional = true }