Set version to 0.8.0dev

- adapt test to allow "dev" in version
- add note about working with pytest-xdist

Author: mrbean-bremen

CHANGELOG.md

@@ -7,16 +7,16 @@
 
 ### Infrastructure
 - added automatic documentation build on change 
-- add Python 3.9, pypy3 and pytest 6.0 and 6.1 to CI builds
-- use GitHub Actions for builds, add Windows builds
-- add regression test for ``pytest-xdist`` 
+- added Python 3.9, pypy3 and pytest 6.0 and 6.1 to CI builds
+- use GitHub Actions for CI builds to speed them up, added Windows CI builds
+- added regression test for ``pytest-xdist`` 
   (imported from [PR #52](https://github.com/ftobia/pytest-ordering/pull/52))
 
 ## [Version 0.7.1](https://pypi.org/project/pytest-order/0.7.1/)
 Update after renaming the repository and the package.
 
 ### Changes
-- renamed repository and package from ``pytest-orderin2`` to ``pytest-order``
+- renamed repository and package from ``pytest-ordering2`` to ``pytest-order``
 - changed the used marker from ``run`` to ``order``, removed all additional
   markers (see [#38](https://github.com/ftobia/pytest-ordering/issues/38))
 

docs/source/index.rst

@@ -267,8 +267,8 @@ Configuration
 =============
 Currently there is only one option that changes the behavior of the plugin.
 
-``--indulgent-ordering`` and overriding ordering
-------------------------------------------------
+``--indulgent-ordering``
+------------------------
 You may sometimes find that you want to suggest an ordering of tests, while
 allowing it to be overridden for good reason. For example, if you run your test
 suite in parallel and have a number of tests which are particularly slow, it
@@ -284,6 +284,19 @@ pytest-order *before* the sort from ``--failed-first``, allowing the failed
 tests to be sorted to the front (note that in pytest versions from 6.0 on,
 this seems not to be needed anymore, at least in this specific case).
 
+Miscellaneous
+=============
+
+Usage with pytest-xdist
+-----------------------
+The ``pytest-xdist`` plugin schedules tests unordered, and the order
+configured by ``pytest-order`` will normally not be preserved. But
+if we use the ``--dist=loadfile`` option, provided by ``xdist``, all tests
+from one file will be run in the same thread. So, to make the two plugins work
+together, we have to put each group of dependent tests in one file, and call
+pytest with ``--dist=loadfile`` (this is taken from
+`this issue <https://github.com/ftobia/pytest-ordering/issues/36>`__).
+
 
 .. toctree::
    :maxdepth: 2

pytest_order/_version.py

@@ -1 +1 @@
-__version__ = '0.8.0'
+__version__ = '0.8.0dev'

tests/test_misc.py

@@ -9,5 +9,5 @@ def test_version_exists():
 
 
 def test_version_valid():
-    assert re.match(r'[0-9]+\.[0-9]+(\.[0-9]+)?$',
+    assert re.match(r'[0-9]+\.[0-9]+(\.[0-9]+)?(dev)?$',
                     pytest_order.__version__)