Add Python 3.9, PyPy3 and pytest 4.0 and 4.1 to CI build

Author: mrbean-bremen

.travis.yml

@@ -6,15 +6,17 @@ python:
   - "3.6"
   - "3.7"
   - "3.8"
+  - "3.9-dev"
   - "pypy"
+  - "pypy3"
 env:
   global:
     secure: T6vjQsfhlpCwD0dsVZxDbUD5rvqiOz27ex3nwGvVFWnu0ospPbqzw1MqZcjyFvwcLWF+TrJbVf7UxxTM4JHESZTwcSQ1zXhzZ/pRhCKRa7q7fbVkMptEuarUVmnZZAs9GqZecetCA+ka5dSlHEJdIZwyHRmGV8hOx2w/OHRLEJTpSxT7NTkoKTATPxEzseAup1cJ47PGpnLQYXc0H2DgedgUqboU35Rkbya38gptKqFJJ8K3VuCr+j91Pq/rTntMIND3OsBkzPF1PE08tC15G9bBwRi+nER0BZSfxKkmoTLh7yDJhyyzuTDedaZInCziRYCbhQfsCn8QRCyiVeRiCVt1+/2yNt5lJYZwxpQGyYMOA//zlEDu7Z1uYSnkvy4BkI5g22IrjHLcij1lAaJ3lkafINbcUqlwv4sp/xgT8VXCfiDUadvzm+O9rBo6GlVrgWvdV0ExkSWYDu77ruGHZT3XCZ5ZpTf8OtwX71yHs1o5A5lzfPf1DA+fKPiWsu8jOYlStPn5v81ppqYzIz3JiaWgypCDWB7TLWT6iFjfK5hRWNJQn7aVKx5m86Dtu2cxDdBUDhK8fhbIWAQsdyLMcsXEGK1nekxEK8oM28g0hvifQqS1Up+MXmG6xQg8inbvWuZhwE6cnjDyb5CnaI+KAVxtrhVNlYkv8405fe6XumE=
 install:
   - pip install tox
   - pip install python-coveralls
 script:
-  - TOX_PYTHON_VERSION=$(if [ $TRAVIS_PYTHON_VERSION = "pypy" ]; then echo "pypy"; else echo py$TRAVIS_PYTHON_VERSION | tr -d .; fi)
+  - TOX_PYTHON_VERSION=$(if [ $TRAVIS_PYTHON_VERSION = "pypy" ]; then echo  "pypy2"; elif [ $TRAVIS_PYTHON_VERSION = "pypy3" ]; then echo "pypy3"; else echo py$TRAVIS_PYTHON_VERSION | tr -d .; fi)
   - tox -e $(tox -l | grep $TOX_PYTHON_VERSION | paste -sd "," -)
 after_success:
   - coveralls

CHANGELOG.md

@@ -7,6 +7,7 @@
 
 ### Infrastructure
 - added automatic documentation build on change 
+- add Python 3.9, pypy3 and pytest 6.0 and 6.1 to CI builds
 
 ## [Version 0.7.1](https://pypi.org/project/pytest-order/0.7.1/)
 Update after renaming the repository and the package.

build-docs.sh

@@ -6,7 +6,7 @@
 # appears in the commit message.
 
 # only process after the last matrix build
-if [ "$TRAVIS_PYTHON_VERSION" != "pypy" ]; then
+if [ "$TRAVIS_PYTHON_VERSION" != "pypy3" ]; then
   echo "Not on last matrix build, skipping"
   exit 0
 fi

docs/source/index.rst

@@ -28,7 +28,7 @@ Here are examples for which markers correspond to markers in
 
 Supported Python and pytest versions
 ------------------------------------
-pytest-order supports python 2.7, 3.5 - 3.8, and pypy, and is
+pytest-order supports python 2.7, 3.5 - 3.9, and pypy/pypy3, and is
 compatible with pytest 3.6.0 or newer. Note that support for Python 2 will
 be removed in one of the next versions.
 
@@ -47,8 +47,8 @@ The latest master can be installed from the GitHub sources:
 
    pip install git+https://github.com/mrbean-bremen/pytest-order
 
-Overview
---------
+Quickstart
+----------
 Ordinarily pytest will run tests in the order that they appear in a module.
 For example, for the following tests:
 

setup.py

@@ -45,6 +45,8 @@
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
     ],
 )

tests/test_indulgent_ordering.py

@@ -31,9 +31,11 @@ def test_me_first():
     out, err = capsys.readouterr()
     assert "..F" in out
     args.insert(0, "--ff")
-    pytest.main(args, [pytest_order])
-    out, err = capsys.readouterr()
-    assert "..F" in out
+    # pytest 6 seems to have changed the order plugins are executed
+    if int(pytest.__version__[:pytest.__version__.index('.')]) < 6:
+        pytest.main(args, [pytest_order])
+        out, err = capsys.readouterr()
+        assert "..F" in out
     args.insert(0, "--indulgent-ordering")
     pytest.main(args, [pytest_order])
     out, err = capsys.readouterr()

tox.ini

@@ -1,8 +1,8 @@
 # content of: tox.ini, put in same dir as setup.py
 [tox]
 envlist =
-    {py27,py35,py36,py37,py38,pypy}-pytest{36,37,38,39,310,40,41,42,43,44,45,46}
-    {py35,py36,py37,py38}-pytest{50,51,52,53,54}
+    {py27,py35,py36,py37,py38,py39,pypy2,pypy3}-pytest{36,37,38,39,310,40,41,42,43,44,45,46}
+    {py35,py36,py37,py38,py39-dev,pypy3}-pytest{50,51,52,53,54,60,61}
 [testenv]
 deps =
     pytest36: pytest>=3.6,<3.7
@@ -22,6 +22,8 @@ deps =
     pytest52: pytest>=5.2,<5.3
     pytest53: pytest>=5.3,<5.4
     pytest54: pytest>=5.4,<6.0
+    pytest60: pytest>=6.0,<6.1
+    pytest61: pytest>=6.1,<6.2
     pytest{40,41,42}: attrs<19.2
     pytest-cov<2.10