diff --git a/.travis.yml b/.travis.yml index c40d721..5491b38 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,3 @@ -sudo: false language: python dist: xenial python: diff --git a/AUTHORS.rst b/AUTHORS.rst index 6bc5053..fc06596 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -9,5 +9,6 @@ These people have contributed to `pytest-factoryboy`, in alphabetical order: * `Anatoly Bubenkov `_ * `Daniel Duong `_ * `Daniel Hahler `_ +* `Hugo van Kemenade `_ * `p13773 `_ * `Vasily Kuznetsov `_ diff --git a/CHANGES.rst b/CHANGES.rst index 0645b25..de4cfe5 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,13 @@ Changelog ========= +Unreleased +---------- + +- Drop support for Python 3.4. +- Drop support for pytest < 4.3. + + 2.0.3 ----- diff --git a/setup.py b/setup.py index fff9f6b..8e71a3d 100755 --- a/setup.py +++ b/setup.py @@ -26,6 +26,7 @@ author_email="oleg.pidsadnyi@gmail.com", url="https://github.com/pytest-dev/pytest-factoryboy", version=VERSION, + python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*", classifiers=[ "Development Status :: 6 - Mature", "Intended Audience :: Developers", @@ -38,11 +39,11 @@ "Topic :: Utilities", "Programming Language :: Python :: 2", "Programming Language :: Python :: 3" - ] + [("Programming Language :: Python :: %s" % x) for x in "2.7 3.4 3.5 3.6 3.7".split()], + ] + [("Programming Language :: Python :: %s" % x) for x in "2.7 3.5 3.6 3.7".split()], install_requires=[ "inflection", "factory_boy>=2.10.0", - "pytest>=3.3.2", + "pytest>=4.3", 'funcsigs;python_version<"3.0"', ], # the following makes a plugin available to py.test diff --git a/tox.ini b/tox.ini index 3f13bb6..1520b74 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] distshare = {homedir}/.tox/distshare -envlist = py27-pytest{36,37,38,39,310,4,41,42,43,44,45,46}, - py37-pytest{36,37,38,39,310,4,41,42,43,44,45,46,5,latest}, +envlist = py27-pytest{43,44,45,46}, + py37-pytest{43,44,45,46,5,latest}, py{35,36}-pytestlatest [testenv] @@ -13,14 +13,6 @@ deps = pytest45: pytest~=4.5.0 pytest44: pytest~=4.4.0 pytest43: pytest~=4.3.0 - pytest42: pytest~=4.2.0 - pytest41: pytest~=4.1.0 - pytest4: pytest~=4.0.0 - pytest310: pytest~=3.10.0 - pytest39: pytest~=3.9.0 - pytest38: pytest~=3.8.0 - pytest37: pytest~=3.7.0 - pytest36: pytest~=3.6.0 -r{toxinidir}/requirements-testing.txt