[pull] master from damies13:master

.github/FUNDING.yml

@@ -1,2 +1,3 @@
+---
 github: [damies13]
 custom: ["https://paypal.me/damies13/5"]

.github/ISSUE_TEMPLATE/bug_report.md

@@ -24,15 +24,15 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
+- OS: [e.g. iOS]
+- Browser [e.g. chrome, safari]
+- Version [e.g. 22]
+
+**Mobile phone (please complete the following information):**
+- Device: [e.g. iPhone6]
+- OS: [e.g. iOS8.1]
+- Browser [e.g. stock browser, safari]
+- Version [e.g. 22]
 
 **Additional context**
 Add any other context about the problem here.

.github/dependabot.yml

@@ -1,3 +1,4 @@
+---
 # To get started with Dependabot version updates, you'll need to specify which
 # package ecosystems to update and where the package manifests are located.
 # Please see the documentation for all configuration options:

.github/linters/.flake8

@@ -0,0 +1,7 @@
+[flake8]
+max-line-length = 120
+ignore =
+	# Tabs
+  W191,
+	# line too long
+  E501

.github/linters/.jscpd.json

@@ -0,0 +1,4 @@
+{
+  "threshold": 30,
+  "reporters": ["console", "markdown"]
+}

.github/linters/.yamllint.yml

@@ -0,0 +1,6 @@
+extends: default
+
+rules:
+  line-length:
+    max: 120
+    level: warning

.github/workflows/Main.yaml

@@ -0,0 +1,40 @@
+---
+name: Package Test Publish
+
+on: push
+
+# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions
+
+jobs:
+  Package_For_PIP:
+    uses: ./.github/workflows/Package.yaml
+
+  # Regression_Tests:
+  #   needs:
+  #     - Package_For_PIP
+  #   uses: ./.github/workflows/Regression_Tests.yaml
+
+  Regression_Tests_Agent:
+    needs:
+      - Package_For_PIP
+    uses: ./.github/workflows/Regression_Tests_Agent.yaml
+
+  Regression_Tests_Manager:
+    needs:
+      - Package_For_PIP
+    uses: ./.github/workflows/Regression_Tests_Manager.yaml
+
+  Regression_Tests_Reporter:
+    needs:
+      - Package_For_PIP
+    uses: ./.github/workflows/Regression_Tests_Reporter.yaml
+
+  Publish_Package:
+    if: github.repository_owner == 'damies13'
+    needs:
+    - Package_For_PIP
+    # - Regression_Tests
+    - Regression_Tests_Agent
+    - Regression_Tests_Manager
+    - Regression_Tests_Reporter
+    uses: ./.github/workflows/Publish.yaml

.github/workflows/Package.yaml

@@ -0,0 +1,180 @@
+---
+name: Package
+
+on: workflow_call
+
+jobs:
+  Package_For_PIP:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-python@v5
+        with:
+          python-version: 3.x
+      - name: Apt Update
+        run: |
+          sudo apt update -y
+      - name: PIP Install
+        run: pip install --upgrade build setuptools twine wheel
+      - name: Get Branch Name
+        run: |
+          branchname=$(git rev-parse --abbrev-ref HEAD)
+          echo "branchname=$branchname" >> "$GITHUB_ENV"
+      - name: Get Current Release Tag
+        run: |
+          currrelease=$(git describe --abbrev=0 --tags)
+          echo "currrelease=$currrelease" >> "$GITHUB_ENV"
+      - name: Determine if this is a release branch
+        run: |
+          isrelease=0
+          if [[ $branchname =~ v[0-9]\. ]]; then
+            isrelease=1
+          fi
+          echo "isrelease=$isrelease" >> "$GITHUB_ENV"
+      - name: Determine if this is master branch
+        run: |
+          ismaster=0
+          if [[ $branchname == master ]]; then
+            ismaster=1
+          fi
+          echo "ismaster=$ismaster" >> "$GITHUB_ENV"
+
+      - name: Check Branch for Issue Number with Milestone
+        # if: ${{ env.isrelease == 1 }}
+        shell: python
+        # https://api.github.com/repos/damies13/rfswarm/milestones
+        run: |
+          import os
+          import re
+          import requests
+          branchname = os.getenv("branchname")
+          milestonever="NotSet"
+          ismilestone=0
+          print('branchname	:', branchname)
+          m = re.search("#(\d*)", branchname)
+          if m is not None:
+            issueno = m[1]
+            print('issueno		:', issueno)
+            issueresp = requests.get("https://api.github.com/repos/damies13/rfswarm/issues/{}".format(issueno))
+            issuedata = issueresp.json()
+            # print('issuedata', issuedata)
+            if 'milestone' in issuedata:
+              milestone = issuedata['milestone']
+              if 'title' in milestone:
+                milestonever = milestone['title']
+                print('milestonever	:', milestonever)
+                ismilestone=1
+          env_file = os.getenv('GITHUB_ENV')
+          with open(env_file, "a") as myfile:
+            myfile.write("milestone={}\n".format(milestonever))
+            myfile.write("ismilestone={}\n".format(ismilestone))
+
+      - name: Get Date String
+        if: ${{ env.isrelease == 0 && env.ismaster == 0 }}
+        run: |
+          datestr=$(date +%Y%m%d%H%M%S)
+          echo "datestr=$datestr" >> "$GITHUB_ENV"
+
+      - name: Set Version Number to Branch Name
+        if: ${{ env.isrelease == 1 }}
+        run: |
+          numver=$(echo "$branchname" | sed -E 's/v([^-]*)/\1/')
+          echo "numver=$numver" >> "$GITHUB_ENV"
+          version=v$numver
+          echo "version=$version" >> "$GITHUB_ENV"
+      - name: Set Version Number to Milestone Name
+        if: ${{ env.ismilestone == 1 }}
+        run: |
+          numver=$(echo "$milestone" | sed -E 's/v([^-]*)/\1/')
+          numver=$numver.dev$datestr
+          echo "numver=$numver" >> "$GITHUB_ENV"
+          version=v$numver
+          echo "version=$version" >> "$GITHUB_ENV"
+      - name: Set New Version Number
+        if: ${{ env.isrelease == 0 && env.ismilestone == 0 }}
+        run: |
+          numver=$(echo "$currrelease" | sed -E 's/v([^-]*)/\1/')
+          mapfile -d . -t numverparts < <(echo "$numver")
+          len=${#numverparts[@]}
+          if [ "$len" -gt "2" ]; then
+            numver=${numverparts[0]}.${numverparts[1]}.$(( numverparts[2] + 1))
+          elif [ "$len" -eq "2" ]; then
+            numver=${numverparts[0]}.${numverparts[1]}.1
+          else
+            numver=${numverparts[0]}.0.1
+          fi
+          numver=$numver.dev$datestr
+          echo "numver=$numver" >> "$GITHUB_ENV"
+          version=v$numver
+          echo "version=$version" >> "$GITHUB_ENV"
+      - name: "Echo Vars 2"
+        run: |
+          echo numver: ${{ env.numver }}
+          echo version: ${{ env.version }}
+
+      - name: Update Version Number in python files
+        run: |
+          pwd
+          ls -la
+          # echo "get files"
+          files=$(find . -name 'rfswarm*.py')
+          for file in $files
+          do
+            # echo "version variable : $file"
+            sed -i -e "s/version = \"[^\"]*\"/version = \"${numver}\"/" "$file"
+            sed -i -e "s/version=\"[^\"]*\"/version = \"${numver}\"/" "$file"
+            # echo "version comment : $file"
+            sed -i -e "s/#    Version .*/#    Version ${numver}/" "$file"
+          done
+          files=$(find . -name 'setup-*.py')
+          for file in $files
+          do
+            # echo "version variable : $file"
+            sed -i -e "s/version = \"[^\"]*\"/version=\"${numver}\"/" "$file"
+            sed -i -e "s/version=\"[^\"]*\"/version=\"${numver}\"/" "$file"
+            # echo "version comment : $file"
+            # sed -i -e "s/#    Version .*/#    Version ${numver}/" "$file"
+          done
+          # echo "--------------- head rfswarm_agent.py ---------------"
+          # head -50  rfswarm_agent/rfswarm_agent.py
+          echo "--------------- head setup-manager.py ---------------"
+          head -10  setup-manager.py
+          echo "--------------- end head setup-manager.py ---------------"
+
+      - name: Clear Dist
+        run: |
+          rm -fR dist/
+      - name: Clear Build for Manager
+        run: |
+          rm -fR build/
+      - name: Build Manager
+        run: |
+          python3 setup-manager.py sdist bdist_wheel
+      - name: Clear Build for Agent
+        run: |
+          rm -fR build/
+      - name: Build Agent
+        run: |
+          python3 setup-agent.py sdist bdist_wheel
+      - name: Clear Build for Reporter
+        run: |
+          rm -fR build/
+      - name: Build Reporter
+        run: |
+          python3 setup-reporter.py sdist bdist_wheel
+      - name: Show Dist
+        run: |
+          ls -la dist
+
+      - name: Archive pip packages in dist
+        uses: actions/upload-artifact@v4
+        # https://docs.github.com/en/actions/using-workflows/storing-workflow-data-as-artifacts#passing-data-between-jobs-in-a-workflow
+        with:
+          name: dist
+          path: dist
+          retention-days: 5
+
+#

.github/workflows/Publish.yaml

@@ -0,0 +1,103 @@
+---
+name: Publish
+
+on: workflow_call
+
+jobs:
+  Publish_PIP:
+    runs-on: ubuntu-latest
+    # permissions:
+    #   id-token: write  # IMPORTANT: this permission is mandatory for trusted publishing
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Get Branch Name
+        run: |
+          branchname=$(git rev-parse --abbrev-ref HEAD)
+          echo "branchname=$branchname" >> "$GITHUB_ENV"
+      - name: Determine if this is a release branch
+        run: |
+          isrelease=0
+          if [[ $branchname =~ v[0-9]\. ]]; then
+            isrelease=1
+          fi
+          echo "isrelease=$isrelease" >> "$GITHUB_ENV"
+      - name: Check Milestone
+        if: ${{ env.isrelease == 1 }}
+        shell: python
+        # https://api.github.com/repos/damies13/rfswarm/milestones
+        run: |
+          import os
+          import requests
+          branchname = os.getenv("branchname")
+          print("branchname:", branchname)
+          milestones = requests.get('https://api.github.com/repos/damies13/rfswarm/milestones')
+          dopublish = 0
+          for ms in milestones.json():
+            print(ms['title'])
+            if ms['title'] == branchname:
+              print(ms)
+              open_issues = ms['open_issues']
+              closed_issues = ms['closed_issues']
+              total_issues = open_issues + closed_issues
+              print('open', open_issues, 'closed', closed_issues, 'total', total_issues)
+              pct = (closed_issues/total_issues) * 100
+              print(pct, "%")
+              if pct == 100:
+                dopublish = 1
+          print('dopublish', dopublish)
+          env_file = os.getenv('GITHUB_ENV')
+          with open(env_file, "a") as myfile:
+            myfile.write("dopublish={}\n".format(dopublish))
+
+      - name: Echo Vars
+        run: |
+          echo branchname: ${{ env.branchname }}
+          echo isrelease: ${{ env.isrelease }}
+          echo dopublish : ${{ env.dopublish }}
+      - name: Apt Update
+        if: ${{ env.dopublish == 1 }}
+        run: |
+          sudo apt update -y
+      - name: Setup Python
+        if: ${{ env.dopublish == 1 }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.x
+      - name: PIP Install
+        if: ${{ env.dopublish == 1 }}
+        run: pip install --upgrade build setuptools twine wheel
+      - name: Download packages to dist
+        if: ${{ env.dopublish == 1 }}
+        uses: actions/download-artifact@v4
+        with:
+          name: dist
+          path: dist
+      - name: Show Dist UM
+        if: ${{ env.dopublish == 1 && matrix.platform != 'windows-latest' }}
+        run: |
+          ls -la dist
+      - name: Show Dist W
+        if: ${{ env.dopublish == 1 && matrix.platform == 'windows-latest' }}
+        run: |
+          dir dist
+
+      - name: Dump GitHub context
+        env:
+          GITHUB_CONTEXT: ${{ toJson(github) }}
+        run: echo "$GITHUB_CONTEXT"
+
+      # Still need to have a check all the milestones are complete
+      - name: Do Publish
+        if: ${{ env.dopublish == 1 }}
+        # https://github.com/pypa/gh-action-pypi-publish?tab=readme-ov-file#specifying-a-different-username
+        # uses: pypa/gh-action-pypi-publish@release/v1
+        # with:
+        #   verbose: true
+        #   password: ${{ secrets.PYPI_TOKEN }}
+        env:
+          # PYPI_USER: ${{ secrets.PYPI_TOKENU }}
+          PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
+        run: |
+          echo ${#PYPI_TOKEN}
+          echo python3 -m twine upload -u __token__ -p ${{ secrets.PYPI_TOKEN }} --verbose dist/rfswarm*