Skip to content

Commit c17335e

Browse files
authored
Merge pull request #6 from reverbc/bugfix/#5-pytest-xdist-compatability
fix #5 not able to work with pytest-xdist + `--dist loadfile`
2 parents 41038ef + 234cfb7 commit c17335e

File tree

5 files changed

+16
-14
lines changed

5 files changed

+16
-14
lines changed

.travis.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,14 @@ language: python
22

33
matrix:
44
include:
5-
- python: 2.7
6-
env: TOX_ENV=py27
7-
- python: 3.5
8-
env: TOX_ENV=py35
95
- python: 3.6
106
env: TOX_ENV=py36
117
- python: 3.7
128
env: TOX_ENV=py37
139
- python: 3.8
1410
env: TOX_ENV=py38
11+
- python: 3.9
12+
env: TOX_ENV=py39
1513

1614
install:
1715
- pip install tox

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
# Changelog
22

33
## [Unreleased]
4+
### Added
5+
- Python 3.9 support
6+
7+
### Removed
8+
- Python 2.7 & 3.5 support
9+
10+
### Fixed
11+
- Fix not able to work with `pytest-xdist` plugin when `--dist loadfile` is set in configuration file (#5)
412

513
## [0.3.0] - 2020-08-10
614
### Added

appveyor.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
# What Python version is installed where:
22
# http://www.appveyor.com/docs/installed-software#python
33

4+
image: Visual Studio 2019
5+
46
environment:
57
matrix:
6-
- PYTHON: "C:\\Python27"
7-
TOX_ENV: "py27"
8-
9-
- PYTHON: "C:\\Python35"
10-
TOX_ENV: "py35"
11-
128
- PYTHON: "C:\\Python36"
139
TOX_ENV: "py36"
1410

@@ -18,6 +14,8 @@ environment:
1814
- PYTHON: "C:\\Python38"
1915
TOX_ENV: "py38"
2016

17+
- PYTHON: "C:\\Python39"
18+
TOX_ENV: "py39"
2119

2220
init:
2321
- "%PYTHON%/python -V"

pylint_pytest/checkers/fixture.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def visit_module(self, node):
7272
# run pytest session with customized plugin to collect fixtures
7373
fixture_collector = FixtureCollector()
7474
pytest.main(
75-
[node.file, '--fixtures'],
75+
[node.file, '--fixtures', '--collect-only'],
7676
plugins=[fixture_collector],
7777
)
7878
FixtureChecker._pytest_fixtures = fixture_collector.fixtures

setup.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,11 @@
3333
'Topic :: Software Development :: Testing',
3434
'Topic :: Software Development :: Quality Assurance',
3535
'Programming Language :: Python',
36-
'Programming Language :: Python :: 2',
37-
'Programming Language :: Python :: 2.7',
3836
'Programming Language :: Python :: 3',
39-
'Programming Language :: Python :: 3.5',
4037
'Programming Language :: Python :: 3.6',
4138
'Programming Language :: Python :: 3.7',
4239
'Programming Language :: Python :: 3.8',
40+
'Programming Language :: Python :: 3.9',
4341
'Programming Language :: Python :: Implementation :: CPython',
4442
'Operating System :: OS Independent',
4543
'License :: OSI Approved :: MIT License',

0 commit comments

Comments
 (0)