Merge branch 'staging'

Author: flavius-t

.bumpversion.cfg

@@ -1,3 +1,3 @@
 [bumpversion]
 tag_name = "rc/v{new_version}"
-current_version = 1.1.10
+current_version = 1.1.15

.github/workflows/build-and-publish-TestPyPI.yml

@@ -1,7 +1,7 @@
-# This workflow will increment version patch number, and build and publish 
-# the python package to TestPyPI upon push or merge to staging branch
+# This workflow will increment version patch number, cherry pick this new version to dev,
+# and build and publish the package to TestPyPI upon push or merge to staging branch
 
-name: Build and Publish to TestPyPI
+name: Staging Publish
 
 on:
   push:
@@ -13,8 +13,8 @@ on:
       - .bumpversion.cfg
 
 jobs:
-  build-and-publish:
-    name: Build and publish Package to TestPyPI
+  publish:
+    name: Staging Publish
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
@@ -50,3 +50,22 @@ jobs:
       with:
         password: ${{ secrets.TEST_PYPI_API_TOKEN }}
         repository_url: https://test.pypi.org/legacy/
+    - name: Checkout Dev
+      uses: actions/checkout@v3
+      with:
+        ref: dev
+        token: ${{ secrets.ACTIONS_BOT_TOKEN }}
+        fetch-depth: 0
+    - name: Auto Bump Commit SHA
+      run: |
+        echo "bump_commit=$(git log -n 1 origin/staging --pretty=format:'%H')" >> $GITHUB_ENV
+    - name: Cherry Pick
+      env:
+        commit_name: bot-edgepi
+        commit_email: bot@edgepi.com
+      run: |
+        echo ${{ env.bump_commit }}
+        git config user.name ${{ env.commit_name }}
+        git config user.email ${{ env.commit_email }}
+        git cherry-pick ${{ env.bump_commit }}
+        git push origin dev

README.md

@@ -43,12 +43,12 @@ edgepi_adc.stop_conversions(ADCNum.ADC_1)
 For further details on this and other modules, please refer to each module's documentation by following the links provided in the `Implemented Modules` section below.
 # Implemented Modules
 The EdgePi SDK contains modules intended to represent each connected peripheral device onboard the EdgePi. Below is a directory of the currently available modules.
-* [Thermocouple](src/edgepi/tc)
-* [Digital to Analog Converter (DAC)](src/edgepi/dac)
-* [Analog to Digital Converter (ADC)](src/edgepi/adc)
-* [LED Array](src/edgepi/led)
-* [Digital Input (DIN)](src/edgepi/digital_input)
-* [Digital Output (DOUT)](src/edgepi/digital_output)
+* [Thermocouple](https://github.com/EdgePi-Cloud/edgepi-python-sdk/tree/main/src/edgepi/tc)
+* [Digital to Analog Converter (DAC)](https://github.com/EdgePi-Cloud/edgepi-python-sdk/tree/main/src/edgepi/dac)
+* [Analog to Digital Converter (ADC)](https://github.com/EdgePi-Cloud/edgepi-python-sdk/tree/main/src/edgepi/adc)
+* [LED Array](https://github.com/EdgePi-Cloud/edgepi-python-sdk/tree/main/src/edgepi/led)
+* [Digital Input (DIN)](https://github.com/EdgePi-Cloud/edgepi-python-sdk/tree/main/src/edgepi/digital_input)
+* [Digital Output (DOUT)](https://github.com/EdgePi-Cloud/edgepi-python-sdk/tree/main/src/edgepi/digital_output)
 # Development
 Active development SDK versions can be accessed from the following resources:
 ## Installing from TestPyPi

setup.py

@@ -7,7 +7,7 @@
 
 setuptools.setup(
     name="edgepi-python-sdk",
-    version="1.1.10",
+    version="1.1.15",
     author="S.Park",
     author_email="spark@osensa.com",
     description="EdgePi Python SDK package",