From ef375be69f5758d3b0fb0f041ee5a11cff73ceb2 Mon Sep 17 00:00:00 2001 From: AvidCoderr Date: Mon, 9 Oct 2023 10:15:04 -0400 Subject: [PATCH] Revert "Replace flake8 and pycodestyle with ruff (#131)" (#136) This reverts commit 59eb957b26b3a5049a12aad951cd7e140909d0e1. --- .github/workflows/ci.yml | 22 ++++++++++++---------- .github/workflows/dev.yml | 22 ++++++++++++---------- .github/workflows/main.yml | 22 ++++++++++++---------- dev.requirements.txt | 5 +++-- 4 files changed, 39 insertions(+), 32 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0fea74c..56e4097 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python: [3.7, 3.8, 3.9, "3.10", 3.11, pypy3.9] + python: [3.7, 3.8, 3.9, "3.10", 3.11, pypy3.8] steps: - uses: actions/checkout@v3 @@ -22,20 +22,22 @@ jobs: uses: actions/setup-python@v4 with: python-version: ${{ matrix.python }} - cache: 'pip' - check-latest: true - name: Install dependencies run: | python -m pip install --upgrade pip pip install -e . - pip install -r dev.requirements.txt - pip install --upgrade coveralls - - name: Run ruff - run: ruff --exclude=build --format=github - --select="A,B,DJ,E,F,PLC,PLE,PLW,W" - --ignore=F401,F403 --line-length=117 . + pip install coveralls --upgrade + - name: Run flake8 + run: | + pip install flake8 --upgrade + flake8 --exclude=build --ignore=E501,F403,F401,E241,E225,E128 . + - name: Run pycodestyle + run: | + pip install pycodestyle --upgrade + pycodestyle --ignore=E128,E261,E225,E501,W605 slugify test.py setup.py - name: Run test - run: coverage run --source=slugify test.py + run: | + coverage run --source=slugify test.py - name: Coveralls run: coveralls --service=github env: diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 552eac6..73f2f07 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python: [3.7, 3.8, 3.9, "3.10", 3.11, pypy3.9] + python: [3.7, 3.8, 3.9, "3.10", 3.11, pypy3.8] steps: - uses: actions/checkout@v3 @@ -22,20 +22,22 @@ jobs: uses: actions/setup-python@v4 with: python-version: ${{ matrix.python }} - cache: 'pip' - check-latest: true - name: Install dependencies run: | python -m pip install --upgrade pip pip install -e . - pip install -r dev.requirements.txt - pip install --upgrade coveralls - - name: Run ruff - run: ruff --exclude=build --format=github - --select="A,B,DJ,E,F,PLC,PLE,PLW,W" - --ignore=F401,F403 --line-length=117 . + pip install coveralls --upgrade + - name: Run flake8 + run: | + pip install flake8 --upgrade + flake8 --exclude=build --ignore=E501,F403,F401,E241,E225,E128 . + - name: Run pycodestyle + run: | + pip install pycodestyle --upgrade + pycodestyle --ignore=E128,E261,E225,E501,W605 slugify test.py setup.py - name: Run test - run: coverage run --source=slugify test.py + run: | + coverage run --source=slugify test.py - name: Coveralls run: coveralls --service=github env: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e76ef64..a4ae9ad 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python: [3.7, 3.8, 3.9, "3.10", 3.11, pypy3.9] + python: [3.7, 3.8, 3.9, "3.10", 3.11, pypy3.8] steps: - uses: actions/checkout@v3 @@ -21,20 +21,22 @@ jobs: uses: actions/setup-python@v4 with: python-version: ${{ matrix.python }} - cache: 'pip' - check-latest: true - name: Install dependencies run: | python -m pip install --upgrade pip pip install -e . - pip install -r dev.requirements.txt - pip install --upgrade coveralls - - name: Run ruff - run: ruff --exclude=build --format=github - --select="A,B,DJ,E,F,PLC,PLE,PLW,W" - --ignore=F401,F403 --line-length=117 . + pip install coveralls --upgrade + - name: Run flake8 + run: | + pip install flake8 --upgrade + flake8 --exclude=build --ignore=E501,F403,F401,E241,E225,E128 . + - name: Run pycodestyle + run: | + pip install pycodestyle --upgrade + pycodestyle --ignore=E128,E261,E225,E501,W605 slugify test.py setup.py - name: Run test - run: coverage run --source=slugify test.py + run: | + coverage run --source=slugify test.py - name: Coveralls run: coveralls --service=github env: diff --git a/dev.requirements.txt b/dev.requirements.txt index 1f1844b..5f94d7b 100644 --- a/dev.requirements.txt +++ b/dev.requirements.txt @@ -1,2 +1,3 @@ -ruff==0.0.285 -twine==4.0.2 +pycodestyle==2.8.0 +twine==3.4.1 +flake8==4.0.1 \ No newline at end of file