Merge pull request #106 from g-as/feature/flake8_4.0

flake8 4.x compat + github actions
gforcada · Oct 14, 2021 · d6ba8cd · d6ba8cd
2 parents db179e2 + d6a2e2a
commit d6ba8cd
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 83 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -0,0 +1,45 @@
+name: Tests
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+    paths:
+      - "flake8_isort.py"
+      - "test_flake8_isort.py"
+      - "setup.py"
+      - ".github/workflows/tests.yml"
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    name: Python ${{ matrix.python-version }} x isort ${{ matrix.isort }} x flake8 ${{ matrix.flake8 }}
+
+    strategy:
+      matrix:
+        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', 'pypy3']
+        isort: [4.3.21, 5.9.3]
+        flake8: [3.9.2, 4.0.1]
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+          architecture: x64
+      - name: Install matrix dependencies
+        run: pip install 'isort==${{ matrix.isort }}' 'flake8==${{ matrix.flake8 }}'
+      - name: Install dependencies
+        run: pip install .[test]
+      - name: flake8
+        run: flake8 *.py
+      - name: pytest
+        run: pytest -v --cov flake8_isort --cov-report term-missing
+      - name: Coveralls
+        uses: coverallsapp/github-action@master
+        if: ${{ always() }}
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          fail_ci_if_error: true
+          verbose: true
diff --git a/.travis.yml b/.travis.yml
diff --git a/requirements-cov.in b/requirements-cov.in
diff --git a/requirements-cov.txt b/requirements-cov.txt
diff --git a/setup.py b/setup.py
@@ -34,13 +34,13 @@ def get_version(file="flake8_isort.py"):
         'License :: OSI Approved :: GNU General Public License v2 (GPLv2)',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3 :: Only',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Software Development',
@@ -53,18 +53,14 @@ def get_version(file="flake8_isort.py"):
     license='GPL version 2',
     py_modules=['flake8_isort', ],
     include_package_data=True,
-    test_suite='run_tests',
     zip_safe=False,
     install_requires=[
-        'flake8 >= 3.2.1, <4',
+        'flake8 >= 3.2.1, <5',
         'isort >= 4.3.5, <6',
         'testfixtures >= 6.8.0, <7',
     ],
     extras_require={
-        'test': [
-            'pytest >= 4.0.2, <6',
-            'toml',
-        ],
+        'test': ['pytest-cov'],
     },
     entry_points={
         'flake8.extension': ['I00 = flake8_isort:Flake8Isort', ],