From e810f42ca2bcfeddd00d647d66c8685eea02f394 Mon Sep 17 00:00:00 2001 From: Anish Athalye Date: Sat, 17 Dec 2022 14:10:17 -0500 Subject: [PATCH] Deduplicate format checking This was being checked in both the tox tests and separately in GitHub actions. --- .github/workflows/build.yml | 1 + setup.py | 4 ++-- tox.ini | 24 +----------------------- 3 files changed, 4 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4a58333..9b66364 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,3 +43,4 @@ jobs: steps: - uses: actions/checkout@v3 - uses: psf/black@stable + - uses: isort/isort-action@v1 diff --git a/setup.py b/setup.py index 8b3e592..f0764af 100644 --- a/setup.py +++ b/setup.py @@ -1,8 +1,8 @@ -from setuptools import setup, find_packages +import re from codecs import open # For a consistent encoding from os import path -import re +from setuptools import find_packages, setup here = path.dirname(__file__) diff --git a/tox.ini b/tox.ini index 6bf285a..bf40028 100644 --- a/tox.ini +++ b/tox.ini @@ -7,8 +7,6 @@ envlist = coverage_report py{27, 35, 36, 37}-most_platforms pypy{2, 3}-most_platforms - py39-black - py39-isort skip_missing_interpreters = true @@ -48,26 +46,6 @@ commands = coverage html -[testenv:py39-black] -skip_install = true -skip_build = true -deps = - black - -commands = - black --check dotbot/ tests/ - - -[testenv:py39-isort] -skip_install = true -skip_build = true -deps = - isort - -commands = - isort --check dotbot/ tests/ - - [coverage:run] branch = true parallel = true @@ -84,7 +62,7 @@ directory = htmlcov python = ; Run on all platforms (Linux, Mac, and Windows) 3.8: py38-all_platforms - 3.9: py39-all_platforms, py39-black, py39-isort + 3.9: py39-all_platforms 3.10: py310-all_platforms ; Run on most platforms (Linux and Mac)