diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml new file mode 100644 index 00000000..690b6b3d --- /dev/null +++ b/.github/workflows/python-package.yml @@ -0,0 +1,37 @@ +# 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 + 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.