From b9260ec38401e1cc43a35d957096f6bc59311db0 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Wed, 5 Apr 2023 08:54:21 +0200 Subject: [PATCH 1/7] GitHub Action to lint Python code Because Travis CI is no longer free for open source. --- .github/workflows/ruff.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .github/workflows/ruff.yml diff --git a/.github/workflows/ruff.yml b/.github/workflows/ruff.yml new file mode 100644 index 0000000..848d826 --- /dev/null +++ b/.github/workflows/ruff.yml @@ -0,0 +1,14 @@ +# https://beta.ruff.rs +name: ruff +on: + push: + branches: [master] + pull_request: + branches: [master] +jobs: + ruff: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - run: pip install --user ruff + - run: ruff --format=github --ignore=F401 --target-version=py37 . From 0fb176a7245b86281a77027ea0d7c6308b1c695c Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Wed, 5 Apr 2023 09:13:23 +0200 Subject: [PATCH 2/7] Add pytest --- .github/workflows/ruff.yml | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ruff.yml b/.github/workflows/ruff.yml index 848d826..3367d0d 100644 --- a/.github/workflows/ruff.yml +++ b/.github/workflows/ruff.yml @@ -1,5 +1,5 @@ # https://beta.ruff.rs -name: ruff +name: python on: push: branches: [master] @@ -9,6 +9,20 @@ jobs: ruff: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - run: pip install --user ruff - - run: ruff --format=github --ignore=F401 --target-version=py37 . + - uses: actions/checkout@v3 + - run: pip install --user ruff + - run: ruff --format=github --ignore=F401 --target-version=py37 . + pytest: + strategy: + fail-fast: false + matrix: + python-version: ["3.8", "3.9", "3.10", "3.11", "pypy-3.9"] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + # - run: pip install --upgrade pip setuptools wheel + - run: pip install pytest # cov pytest-cov + - run: pytest # --cov=webssh From da68de67fabddc7c50350ca78ced8383cc65f926 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Wed, 5 Apr 2023 09:14:42 +0200 Subject: [PATCH 3/7] Delete .travis.yml --- .travis.yml | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index a053519..0000000 --- a/.travis.yml +++ /dev/null @@ -1,19 +0,0 @@ -dist: xenial -language: python - -python: - - "3.8" - - "3.9" - - "3.10" - - "3.11" - -install: - - pip install -r requirements.txt - - pip install pytest pytest-cov codecov flake8 - -script: - - pytest --cov=webssh - - flake8 - -after_success: - - codecov From b1b904c1e36547ecc8e85bec49a1facfd5e63dfa Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Wed, 5 Apr 2023 09:16:07 +0200 Subject: [PATCH 4/7] Update ruff.yml --- .github/workflows/ruff.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ruff.yml b/.github/workflows/ruff.yml index 3367d0d..e0c9802 100644 --- a/.github/workflows/ruff.yml +++ b/.github/workflows/ruff.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/checkout@v3 - run: pip install --user ruff - - run: ruff --format=github --ignore=F401 --target-version=py37 . + - run: ruff --format=github --ignore=F401 --target-version=py38 . pytest: strategy: fail-fast: false From 8bfbb250a91092c8f895d5554c29a511c5165ea6 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Wed, 5 Apr 2023 09:34:53 +0200 Subject: [PATCH 5/7] Update and rename ruff.yml to python.yml --- .github/workflows/{ruff.yml => python.yml} | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) rename .github/workflows/{ruff.yml => python.yml} (86%) diff --git a/.github/workflows/ruff.yml b/.github/workflows/python.yml similarity index 86% rename from .github/workflows/ruff.yml rename to .github/workflows/python.yml index e0c9802..0b74e3f 100644 --- a/.github/workflows/ruff.yml +++ b/.github/workflows/python.yml @@ -1,10 +1,11 @@ # https://beta.ruff.rs name: python -on: - push: - branches: [master] - pull_request: - branches: [master] +on: [pull_request, push] +#on: +# push: +# branches: [master] +# pull_request: +# branches: [master] jobs: ruff: runs-on: ubuntu-latest From 53a355912525aeaa21617893123c237a898a5045 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Wed, 5 Apr 2023 09:38:01 +0200 Subject: [PATCH 6/7] pip install pytest -r requirements.txt --- .github/workflows/python.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 0b74e3f..bd98091 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -25,5 +25,5 @@ jobs: with: python-version: ${{ matrix.python-version }} # - run: pip install --upgrade pip setuptools wheel - - run: pip install pytest # cov pytest-cov + - run: pip install pytest -r requirements.txt # cov pytest-cov - run: pytest # --cov=webssh From c79d4bad0bdcd2ab6665d87eb184c83be47ed03e Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Wed, 5 Apr 2023 09:46:26 +0200 Subject: [PATCH 7/7] Comment out PyPy for now --- .github/workflows/python.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index bd98091..beeff7f 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -1,11 +1,10 @@ # https://beta.ruff.rs name: python -on: [pull_request, push] -#on: -# push: -# branches: [master] -# pull_request: -# branches: [master] +on: + push: + branches: [master] + pull_request: + branches: [master] jobs: ruff: runs-on: ubuntu-latest @@ -17,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.8", "3.9", "3.10", "3.11", "pypy-3.9"] + python-version: ["3.8", "3.9", "3.10", "3.11"] # , "pypy-3.9"] runs-on: ubuntu-latest steps: - uses: actions/checkout@v3