Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
---
language: python
dist: bionic
python:
- "2.7"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can remove python2.7 compatibility. Make sure to update the python_requires marker accordingly in the setup.py.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can make it in #105 (it just needs some small polishing) after merging this one. What do you think?

- "3.5"
- "3.6"
- "3.7"
- "3.8"
- "3.9"

install:
- pip install tox tox-travis
Expand Down
6 changes: 4 additions & 2 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ Changelog
Unreleased
----------

- Drop support for Python 3.4.
- Drop support for pytest < 4.3.
- Add support for Python 3.9.
- Drop support for Python 3.4, 3.5.
- Add support for pytest 6.
- Drop support for pytest < 4.6.


2.0.3
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[tool.black]
line-length = 120
target-version = ['py27', 'py35', 'py36', 'py37', 'py38']
target-version = ['py27', 'py36', 'py37', 'py38']
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
],
install_requires=[
"inflection",
"factory_boy>=2.10.0",
"pytest>=4.3",
"pytest>=4.6",
'funcsigs;python_version<"3.0"',
],
# the following makes a plugin available to py.test
Expand Down
17 changes: 10 additions & 7 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,31 +1,34 @@
[tox]
distshare = {homedir}/.tox/distshare
envlist = py27-pytest{43,44,45,46},
py38-pytest{43,44,45,46,50,51,52,53,54,60,latest},
envlist = py27-pytest46,
py38-pytest{46,50,51,52,53,54,60,61,62,latest,master},
py38-pytestlatest-linters,
py{35,36,37}-pytestlatest
py{36,37,39}-pytestlatest

[testenv]
commands = pytest --junitxml={envlogdir}/junit-{envname}.xml {posargs:tests}
deps =
pytestlatest: pytest
pytestmaster: git+https://github.com/pytest-dev/pytest.git@master
pytest62: pytest~=6.2.0
pytest61: pytest~=6.1.0
pytest60: pytest~=6.0.0
pytest54: pytest~=5.4.0
pytest53: pytest~=5.3.0
pytest52: pytest~=5.2.0
pytest51: pytest~=5.1.0
pytest50: pytest~=5.0.0
pytest46: pytest~=4.6.0
pytest45: pytest~=4.5.0
pytest44: pytest~=4.4.0
pytest43: pytest~=4.3.0

-r{toxinidir}/requirements-testing.txt

[testenv:py38-pytestlatest-linters]
deps = black
commands = black --check --verbose setup.py pytest_factoryboy tests

[testenv:py38-pytestmaster]
# allow failures of tests run for `pytest` installed from `master` branch
ignore_outcome = true

[pytest]
addopts = -vv -l
pep8maxlinelength = 120