Merge pull request #2566 from cdeil/issue_2566

python setup.py test -n option is broken
astropy · Jun 1, 2014 · fca0415 · fca0415
2 parents bacf959 + a2d2d5f
commit fca0415
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -517,6 +517,10 @@ Bug Fixes
   - Removed deprecated option from travis configuration and force use of
     wheels rather than allowing build from source. [#2576]
 
+  - The short option ``-n`` to run tests in parallel was broken
+    (conflicts with the distutils built-in option of "dry-run").
+    Changed to ``-j``. [#2566]
+
 Other Changes and Additions
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 

diff --git a/astropy/tests/helper.py b/astropy/tests/helper.py
@@ -548,7 +548,7 @@ class astropy_test(Command, object):
         ('coverage', 'c',
          'Create a coverage report. Requires the coverage package.'),
         ('open-files', 'o', 'Fail if any tests leave files open.'),
-        ('parallel=', 'n',
+        ('parallel=', 'j',
          'Run the tests in parallel on the specified number of '
          'CPUs.  If negative, all the cores on the machine will be '
          'used.  Requires the pytest-xdist plugin.'),