Merge branch 'dev' into staging

Author: josiah-tesfu

.github/workflows/build-publish-pypi.yml

@@ -1,6 +1,3 @@
-# This workflow will build and publish the package to PyPI upon push or merge to main branch
-# and then create a GitHub release based on latest release tag
-
 name: Build and Release
 
 on:

.github/workflows/create-release-tag.yml

@@ -0,0 +1,28 @@
+name: Create Release Tag
+
+on:
+  push:
+    branches:
+      - 'main'
+
+jobs:
+  build-and-publish:
+    name: Create Release Tag
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+      with:
+          token: ${{ secrets.ACTIONS_BOT_TOKEN }}
+    - name: Get Current Version
+      run: echo -n "current_version=$(grep "version" setup.cfg | cut -d '=' -f2 | tr -d ' \t\n\r')" >> $GITHUB_ENV
+    - name: Create Release Tag
+      env:
+        commit_name: bot-edgepi
+        commit_email: [email protected]
+        username: bot-edgepi
+      run: |
+        git config user.name ${{ env.commit_name }}
+        git config user.email ${{ env.commit_email }}
+        git tag -a release/v${{ env.current_version }} -m "tag release version ${{ env.current_version }}"
+        git push origin release/v${{ env.current_version }}

.github/workflows/python-integration-test.yml

@@ -1,8 +1,9 @@
-# name: Python Integration Test
+name: Python Integration Test
 
-# on:
-#   push:
-#     branches:
+on:
+  push:
+    branches:
+        - todo # enable this workflow once the issue with installing the server is resolved
 #       - dev
 #       - staging
 #       - main
@@ -16,33 +17,33 @@
 #     paths-ignore:
 #       - version
 
-# jobs:
-#   test:
-#     name: Integration Tests
-#     runs-on: ubuntu-latest
-#     strategy:
-#       fail-fast: false
-#       matrix:
-#         python-version: ["3.9"]
+jobs:
+  test:
+    name: Integration Tests
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.9"]
 
-#     steps:
-#       - name: Checkout
-#         if: ${{ github.event_name  == 'pull_request'}}
-#         uses: actions/checkout@v3
-#         with:
-#           ref: ${{ github.head_ref }}
-#       - name: Checkout
-#         if: ${{ github.event_name  == 'push'}}
-#         uses: actions/checkout@v3
-#         with:
-#           ref: ${{ github.ref_name }}
-#       - name: Install Dependencies
-#         run: |
-#           python -m pip install --upgrade pip
-#           python -m venv venv_test
-#           source venv_test/bin/activate
-#           python -m pip install -r requirements_test.txt
-#       - name: Test with pytest
-#         run: |
-#           source venv_test/bin/activate
-#           pytest ./tests/integration -vvs
+    steps:
+      - name: Checkout
+        if: ${{ github.event_name  == 'pull_request'}}
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.head_ref }}
+      - name: Checkout
+        if: ${{ github.event_name  == 'push'}}
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.ref_name }}
+      - name: Install Dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -m venv venv_test
+          source venv_test/bin/activate
+          python -m pip install -r requirements_test.txt
+      - name: Test with pytest
+        run: |
+          source venv_test/bin/activate
+          pytest ./tests/integration -vvs

client_services/__init__.py edgepi_rpc_client/__init__.pyclient_services/__init__.py renamed to edgepi_rpc_client/__init__.py

@@ -7,7 +7,7 @@
 from util.helpers import (
     filter_arg_values, create_config_request_from_args, get_server_response
 )
-from client_services.adc.adc_pb_enums import (
+from edgepi_rpc_client.adc.adc_pb_enums import (
     AnalogIn, ConvMode, ADC1DataRate, ADC2DataRate, FilterMode, ADCNum, DiffMode
 )
 

client_services/adc/__init__.py edgepi_rpc_client/adc/__init__.pyclient_services/adc/__init__.py renamed to edgepi_rpc_client/adc/__init__.py

@@ -4,7 +4,7 @@
 """
 from edgepirpc.protos import dac_pb2 as dac_pb
 from client_rpc_channel.client_rpc_channel import ClientRpcChannel
-from client_services.dac.dac_pb_enums import DACChannel
+from edgepi_rpc_client.dac.dac_pb_enums import DACChannel
 from util.helpers import get_server_response
 
 # pylint: disable=no-member