Initial changes after fork

- renamed package to pytest_ordering2
- added blurb about fork in README
- removed link to documentation on ReadTheDocs (to be adapted)

Author: mrbean-bremen

CHANGELOG

@@ -1,10 +1,23 @@
 Unreleased
 ---
+
+Imported version from pytest-ordering, including some PRs (manually merged).
+
 ### Added
-- #50 Add ``--indulgent-ordering`` to request that the sort from
+- PR #37 (imported)
+  Add support for markers like run(before=...), run(after=), run("first") etc.
+- PR #50 (imported)
+  Add ``--indulgent-ordering`` to request that the sort from
   pytest-ordering be run before other plugins.  This allows the built-in
   ``--failed-first`` implementation to override the ordering.
+- PR #68 (imported)
+  Include LICENSE file in distribution
+
+### Infrastructure
+- PR #74 (imported)
+  Add more pytest versions, fix pytest-cov compatibility issue,
+  remove Python 3.4, add Python 3.8
 
 0.6
 ---
-- #44 fix deprecation warnings
+- version imported from pytest-ordering

README.md

@@ -1,9 +1,18 @@
-pytest-ordering
-===============
+pytest-ordering2
+================
+This is a fork of [pytest-ordering](https://github.com/ftobia/pytest-ordering).
+That project is not maintained anymore, and there are several helpful PRs
+waiting for merge. Therefore I decided to create this fork that tries to
+combine the original code with most of the provided PRs.   
+My hope is that the original project will be moved to the pytest
+organization as outlined in 
+[this issue](https://github.com/ftobia/pytest-ordering/issues/32). When this
+happens, this fork will be obsolete. 
 
-pytest plugin to run your tests in a specific order
 
-[![Build Status](https://travis-ci.org/ftobia/pytest-ordering.svg?branch=develop)](https://travis-ci.org/ftobia/pytest-ordering)
+pytest-ordering is a pytest plugin to run your tests in a specific order.
+
+[![Build Status](https://travis-ci.org/mrbean-bremen/pytest-ordering2.svg?branch=master)](https://travis-ci.org/mrbean-bremen/pytest-ordering2)
 
 Have you ever wanted to easily run one of your tests before any others run?
 Or run some tests last? Or run this one test before that other test? Or
@@ -13,7 +22,7 @@ Now you can.
 
 Install with:
 
-    pip install pytest-ordering
+    pip install pytest-ordering2
 
 This defines some pytest markers that you can use in your code.
 
@@ -42,4 +51,3 @@ Yields this output:
 
     =========================== 2 passed in 0.01 seconds ===========================
 
-Check out the docs: http://pytest-ordering.readthedocs.org/

docs/source/conf.py

@@ -57,7 +57,8 @@
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
-exec(open(os.path.join(__here__, '..', '..', 'pytest_ordering', '_version.py')).read())
+exec(open(os.path.join(__here__, '..', '..', 'pytest_ordering2',
+                       '_version.py')).read())
 # The short X.Y version.
 version = __version__
 # The full version, including alpha/beta/rc tags.

pytest_ordering/_version.py

@@ -32,7 +32,7 @@ def pytest_configure(config):
     options"""
 
     provided_by_pytest_ordering = (
-        'Provided by pytest-ordering. '
+        'Provided by pytest-ordering2. '
         'See also: http://pytest-ordering.readthedocs.org/'
     )
 

pytest_ordering/__init__.py renamed to pytest_ordering2/__init__.py

@@ -0,0 +1 @@
+__version__ = '0.7'

pytest_ordering2/_version.py

@@ -5,23 +5,24 @@
 
 __here__ = os.path.abspath(os.path.dirname(__file__))
 
-# define __version__
-# execfile doesn't exist in python 3
-# see: http://stackoverflow.com/questions/6357361/alternative-to-execfile-in-python-3-2
-exec(open(os.path.join(__here__, 'pytest_ordering', '_version.py')).read())
+from pytest_ordering2 import __version__
+
+with open(os.path.join(__here__, 'README.md')) as f:
+    LONG_DESCRIPTION = f.read()
 
 
 setup(
-    name='pytest-ordering',
+    name='pytest-ordering2',
     description='pytest plugin to run your tests in a specific order',
+    long_description=LONG_DESCRIPTION,
     version=__version__,
-    author='Frank Tobia',
-    author_email='frank.tobia@gmail.com',
-    url='https://github.com/ftobia/pytest-ordering',
-    packages=['pytest_ordering'],
-    entry_points = {
+    author='mrbean-bremane',
+    author_email='hansemrbean@googlemail.com',
+    url='https://github.com/mrbean-bremen/pytest-ordering2',
+    packages=['pytest_ordering2'],
+    entry_points={
         'pytest11': [
-            'pytest_ordering = pytest_ordering',
+            'pytest_ordering2 = pytest_ordering2',
         ]
     },
     install_requires=['pytest>=3.6'],

setup.py

@@ -2,7 +2,7 @@
 import re
 
 import pytest
-import pytest_ordering
+import pytest_ordering2
 
 pytest_plugins = ["pytester"]
 
@@ -27,14 +27,14 @@ def test_me_first():
 """
         )
     args = ["--quiet", "--color=no", testname]
-    pytest.main(args, [pytest_ordering])
+    pytest.main(args, [pytest_ordering2])
     out, err = capsys.readouterr()
     assert "..F" in out
     args.insert(0, "--ff")
-    pytest.main(args, [pytest_ordering])
+    pytest.main(args, [pytest_ordering2])
     out, err = capsys.readouterr()
     assert "..F" in out
     args.insert(0, "--indulgent-ordering")
-    pytest.main(args, [pytest_ordering])
+    pytest.main(args, [pytest_ordering2])
     out, err = capsys.readouterr()
     assert "F.." in out

tests/test_indulgent_ordering.py

@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 import re
 
-import pytest_ordering
+import pytest_ordering2
 
 
 def test_version_exists():
-    assert hasattr(pytest_ordering, '__version__')
+    assert hasattr(pytest_ordering2, '__version__')
 
 
 def test_version_valid():
     assert re.match(r'[0-9]+\.[0-9]+(\.[0-9]+)?$',
-                    pytest_ordering.__version__)
+                    pytest_ordering2.__version__)

tests/test_misc.py

@@ -424,4 +424,4 @@ def test_markers_registered(capsys):
     assert '@pytest.mark.run' in out
     assert '@pytest.mark.first' in out
     assert '@pytest.mark.last' in out
-    assert out.count('Provided by pytest-ordering') == 17
+    assert out.count('Provided by pytest-ordering2') == 17