Rename pytest-ordering2 to pytest-order

- makes it consistent with the "order" marker, and more convenient
- repository is also renamed

Author: mrbean-bremen

CHANGELOG.md

@@ -1,10 +1,11 @@
-# pytest-ordering2 Release Notes
+# pytest-order Release Notes
 
 ## Unreleased
 
 ### Changes
 - changed the used marker from ``run`` to ``order``, removed all additional
   markers (see [#38](https://github.com/ftobia/pytest-ordering/issues/38))
+- renamed repository and package from ``pytest-orderin2`` to ``pytest-order``
 
 ## [Version 0.7.0](https://pypi.org/project/pytest-ordering2/0.7.0/)
 Imported version from [pytest-ordering](https://github.com/ftobia/pytest-ordering), 
@@ -25,4 +26,4 @@ including some PRs (manually merged).
 - added more pytest versions, fix pytest-cov compatibility issue,
   remove Python 3.4, add Python 3.8
   (imported from [PR #74](https://github.com/ftobia/pytest-ordering/pull/74))
-- moved documentation to [GitHub Pages](https://mrbean-bremen.github.io/pytest-ordering2/)
+- moved documentation to [GitHub Pages](https://mrbean-bremen.github.io/pytest-order/)

README.md

@@ -1,4 +1,4 @@
-pytest-ordering2 [![PyPI version](https://badge.fury.io/py/pytest-ordering2.svg)](https://badge.fury.io/py/pytest-ordering2)
+pytest-order [![PyPI version](https://badge.fury.io/py/pytest-ordering2.svg)](https://badge.fury.io/py/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
@@ -10,9 +10,9 @@ organization as outlined in
 happens, this fork will be obsolete. 
 
 
-pytest-ordering2 is a pytest plugin to run your tests in a specific order.
+pytest-order 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)
+[![Build Status](https://travis-ci.org/mrbean-bremen/pytest-order.svg?branch=master)](https://travis-ci.org/mrbean-bremen/pytest-order)
 
 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
@@ -22,7 +22,7 @@ Now you can.
 
 Install with:
 
-    pip install pytest-ordering2
+    pip install pytest-order
 
 This defines some pytest markers that you can use in your code.
 
@@ -51,4 +51,4 @@ Yields this output:
 
     =========================== 2 passed in 0.01 seconds ===========================
 
-You can find more information in the [documentation](https://mrbean-bremen.github.io/pytest-ordering2/).
+You can find more information in the [documentation](https://mrbean-bremen.github.io/pytest-order/).

docs/Makefile

@@ -85,17 +85,17 @@ qthelp:
 	@echo
 	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
 	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/pytest-ordering.qhcp"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/pytest-order.qhcp"
 	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/pytest-ordering.qhc"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/pytest-order.qhc"
 
 devhelp:
 	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
 	@echo
 	@echo "Build finished."
 	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/pytest-ordering"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/pytest-ordering"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/pytest-order"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/pytest-order"
 	@echo "# devhelp"
 
 epub:

docs/make.bat

@@ -115,9 +115,9 @@ if "%1" == "qthelp" (
 	echo.
 	echo.Build finished; now you can run "qcollectiongenerator" with the ^
 .qhcp project file in %BUILDDIR%/qthelp, like this:
-	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\pytest-ordering.qhcp
+	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\pytest-order.qhcp
 	echo.To view the help file:
-	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\pytest-ordering.ghc
+	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\pytest-order.ghc
 	goto end
 )
 

docs/source/conf.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# pytest-ordering documentation build configuration file, created by
+# pytest-order documentation build configuration file, created by
 # sphinx-quickstart on Mon Mar 17 18:20:44 2014.
 #
 # This file is execfile()d with the current directory set to its
@@ -50,14 +50,14 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'pytest-ordering2'
+project = u'pytest-order'
 copyright = u'2014, Frank Tobia'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
-exec(open(os.path.join(__here__, '..', '..', 'pytest_ordering2',
+exec(open(os.path.join(__here__, '..', '..', 'pytest_order',
                        '_version.py')).read())
 # The short X.Y version.
 version = __version__
@@ -185,7 +185,7 @@
 #html_file_suffix = None
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'pytest-orderingdoc'
+htmlhelp_basename = 'pytest-orderdoc'
 
 
 # -- Options for LaTeX output ---------------------------------------------
@@ -205,7 +205,7 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-  ('index', 'pytest-ordering.tex', u'pytest-ordering2 Documentation',
+  ('index', 'pytest-order.tex', u'pytest-order Documentation',
    u'Frank Tobia', 'manual'),
 ]
 
@@ -235,7 +235,7 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'pytest-ordering2', u'pytest-ordering2 Documentation',
+    ('index', 'pytest-order', u'pytest-order Documentation',
      [u'Frank Tobia'], 1)
 ]
 
@@ -249,8 +249,8 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  ('index', 'pytest-ordering2', u'pytest-ordering2 Documentation',
-   u'Frank Tobia', 'pytest-ordering2', 'One line description of project.',
+  ('index', 'pytest-order', u'pytest-order Documentation',
+   u'Frank Tobia', 'pytest-order', 'One line description of project.',
    'Miscellaneous'),
 ]
 

docs/source/index.rst

@@ -1,15 +1,15 @@
-pytest-ordering2: run your tests in  order
+pytest-order: run your tests in  order
 ==========================================
 
-pytest-ordering2 is a pytest plugin to run your tests in any order that
+pytest-order is a pytest plugin to run your tests in any order that
 you specify. It provides the marker ``order``, that defines when your tests
 should run in relation to each other. They can be absolute (i.e. first, or
 second-to-last) or relative (i.e. run this test before this other test).
 
 Supported Python and pytest versions
 ------------------------------------
 
-pytest-ordering2 supports python 2.7, 3.5 - 3.8, and pypy, and is
+pytest-order supports python 2.7, 3.5 - 3.8, and pypy, and is
 compatible with pytest 3.6.0 or newer.
 
 
@@ -41,7 +41,7 @@ Here is the output:
 
     =========================== 2 passed in 0.01 seconds ===========================
 
-With pytest-ordering, you can change the default ordering as follows:
+With pytest-order, you can change the default ordering as follows:
 
 .. code:: python
 
@@ -197,13 +197,13 @@ 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
 might be desirable to start those tests running first, in order to optimize
-your completion time. You can use the pytest-ordering2 plugin to inform pytest
+your completion time. You can use the pytest-order plugin to inform pytest
 of this.
 Now suppose you also want to prioritize tests which failed during the
 previous run, by using the ``--failed-first`` option. By default,
-pytest-ordering2 will override the ``--failed-first`` order, but by adding the
+pytest-order will override the ``--failed-first`` order, but by adding the
 ``--indulgent-ordering`` option, you can ask pytest to run the sort from
-pytest-ordering2 *before* the sort from ``--failed-first``, allowing the failed
+pytest-order *before* the sort from ``--failed-first``, allowing the failed
 tests to be sorted to the front.
 
 

pytest_ordering2/__init__.py renamed to pytest_order/__init__.py

@@ -32,21 +32,21 @@ def pytest_configure(config):
     """Register the "order" marker and configure the plugin depending
      on the CLI options"""
 
-    provided_by_pytest_ordering = (
-        'Provided by pytest-ordering2. '
-        'See also: http://pytest-ordering.readthedocs.org/'
+    provided_by_pytest_order = (
+        'Provided by pytest-order. '
+        'See also: https://mrbean-bremen.github.io/pytest-order/'
     )
 
     config_line = (
             'order: specify ordering information for when tests should run '
-            'in relation to one another. ' + provided_by_pytest_ordering
+            'in relation to one another. ' + provided_by_pytest_order
     )
     config.addinivalue_line('markers', config_line)
 
     for mark_name in orders_map.keys():
         config_line = '{}: run test {}. {}'.format(mark_name,
                                                    mark_name.replace('_', ' '),
-                                                   provided_by_pytest_ordering)
+                                                   provided_by_pytest_order)
         config.addinivalue_line('markers', config_line)
 
     if config.getoption('indulgent-ordering'):

pytest_ordering2/_version.py renamed to pytest_order/_version.py

@@ -5,25 +5,25 @@
 
 __here__ = os.path.abspath(os.path.dirname(__file__))
 
-from pytest_ordering2 import __version__
+from pytest_order import __version__
 
 with open(os.path.join(__here__, 'README.md')) as f:
     LONG_DESCRIPTION = f.read()
 
 
 setup(
-    name='pytest-ordering2',
+    name='pytest-order',
     description='pytest plugin to run your tests in a specific order',
     long_description=LONG_DESCRIPTION,
     long_description_content_type='text/markdown',
     version=__version__,
     author='mrbean-bremen',
     author_email='[email protected]',
-    url='https://github.com/mrbean-bremen/pytest-ordering2',
-    packages=['pytest_ordering2'],
+    url='https://github.com/mrbean-bremen/pytest-order',
+    packages=['pytest_order'],
     entry_points={
         'pytest11': [
-            'pytest_ordering2 = pytest_ordering2',
+            'pytest_order = pytest_order',
         ]
     },
     install_requires=['pytest>=3.6'],

setup.py

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