Rework so we can package it on pip.

Author: tannewt

.gitignore

@@ -1,2 +1,7 @@
 __pycache__
 *.zip
+MANIFEST
+build_deps
+dist
+*.egg-info
+circuitpython_build_tools/data/

.travis.yml

@@ -0,0 +1,8 @@
+sudo: false
+dist: trusty
+language: c
+compiler:
+  - gcc
+
+script:
+  - python3 -m scripts.build_mpy_cross circuitpython_build_tools/data/

README.md

@@ -4,4 +4,7 @@
 
 This repo contains build scripts used to build the
 [Adafruit CircuitPython bundle](https://github.com/adafruit/Adafruit_CircuitPython_Bundle), [CircuitPython Community bundle](https://github.com/adafruit/CircuitPython_Community_Bundle)
-and individual library release zips.
+and individual library release zips on Travis CI.
+
+The pip package includes mpy-crosses that run on Travis. They will likely not
+work in other environments.

circuitpython_build_tools.py circuitpython_build_tools/build.pycircuitpython_build_tools.py renamed to circuitpython_build_tools/build.py

@@ -30,7 +30,7 @@
 
 IGNORE_PY = ["setup.py", "conf.py", "__init__.py"]
 
-def build_mpy_cross(mpy_cross_filename, circuitpython_tag, quiet=False):
+def mpy_cross(mpy_cross_filename, circuitpython_tag, quiet=False):
     if not quiet:
         title = "Building mpy-cross for circuitpython " + circuitpython_tag
         print()
@@ -54,7 +54,7 @@ def build_mpy_cross(mpy_cross_filename, circuitpython_tag, quiet=False):
         sys.exit(make.returncode)
 
 
-def build_library(library_path, output_directory, mpy_cross=None):
+def library(library_path, output_directory, mpy_cross=None):
     py_files = []
     package_files = []
     total_size = 512

scripts/target_versions.py …uitpython_build_tools/target_versions.pyscripts/target_versions.py renamed to circuitpython_build_tools/target_versions.py scripts/target_versions.py renamed to circuitpython_build_tools/target_versions.py

@@ -2,7 +2,7 @@
 
 # The MIT License (MIT)
 #
-# Copyright (c) 2016 Scott Shawcroft for Adafruit Industries
+# Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -22,9 +22,15 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-import circuitpython_build_tools
+from circuitpython_build_tools import build
+from circuitpython_build_tools import target_versions
+
+import os
+import sys
 
 if __name__ == "__main__":
-    output_filename = sys.argv[1]
-    circuitpython_tag = sys.argv[2]
-    circuitpython_build_tools.build_mpy_cross(output_filename, circuipython_tag)
+    output_directory = sys.argv[1]
+    os.makedirs(output_directory, exist_ok=True)
+    for version in target_versions.VERSIONS:
+        mpy_cross = output_directory + "/mpy-cross-" + version["name"]
+        build.mpy_cross(mpy_cross, version["tag"])

scripts/build_mpy_cross.py

@@ -30,7 +30,7 @@
 import subprocess
 import zipfile
 
-import circuitpython_build_tools
+from circuitpython_build_tools import build
 
 
 def add_file(bundle, src_file, zip_name):
@@ -59,9 +59,7 @@ def build_bundle(lib_location, bundle_version, output_filename,
         for library in os.listdir(os.path.join("libraries", subdirectory)):
             library_path = os.path.join("libraries", subdirectory, library)
 
-            circuitpython_build_tools.build_library(library_path,
-                                                    build_lib_dir,
-                                                    mpy_cross=mpy_cross)
+            build.library(library_path, build_lib_dir, mpy_cross=mpy_cross)
 
     with open(os.path.join(build_lib_dir, "VERSIONS.txt"), "w") as f:
         f.write(bundle_version + "\r\n")
@@ -97,15 +95,12 @@ def build_bundle(lib_location, bundle_version, output_filename,
 
 
 if __name__ == "__main__":
-    from scripts import target_versions
-
-    tagged = input("Did you tag this release already ([y]/n)? ")
-    if tagged and tagged.lower() != 'y':
-        print("Go ahead and tag. I'll wait.")
-        sys.exit(3)
+    from circuitpython_build_tools import target_versions
+    from pkg_resources import resource_filename
 
     bundle_lib_location = os.path.abspath(sys.argv[1])
     output_dir = os.path.abspath(sys.argv[2])
+    os.makedirs(output_dir, exist_ok=True)
     os.chdir(bundle_lib_location)
 
     bundle_version = None
@@ -123,8 +118,7 @@ def build_bundle(lib_location, bundle_version, output_filename,
     build_bundle(bundle_lib_location, bundle_version, zip_filename)
     os.makedirs("build_deps", exist_ok=True)
     for version in target_versions.VERSIONS:
-        mpy_cross = "build_deps/mpy-cross-" + version["name"]
-        circuitpython_build_tools.build_mpy_cross(mpy_cross, version["tag"])
+        mpy_cross = resource_filename(target_versions.__name__, "data/mpy-cross-" + version["name"])
         zip_filename = os.path.join(output_dir,
             'adafruit-circuitpython-bundle-{TAG}-{VERSION}.zip'.format(
                 TAG=version["name"],

scripts/build_bundles.py scripts/circuitpython-build-bundlesscripts/build_bundles.py renamed to scripts/circuitpython-build-bundles

@@ -30,7 +30,7 @@
 import subprocess
 import zipfile
 
-import circuitpython_build_tools
+from circuitpython_build_tools import build
 
 
 def add_file(bundle, src_file, zip_name):
@@ -59,9 +59,7 @@ def build_bundle(lib_location, bundle_version, output_filename,
         for library in os.listdir(os.path.join("libraries", subdirectory)):
             library_path = os.path.join("libraries", subdirectory, library)
 
-            circuitpython_build_tools.build_library(library_path,
-                                                    build_lib_dir,
-                                                    mpy_cross=mpy_cross)
+            build.library(library_path, build_lib_dir, mpy_cross=mpy_cross)
 
     with open(os.path.join(build_lib_dir, "VERSIONS.txt"), "w") as f:
         f.write(bundle_version + "\r\n")
@@ -97,11 +95,6 @@ def build_bundle(lib_location, bundle_version, output_filename,
 
 
 if __name__ == "__main__":
-    tagged = input("Did you tag this release already ([y]/n)? ")
-    if tagged and tagged.lower() != 'y':
-        print("Go ahead and tag. I'll wait.")
-        sys.exit(3)
-
     version = None
     tag = subprocess.run('git describe --tags --exact-match', shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     if tag.returncode == 0:

scripts/build_library.py scripts/circuitpython-build-libraryscripts/build_library.py renamed to scripts/circuitpython-build-library

@@ -0,0 +1,18 @@
+#!/usr/bin/env python
+
+from distutils.core import setup
+
+setup(name='circuitpython-travis-build-tools',
+      version='0.0.1',
+      description='CircuitPython library build tools for Travis CI',
+      author='Scott Shawcroft',
+      author_email='scott@adafruit.com',
+      url='https://www.adafruit.com/',
+      packages=['circuitpython_build_tools'],
+      package_data={'circuitpython_build_tools': ['data/mpy-cross-*']},
+      scripts=["scripts/circuitpython-build-bundles",
+               "scripts/circuitpython-build-library"],
+      zip_safe=False,
+      python_requires='>=3.4',
+      install_requires=['']
+      )