Merge pull request #19 from adafruit/tannewt-patch-4

Remove 2.x and add 4.x

Author: kattni

circuitpython_build_tools/build.py

@@ -74,8 +74,12 @@ def mpy_cross(mpy_cross_filename, circuitpython_tag, quiet=False):
             sys.exit(clone.returncode)
 
     current_dir = os.getcwd()
-    os.chdir("build_deps/circuitpython/mpy-cross")
-    make = subprocess.run("git fetch && git checkout {TAG} && git submodule update && make clean && make".format(TAG=circuitpython_tag), shell=True)
+    os.chdir("build_deps/circuitpython")
+    make = subprocess.run("git fetch && git checkout {TAG} && git submodule update".format(TAG=circuitpython_tag), shell=True)
+    os.chdir("tools")
+    make = subprocess.run("git submodule update --init .", shell=True)
+    os.chdir("../mpy-cross")
+    make = subprocess.run("make clean && make", shell=True)
     os.chdir(current_dir)
 
     shutil.copy("build_deps/circuitpython/mpy-cross/mpy-cross", mpy_cross_filename)

circuitpython_build_tools/target_versions.py

@@ -25,6 +25,6 @@
 # The tag specifies which version of CircuitPython to use for mpy-cross.
 # The name is used when constructing the zip file names.
 VERSIONS = [
-    {"tag": "2.3.1", "name": "2.x"},
     {"tag": "3.0.0", "name": "3.x"},
+    {"tag": "4.0.0-alpha.2", "name": "4.x"},
 ]