From 1b7e624b3b314e6c750d25ae94031d83647964d3 Mon Sep 17 00:00:00 2001 From: Dheeraj <44266862+dheerajreal@users.noreply.github.com> Date: Tue, 30 Aug 2022 00:46:00 +0530 Subject: [PATCH 1/6] run flake8 on github actions --- .github/workflows/flake8.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/workflows/flake8.yml diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml new file mode 100644 index 0000000..094a51d --- /dev/null +++ b/.github/workflows/flake8.yml @@ -0,0 +1,21 @@ +name: Run flake8 +on: [push] +jobs: + tests: + name: flake8 + runs-on: ubuntu-latest + steps: + - name: Check out source code + uses: actions/checkout@v2 + + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: "3.9" + architecture: "x64" + + - name: Install flake8 + run: pip install flake8 + + - name: run flake8 + run: flake8 . --max-line-length 120 --statistics --count --exclude ".tox,.venv,.env,.git,__pycache__,docs,old,build,dist" From 5bfa8c3d666c22fea54f4ee7f7e4904fd588616b Mon Sep 17 00:00:00 2001 From: Dheeraj <44266862+dheerajreal@users.noreply.github.com> Date: Tue, 30 Aug 2022 00:48:08 +0530 Subject: [PATCH 2/6] run tox on github actions --- .github/workflows/tox.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/tox.yml diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml new file mode 100644 index 0000000..ac93d30 --- /dev/null +++ b/.github/workflows/tox.yml @@ -0,0 +1,25 @@ +name: Run tox +on: [push] +jobs: + tests: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: [3.7, 3.8, 3.9] + steps: + - name: Check out source code + uses: actions/checkout@v2 + + - name: Set up Python version ${{ matrix.python-version }} + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + + - name: Install dependencies + run: | + pip install --upgrade pip wheel setuptools + pip install --upgrade tox tox-py + + - name: Run tox targets for ${{ matrix.python-version }} + run: tox --py current From 66d2c5ee02682d2d44debf070ad42a4760f208c6 Mon Sep 17 00:00:00 2001 From: Dheeraj <44266862+dheerajreal@users.noreply.github.com> Date: Tue, 30 Aug 2022 00:48:29 +0530 Subject: [PATCH 3/6] remove flake8 from tox --- tox.ini | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/tox.ini b/tox.ini index 9570c00..8debea7 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,6 @@ [tox] envlist = - py{37,38,39}-dj{22,30,31,32}-celery{40,41,42,43,44,50,51}, - flake8 + py{37,38,39}-dj{22,30,31,32}-celery{40,41,42,43,44,50,51} skip_missing_interpreters = true [testenv] @@ -18,10 +17,3 @@ deps = celery44: celery>=4.4,<4.5 celery50: celery>=5.0,<5.0.6 celery51: celery>=5.1,<5.2 - -[testenv:flake8] -deps = flake8 -commands = flake8 djcelery_email tests - -[flake8] -max-line-length = 120 From 21fde1774fdf42e4ae003bddf94aeaaf54d66ce4 Mon Sep 17 00:00:00 2001 From: Dheeraj <44266862+dheerajreal@users.noreply.github.com> Date: Tue, 30 Aug 2022 00:58:48 +0530 Subject: [PATCH 4/6] update workflow job names --- .github/workflows/flake8.yml | 2 +- .github/workflows/tox.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml index 094a51d..c6dba82 100644 --- a/.github/workflows/flake8.yml +++ b/.github/workflows/flake8.yml @@ -1,7 +1,7 @@ name: Run flake8 on: [push] jobs: - tests: + flake8-lint: name: flake8 runs-on: ubuntu-latest steps: diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index ac93d30..3f9b43c 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -1,7 +1,7 @@ name: Run tox on: [push] jobs: - tests: + tox-tests: runs-on: ubuntu-latest strategy: fail-fast: false From fcef3b629cd7df36bb926cc2906c0c5dd7da6b6b Mon Sep 17 00:00:00 2001 From: Dheeraj <44266862+dheerajreal@users.noreply.github.com> Date: Tue, 30 Aug 2022 00:59:47 +0530 Subject: [PATCH 5/6] run workflows on push/pull-request to master only --- .github/workflows/flake8.yml | 9 ++++++++- .github/workflows/tox.yml | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml index c6dba82..25ea2e4 100644 --- a/.github/workflows/flake8.yml +++ b/.github/workflows/flake8.yml @@ -1,5 +1,12 @@ name: Run flake8 -on: [push] +on: + push: + branches: + - master + pull_request: + branches: + - master + jobs: flake8-lint: name: flake8 diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index 3f9b43c..56cecd7 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -1,5 +1,12 @@ name: Run tox -on: [push] +on: + push: + branches: + - master + pull_request: + branches: + - master + jobs: tox-tests: runs-on: ubuntu-latest From 1452413f8c4490106b57f41bc43f82b114b6a326 Mon Sep 17 00:00:00 2001 From: Dheeraj <44266862+dheerajreal@users.noreply.github.com> Date: Tue, 30 Aug 2022 01:29:54 +0530 Subject: [PATCH 6/6] enable workflows on main branch --- .github/workflows/flake8.yml | 2 ++ .github/workflows/tox.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml index 25ea2e4..ff1303f 100644 --- a/.github/workflows/flake8.yml +++ b/.github/workflows/flake8.yml @@ -3,9 +3,11 @@ on: push: branches: - master + - main pull_request: branches: - master + - main jobs: flake8-lint: diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index 56cecd7..c1a9827 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -3,9 +3,11 @@ on: push: branches: - master + - main pull_request: branches: - master + - main jobs: tox-tests: