Merge pull request #28 from sommersoft/fix_bundle

Update Bundle Script Arguments To Include Packaged Libraries

.github/workflows/build.yml

@@ -1,46 +0,0 @@
-name: Build CI
-
-on: [pull_request, push]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Dump GitHub context
-      env:
-        GITHUB_CONTEXT: ${{ toJson(github) }}
-      run: echo "$GITHUB_CONTEXT"
-    - name: Translate Repo Name For Build Tools filename_prefix
-      id: repo-name
-      run: |
-        echo ::set-output name=repo-name::$(
-        echo ${{ github.repository }} |
-        awk -F '\/' '{ print tolower($2) }' |
-        tr '_' '-'
-        )
-    - name: Set up Python 3.6
-      uses: actions/setup-python@v1
-      with:
-        python-version: 3.6
-    - name: Versions
-      run: |
-        python3 --version
-    - uses: actions/checkout@v1
-      with:
-        submodules: true
-    - name: Install deps
-      run: |
-        sudo apt-get install -y gettext gawk
-        pip install -r requirements.txt
-    - name: Library version
-      run: git describe --dirty --always --tags
-    - name: Package Folder Prefix For circuitpython-build-tools (Community Bundle Specific)
-      id: pkg-folder
-      run: |
-        echo ::set-output name=prefix::$(
-        ls -RUx |
-        gawk -F '\n' '{ match($1, /(drivers|helpers)\/(.+)\/(.+)\:/, arr) ; if (length(arr[0]) > 0 && match(arr[3], arr[2]) > 0) printf "%s, ", arr[3] }' |
-        gawk '{ trimmed = substr($0, 1, length($0) - 2) ; print "\"" trimmed "\"" }'
-        )
-    - name: Build assets
-      run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location libraries --library_depth 2 --package_folder_prefix ${{ steps.pkg-folder.outputs.prefix }}

.github/workflows/release.yml

@@ -1,57 +0,0 @@
-name: Release Actions
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  upload-release-assets:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Dump GitHub context
-      env:
-        GITHUB_CONTEXT: ${{ toJson(github) }}
-      run: echo "$GITHUB_CONTEXT"
-    - name: Translate Repo Name For Build Tools filename_prefix
-      id: repo-name
-      run: |
-        echo ::set-output name=repo-name::$(
-        echo ${{ github.repository }} |
-        awk -F '\/' '{ print tolower($2) }' |
-        tr '_' '-'
-        )
-    - name: Set up Python 3.6
-      uses: actions/setup-python@v1
-      with:
-        python-version: 3.6
-    - name: Versions
-      run: |
-        python3 --version
-    - uses: actions/checkout@v1
-      with:
-        submodules: true
-    - name: Install deps
-      run: |
-        sudo apt-get install -y gettext gawk
-        pip install -r requirements.txt
-    - name: Package Folder Prefix For circuitpython-build-tools (Community Bundle Specific)
-      id: pkg-folder
-      run: |
-        echo ::set-output name=prefix::$(
-        ls -RUx |
-        gawk -F '\n' '{ match($1, /(drivers|helpers)\/(.+)\/(.+)\:/, arr) ; if (length(arr[0]) > 0 && match(arr[3], arr[2]) > 0) printf "%s, ", arr[3] }' |
-        gawk '{ trimmed = substr($0, 1, length($0) - 2) ; print "\"" trimmed "\"" }'
-        )
-    - name: Build assets
-      run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location libraries --library_depth 2 --package_folder_prefix ${{ steps.pkg-folder.outputs.prefix }}
-    - name: Upload Release Assets
-      # the 'official' actions version does not yet support dynamically
-      # supplying asset names to upload. @csexton's version chosen based on
-      # discussion in the issue below, as its the simplest to implement and
-      # allows for selecting files with a pattern.
-      # https://github.com/actions/upload-release-asset/issues/4
-      #uses: actions/upload-release-asset@v1.0.1
-      uses: csexton/release-asset-action@master
-      with:
-        pattern: "bundles/*"
-        github-token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,3 +1,3 @@
-build/*
+build*
 .env
 bundles

.gitmodules

@@ -58,27 +58,3 @@
 [submodule "libraries/drivers/nrf24l01"]
 	path = libraries/drivers/nrf24l01
 	url = https://github.com/2bndy5/CircuitPython_nRF24L01.git
-[submodule "libraries/drivers/i2cencoderlibv21"]
-	path = libraries/drivers/i2cencoderlibv21
-	url = https://github.com/bwshockley/CircuitPython-i2cEncoderLibV21.git
-[submodule "libraries/drivers/mitutoyo"]
-	path = libraries/drivers/mitutoyo
-	url = https://github.com/vifino/CircuitPython-mitutoyo.git
-[submodule "libraries/helpers/base64"]
-	path = libraries/helpers/base64
-	url = https://github.com/jimbobbennett/CircuitPython_Base64
-[submodule "libraries/helpers/HMAC"]
-	path = libraries/helpers/HMAC
-	url = https://github.com/jimbobbennett/CircuitPython_HMAC
-[submodule "libraries/helpers/parse"]
-	path = libraries/helpers/parse
-	url = https://github.com/jimbobbennett/CircuitPython_Parse
-[submodule "libraries/helpers/AzureCustomVision_Prediction"]
-	path = libraries/helpers/AzureCustomVision_Prediction
-	url = https://github.com/jimbobbennett/CircuitPython_AzureCustomVision_Prediction
-[submodule "libraries/helpers/gamblor21_ahrs"]
-	path = libraries/helpers/gamblor21_ahrs
-	url = https://github.com/gamblor21/Gamblor21_CircuitPython_AHRS.git
-[submodule "libraries/drivers/ltr559"]
-	path = libraries/drivers/ltr559
-	url = https://github.com/pimoroni/Pimoroni_CircuitPython_LTR559.git

.travis.yml

@@ -0,0 +1,23 @@
+# Travis CI configuration for automated bundle generation.
+
+dist: trusty
+sudo: false
+language: python
+python:
+    - "3.6"
+
+cache:
+    pip: true
+
+deploy:
+  provider: releases
+  api_key: $GITHUB_TOKEN
+  file_glob: true
+  file: bundles/*
+  skip_cleanup: true
+  on:
+    tags: true
+
+# Note: if a packaged library is not being included in the bundle, add the folder
+# name to the 'package_folder_prefix' argument list below
+script: circuitpython-build-bundles --filename_prefix circuitpython-community-bundle --library_location libraries --library_depth 2 --package_folder_prefix "barbudor_ina3221, dotstar_featherwing, nonblocking_timer"

libraries/drivers/i2cencoderlibv21

@@ -1 +0,0 @@
-Subproject commit 9288086e3be4cd8f6c31fd7bffd4b3bbc21873bc

libraries/drivers/ltr559

@@ -1 +0,0 @@
-Subproject commit d64993bedda88bcb860bd5d18bbbe3349b1599f4

libraries/drivers/mitutoyo

@@ -1 +0,0 @@
-Subproject commit 1987401cebb0bc3684b2f3cc1f4761a0d4ca2a15

libraries/drivers/nrf24l01

@@ -1 +1 @@
-Subproject commit 853ff724ade6159d5d879e30094d595748ec62de
+Subproject commit 7cba8cc2afc09b89b20fe4e77ea17289b8de0c20

libraries/helpers/AzureCustomVision_Prediction

@@ -1 +0,0 @@
-Subproject commit c38bcb6291c32b523708b50fc05fcfc52276a0fd

libraries/helpers/HMAC

@@ -1 +0,0 @@
-Subproject commit 5dc7973be38405be3f2b0a686f09d9a358924b15

libraries/helpers/base64

@@ -1 +0,0 @@
-Subproject commit ab75a32ab875f90920d6fe37d502c334c777d687

libraries/helpers/gamblor21_ahrs

@@ -1 +0,0 @@
-Subproject commit 2fc8a8c0219c05456543865575642f98bf2a50d6

libraries/helpers/parse

@@ -1 +0,0 @@
-Subproject commit e5c2f0138ab55d66f05832b072e4f6696b51141f

works_in_progress.md

@@ -1,24 +0,0 @@
-# Community Modules: Works In Progress
-
-This is a list of links to CircuitPython modules from the community
-that are not ready to be submitted to the Community Bundle, but that
-the author would like to inform others of the module's existence.
-
-If you've written a CircuitPython driver that you'd like to make
-available but don't feel it's ready for the Community Bundle, feel
-free to add a link to the GitHub repo below. 
-
-If you'd like to see a driver listed below included in the 
-Community Bundle, consider contacting the author to see how you can
-help get the driver ready for the Bundle.
-
-
-## 🚧 Works In Progress
-
-* [https://github.com/maholli/CircuitPython_SX1280](https://github.com/maholli/CircuitPython_SX1280)
-* [https://github.com/maholli/CircuitPython_FDC221x](https://github.com/maholli/CircuitPython_FDC221x)
-* [https://github.com/maholli/CircuitPython_ADS124S08](https://github.com/maholli/CircuitPython_ADS124S08)
-* [https://github.com/maholli/CircuitPython_ADM1176](https://github.com/maholli/CircuitPython_ADM1176)
-* [https://github.com/maholli/CircuitPython_INA226](https://github.com/maholli/CircuitPython_INA226)
-* [https://github.com/maholli/CircuitPython_BQ25883](https://github.com/maholli/CircuitPython_BQ25883)
-* [https://github.com/spacecraft-design-lab-2019/CircuitPython_BMX160](https://github.com/spacecraft-design-lab-2019/CircuitPython_BMX160)