From 2ac1bc57868261fefef333a523a712f3bec86861 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sun, 5 Mar 2023 07:16:48 +0100 Subject: [PATCH 1/5] Replace flake8 and pycodestyle with ruff --- .github/workflows/ci.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 56e4097..f75a900 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,12 +29,10 @@ jobs: 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 + pip install --upgrade ruff + ruff --exclude=build --format=github + --select="A,B,DJ,E,F,PLC,PLE,PLW,W" + --ignore=F401,F403 --line-length=117 . - name: Run test run: | coverage run --source=slugify test.py From 3e3308632c15d0a3a4d9097e984bd2597de583de Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Tue, 15 Aug 2023 16:42:01 -0400 Subject: [PATCH 2/5] flake8 --> ruff --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f75a900..d027f6b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,7 @@ jobs: python -m pip install --upgrade pip pip install -e . pip install coveralls --upgrade - - name: Run flake8 + - name: Run ruff run: | pip install --upgrade ruff ruff --exclude=build --format=github From 675cf8eed9666295761222ef5ae1f59c66f533ae Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sat, 19 Aug 2023 14:17:18 -0400 Subject: [PATCH 3/5] dev.requirements.txt: ruff==0.0.285, twine==4.0.2 --- dev.requirements.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dev.requirements.txt b/dev.requirements.txt index 5f94d7b..1f1844b 100644 --- a/dev.requirements.txt +++ b/dev.requirements.txt @@ -1,3 +1,2 @@ -pycodestyle==2.8.0 -twine==3.4.1 -flake8==4.0.1 \ No newline at end of file +ruff==0.0.285 +twine==4.0.2 From 8072541f3062ec1f3e3a22f0b9b1ac0176545afc Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sat, 19 Aug 2023 14:23:57 -0400 Subject: [PATCH 4/5] pip install -t dev.requirements.txt --- .github/workflows/ci.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d027f6b..f7c837e 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.8] + python: [3.7, 3.8, 3.9, "3.10", 3.11, pypy3.9] steps: - uses: actions/checkout@v3 @@ -22,20 +22,20 @@ 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 coveralls --upgrade + pip install -t dev.requirements.txt + pip install --upgrade coveralls - name: Run ruff - run: | - pip install --upgrade ruff - ruff --exclude=build --format=github - --select="A,B,DJ,E,F,PLC,PLE,PLW,W" - --ignore=F401,F403 --line-length=117 . + run: ruff --exclude=build --format=github + --select="A,B,DJ,E,F,PLC,PLE,PLW,W" + --ignore=F401,F403 --line-length=117 . - name: Run test - run: | - coverage run --source=slugify test.py + run: coverage run --source=slugify test.py - name: Coveralls run: coveralls --service=github env: From f44cf16edd7041faa95765b8d68eabf47bdb04a0 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sat, 19 Aug 2023 16:31:07 -0400 Subject: [PATCH 5/5] Ruff --- .github/workflows/ci.yml | 2 +- .github/workflows/dev.yml | 22 ++++++++++------------ .github/workflows/main.yml | 22 ++++++++++------------ 3 files changed, 21 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f7c837e..0fea74c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: run: | python -m pip install --upgrade pip pip install -e . - pip install -t dev.requirements.txt + pip install -r dev.requirements.txt pip install --upgrade coveralls - name: Run ruff run: ruff --exclude=build --format=github diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 73f2f07..552eac6 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.8] + python: [3.7, 3.8, 3.9, "3.10", 3.11, pypy3.9] steps: - uses: actions/checkout@v3 @@ -22,22 +22,20 @@ 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 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 + 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 . - 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 a4ae9ad..e76ef64 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.8] + python: [3.7, 3.8, 3.9, "3.10", 3.11, pypy3.9] steps: - uses: actions/checkout@v3 @@ -21,22 +21,20 @@ 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 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 + 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 . - name: Run test - run: | - coverage run --source=slugify test.py + run: coverage run --source=slugify test.py - name: Coveralls run: coveralls --service=github env: