From 2b2778aabf9c8e41c6fd0751814374a89941982e Mon Sep 17 00:00:00 2001
From: Tarun Rajavelu <tarun.rajavelu@keysight.com>
Date: Tue, 23 Apr 2024 16:47:11 -0700
Subject: [PATCH 1/3] Added code to handle sos branch being a string as opposed
 to just an int

---
 rbtools/clients/sos.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rbtools/clients/sos.py b/rbtools/clients/sos.py
index 7ce875b3..482425b0 100644
--- a/rbtools/clients/sos.py
+++ b/rbtools/clients/sos.py
@@ -785,7 +785,7 @@ def run_soscmd(self, subcommand, *args, **kwargs):
             self._get_wa_root() or
             os.getcwd()
         )
-
+       # print(f"SUBCOMMAND is {subcommand} and args {args}")
         return execute(['soscmd', subcommand] + list(args),
                        cwd=cwd,
                        **kwargs)
@@ -1711,11 +1711,11 @@ def _diff_file_hunks(
                 # For unmanaged (generally new) files, we want to diff against
                 # an empty temp file. We'll export if it's anything but new.
                 if orig_revision != SOSObjectRevision.UNMANAGED:
-                    assert isinstance(orig_revision, int)
+                  #  assert isinstance(orig_revision, int)
 
                     os.unlink(tmp_orig_filename)
                     self.run_soscmd('exportrev',
-                                    '%s/#/%d' % (filename, orig_revision),
+                                    '%s/#/%s' % (filename, str(orig_revision).strip()),
                                     '-out%s' % tmp_orig_filename)
 
             # Diff the new file against that.

From f1eaad82083a24c58f18077e1ea9cbacf565c6fc Mon Sep 17 00:00:00 2001
From: tarunclio <91100996+tarunclio@users.noreply.github.com>
Date: Tue, 23 Apr 2024 17:03:06 -0700
Subject: [PATCH 2/3] Create python-package.yml

Initial rev of a create package workflow.
---
 .github/workflows/python-package.yml | 39 ++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 .github/workflows/python-package.yml

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
new file mode 100644
index 00000000..c4589313
--- /dev/null
+++ b/.github/workflows/python-package.yml
@@ -0,0 +1,39 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python
+
+name: rbtools
+on:
+  push:
+    branches: [ "master","sos-rev-str" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.9", "3.10", "3.11"]
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v3
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install flake8 pytest
+        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+    - name: Lint with flake8
+      run: |
+        # stop the build if there are Python syntax errors or undefined names
+        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - name: Test with pytest
+      run: |
+        pytest

From b56d84b1e1ef757a2901e0301ee2ea59ddcb8b5b Mon Sep 17 00:00:00 2001
From: tarunclio <91100996+tarunclio@users.noreply.github.com>
Date: Tue, 23 Apr 2024 17:05:11 -0700
Subject: [PATCH 3/3] Update python-package.yml

Remove pytest
---
 .github/workflows/python-package.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index c4589313..690b6b3d 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -34,6 +34,4 @@ jobs:
         flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
         # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
         flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
-    - name: Test with pytest
-      run: |
-        pytest
+