Skip to content

Commit d6ba8cd

Browse files
authored
Merge pull request #106 from g-as/feature/flake8_4.0
flake8 4.x compat + github actions
2 parents db179e2 + d6a2e2a commit d6ba8cd

File tree

5 files changed

+50
-83
lines changed

5 files changed

+50
-83
lines changed

.github/workflows/tests.yml

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
name: Tests
2+
3+
on:
4+
push:
5+
branches: [master]
6+
pull_request:
7+
branches: [master]
8+
paths:
9+
- "flake8_isort.py"
10+
- "test_flake8_isort.py"
11+
- "setup.py"
12+
- ".github/workflows/tests.yml"
13+
14+
jobs:
15+
tests:
16+
runs-on: ubuntu-latest
17+
name: Python ${{ matrix.python-version }} x isort ${{ matrix.isort }} x flake8 ${{ matrix.flake8 }}
18+
19+
strategy:
20+
matrix:
21+
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', 'pypy3']
22+
isort: [4.3.21, 5.9.3]
23+
flake8: [3.9.2, 4.0.1]
24+
25+
steps:
26+
- uses: actions/checkout@v2
27+
- uses: actions/setup-python@v2
28+
with:
29+
python-version: ${{ matrix.python-version }}
30+
architecture: x64
31+
- name: Install matrix dependencies
32+
run: pip install 'isort==${{ matrix.isort }}' 'flake8==${{ matrix.flake8 }}'
33+
- name: Install dependencies
34+
run: pip install .[test]
35+
- name: flake8
36+
run: flake8 *.py
37+
- name: pytest
38+
run: pytest -v --cov flake8_isort --cov-report term-missing
39+
- name: Coveralls
40+
uses: coverallsapp/github-action@master
41+
if: ${{ always() }}
42+
with:
43+
github-token: ${{ secrets.GITHUB_TOKEN }}
44+
fail_ci_if_error: true
45+
verbose: true

.travis.yml

-32
This file was deleted.

requirements-cov.in

-3
This file was deleted.

requirements-cov.txt

-39
This file was deleted.

setup.py

+5-9
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ def get_version(file="flake8_isort.py"):
3434
'License :: OSI Approved :: GNU General Public License v2 (GPLv2)',
3535
'Operating System :: OS Independent',
3636
'Programming Language :: Python',
37-
'Programming Language :: Python :: 2',
38-
'Programming Language :: Python :: 2.7',
3937
'Programming Language :: Python :: 3',
40-
'Programming Language :: Python :: 3.5',
38+
'Programming Language :: Python :: 3 :: Only',
4139
'Programming Language :: Python :: 3.6',
4240
'Programming Language :: Python :: 3.7',
4341
'Programming Language :: Python :: 3.8',
42+
'Programming Language :: Python :: 3.9',
43+
'Programming Language :: Python :: 3.10',
4444
'Programming Language :: Python :: Implementation :: CPython',
4545
'Programming Language :: Python :: Implementation :: PyPy',
4646
'Topic :: Software Development',
@@ -53,18 +53,14 @@ def get_version(file="flake8_isort.py"):
5353
license='GPL version 2',
5454
py_modules=['flake8_isort', ],
5555
include_package_data=True,
56-
test_suite='run_tests',
5756
zip_safe=False,
5857
install_requires=[
59-
'flake8 >= 3.2.1, <4',
58+
'flake8 >= 3.2.1, <5',
6059
'isort >= 4.3.5, <6',
6160
'testfixtures >= 6.8.0, <7',
6261
],
6362
extras_require={
64-
'test': [
65-
'pytest >= 4.0.2, <6',
66-
'toml',
67-
],
63+
'test': ['pytest-cov'],
6864
},
6965
entry_points={
7066
'flake8.extension': ['I00 = flake8_isort:Flake8Isort', ],

0 commit comments

Comments
 (0)