Switch to CircuitPython and add badges to the README.

This commit is contained in:
Scott Shawcroft 2017-01-06 11:27:28 -08:00
parent 0dec953c03
commit e9a93f23d9
8 changed files with 22 additions and 18 deletions

10
.gitmodules vendored
View file

@ -1,6 +1,6 @@
[submodule "micropython"] [submodule "circuitpython"]
path = micropython path = circuitpython
url = https://github.com/adafruit/micropython url = https://github.com/adafruit/circuitpython
[submodule "libraries/drivers/pca9685"] [submodule "libraries/drivers/pca9685"]
path = libraries/drivers/pca9685 path = libraries/drivers/pca9685
url = git@github.com:adafruit/micropython-adafruit-pca9685.git url = git@github.com:adafruit/micropython-adafruit-pca9685.git
@ -30,10 +30,10 @@
url = git@github.com:adafruit/micropython-adafruit-tcs34725.git url = git@github.com:adafruit/micropython-adafruit-tcs34725.git
[submodule "libraries/register"] [submodule "libraries/register"]
path = libraries/helpers/register path = libraries/helpers/register
url = git@github.com:adafruit/Adafruit_MicroPython_Register.git url = git@github.com:adafruit/Adafruit_CircuitPython_Register.git
[submodule "libraries/bus_device"] [submodule "libraries/bus_device"]
path = libraries/helpers/bus_device path = libraries/helpers/bus_device
url = git@github.com:adafruit/Adafruit_MicroPython_BusDevice.git url = git@github.com:adafruit/Adafruit_CircuitPython_BusDevice.git
[submodule "libraries/drivers/neopixel"] [submodule "libraries/drivers/neopixel"]
path = libraries/drivers/neopixel path = libraries/drivers/neopixel
url = git@github.com:adafruit/Adafruit_MicroPython_NeoPixel.git url = git@github.com:adafruit/Adafruit_MicroPython_NeoPixel.git

View file

@ -1,11 +1,15 @@
# Adafruit's MicroPython Bundle # Adafruit CircuitPython Library Bundle
This repo bundles a bunch of useful MicroPython libraries into an easy to
download zip file. MicroPython boards can ship with the contents of the zip to [![Doc Status](https://readthedocs.org/projects/circuitpython/badge/?version=latest)](https://circuitpython.readthedocs.io/en/latest/docs/drivers.html) [![Gitter](https://badges.gitter.im/adafruit/circuitpython.svg)](https://gitter.im/adafruit/circuitpython?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
This repo bundles a bunch of useful CircuitPython libraries into an easy to
download zip file. CircuitPython boards can ship with the contents of the zip to
make it easy to provide a lot of libraries by default. make it easy to provide a lot of libraries by default.
# Use # Use
To use the bundle download the zip (not source zip) from the latest release, To use the bundle download the zip (not source zip) from the latest release,
unzip it and copy over the subfolders into the root of your MicroPython device. unzip it and copy over the subfolders, such as `lib`, into the root of your
CircuitPython device.
# Development # Development
@ -21,8 +25,8 @@ Determine the best location within `libraries` for the new library and then run:
git submodule add <git url> libraries/<target directory> git submodule add <git url> libraries/<target directory>
The target directory should omit any micropython specific prefixes such as The target directory should omit any MicroPython or CircuitPython specific
`micropython-adafruit` to simplify the listing. prefixes such as `adafruit-micropython` to simplify the listing.
## Building the bundle ## Building the bundle
To build the bundle run `build-bundle.py` it requires Python 3.5+ and will To build the bundle run `build-bundle.py` it requires Python 3.5+ and will

View file

@ -1,2 +1,2 @@
See here for more info: https://github.com/adafruit/micropython-adafruit-bundle See here for more info: https://github.com/adafruit/Adafruit_CircuitPython_Bundle
See VERSIONS.txt for version info. See VERSIONS.txt for version info.

View file

@ -29,7 +29,7 @@ import sys
import subprocess import subprocess
import zipfile import zipfile
os.chdir("micropython/mpy-cross") os.chdir("circuitpython/mpy-cross")
make = subprocess.run(["make"]) make = subprocess.run(["make"])
os.chdir("../../") os.chdir("../../")
@ -37,7 +37,7 @@ if make.returncode != 0:
print("Unable to make mpy-cross.") print("Unable to make mpy-cross.")
sys.exit(1) sys.exit(1)
mpy_cross = "micropython/mpy-cross/mpy-cross" mpy_cross = "circuitpython/mpy-cross/mpy-cross"
if "build" in os.listdir("."): if "build" in os.listdir("."):
print("Deleting existing build.") print("Deleting existing build.")
@ -125,7 +125,7 @@ with open("build/lib/VERSIONS.txt", "w") as f:
else: else:
f.write(repo.decode("utf-8", "strict") + "/releases/tag/" + line.strip().decode("utf-8", "strict") + "\r\n") f.write(repo.decode("utf-8", "strict") + "/releases/tag/" + line.strip().decode("utf-8", "strict") + "\r\n")
zip_filename = 'build/adafruit-micropython-bundle-' + version.decode("utf-8", "strict") + '.zip' zip_filename = 'build/adafruit-circuitpython-bundle-' + version.decode("utf-8", "strict") + '.zip'
def add_file(bundle, src_file, zip_name): def add_file(bundle, src_file, zip_name):
global total_size global total_size

@ -1 +1 @@
Subproject commit f4cd3dd02108e33129e37de480611d6fb38a6d3f Subproject commit 1e939bde9b0bb4bc595019db809296abd3438f9e

View file

@ -1,5 +1,5 @@
#! /bin/bash #! /bin/bash
latest_release=$(curl -s "https://api.github.com/repos/adafruit/micropython-adafruit-bundle/releases/latest") latest_release=$(curl -s "https://api.github.com/repos/adafruit/Adafruit_CircuitPython_Bundle/releases/latest")
download_link=$(echo $latest_release | grep -o "\"browser_download_url\": \"[^\"]*" | cut -d \" -f 4) download_link=$(echo $latest_release | grep -o "\"browser_download_url\": \"[^\"]*" | cut -d \" -f 4)
tag=$(echo $latest_release | grep -o "\"tag_name\": \"[^\"]*" | cut -d \" -f 4) tag=$(echo $latest_release | grep -o "\"tag_name\": \"[^\"]*" | cut -d \" -f 4)
current=$(head -n 1 VERSIONS.txt | tr -d '[:space:]') current=$(head -n 1 VERSIONS.txt | tr -d '[:space:]')

View file

@ -1,6 +1,6 @@
#! /bin/bash #! /bin/bash
cd $(dirname $0) cd $(dirname $0)
latest_release=$(curl -s "https://api.github.com/repos/adafruit/micropython-adafruit-bundle/releases/latest") latest_release=$(curl -s "https://api.github.com/repos/adafruit/Adafruit_CircuitPython_Bundle/releases/latest")
download_link=$(echo $latest_release | grep -o "\"browser_download_url\": \"[^\"]*" | cut -d \" -f 4) download_link=$(echo $latest_release | grep -o "\"browser_download_url\": \"[^\"]*" | cut -d \" -f 4)
tag=$(echo $latest_release | grep -o "\"tag_name\": \"[^\"]*" | cut -d \" -f 4) tag=$(echo $latest_release | grep -o "\"tag_name\": \"[^\"]*" | cut -d \" -f 4)
current=$(head -n 1 VERSIONS.txt | tr -d '[:space:]') current=$(head -n 1 VERSIONS.txt | tr -d '[:space:]')