[Python-modules-commits] [nose] 01/08: Import nose_1.3.7.orig.tar.gz

Brian May bam at moszumanska.debian.org
Thu Nov 19 00:19:46 UTC 2015


This is an automated email from the git hooks/post-receive script.

bam pushed a commit to branch master
in repository nose.

commit f97053e0cd15a0709976837af19b8c3ecb4ebc3a
Author: Brian May <bam at debian.org>
Date:   Thu Nov 19 11:07:06 2015 +1100

    Import nose_1.3.7.orig.tar.gz
---
 CHANGELOG                                          |   5 +++++
 PKG-INFO                                           |   2 +-
 .../doc_tests/test_init_plugin/example.cfg         |   3 +++
 .../test_xunit_plugin/support/nosetests.xml        |  18 +++++++++++++++
 functional_tests/nosetests.xml                     |   2 ++
 functional_tests/support/coverage2/.coverage       | Bin 0 -> 3896 bytes
 .../support/issue191/UNKNOWN.egg-info/PKG-INFO     |  10 +++++++++
 .../support/issue191/UNKNOWN.egg-info/SOURCES.txt  |   6 +++++
 .../issue191/UNKNOWN.egg-info/dependency_links.txt |   1 +
 .../issue191/UNKNOWN.egg-info/top_level.txt        |   1 +
 functional_tests/support/issue408/nosetests.xml    |   0
 functional_tests/support/xunit.xml                 |  25 +++++++++++++++++++++
 .../test_multiprocessing/test_keyboardinterrupt.py |   4 ++++
 nose.egg-info/PKG-INFO                             |   2 +-
 nose.egg-info/SOURCES.txt                          |  11 +++++++++
 nose/__init__.py                                   |   2 +-
 nose/loader.py                                     |  10 ++++-----
 setup.py                                           |   2 +-
 unit_tests/support/doctest/noname_wrapped.not_pyc  | Bin 0 -> 378 bytes
 19 files changed, 94 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 251018a..fe2ed89 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+1.3.7
+
+- Fix loading packages from capitalised package on Windows
+  Patch by Thomas Kluyver
+
 1.3.6
 
 - Re-release of 1.3.5 with wheels fixed.
diff --git a/PKG-INFO b/PKG-INFO
index bec054b..112ec15 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: nose
-Version: 1.3.6
+Version: 1.3.7
 Summary: nose extends unittest to make testing easier
 Home-page: http://readthedocs.org/docs/nose/
 Author: Jason Pellerin
diff --git a/functional_tests/doc_tests/test_init_plugin/example.cfg b/functional_tests/doc_tests/test_init_plugin/example.cfg
new file mode 100644
index 0000000..b02ac0e
--- /dev/null
+++ b/functional_tests/doc_tests/test_init_plugin/example.cfg
@@ -0,0 +1,3 @@
+[DEFAULT]
+can_frobnicate = 1
+likes_cheese = 0
diff --git a/functional_tests/doc_tests/test_xunit_plugin/support/nosetests.xml b/functional_tests/doc_tests/test_xunit_plugin/support/nosetests.xml
new file mode 100644
index 0000000..0918380
--- /dev/null
+++ b/functional_tests/doc_tests/test_xunit_plugin/support/nosetests.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?><testsuite name="nosetests" tests="4" errors="1" failures="1" skip="1"><testcase classname="test_skip" name="test_ok" time="0.001"></testcase><testcase classname="test_skip" name="test_err" time="0.000"><error type="exceptions.Exception" message="oh no"><![CDATA[Traceback (most recent call last):
+  File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/unittest/case.py", line 331, in run
+    testMethod()
+  File "/Users/jszakmeister/projects/nose/nose/case.py", line 197, in runTest
+    self.test(*self.arg)
+  File "/Users/jszakmeister/projects/nose/functional_tests/doc_tests/test_xunit_plugin/support/test_skip.py", line 7, in test_err
+    raise Exception("oh no")
+Exception: oh no
+]]></error></testcase><testcase classname="test_skip" name="test_fail" time="0.000"><failure type="exceptions.AssertionError" message="bye"><![CDATA[Traceback (most recent call last):
+  File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/unittest/case.py", line 331, in run
+    testMethod()
+  File "/Users/jszakmeister/projects/nose/nose/case.py", line 197, in runTest
+    self.test(*self.arg)
+  File "/Users/jszakmeister/projects/nose/functional_tests/doc_tests/test_xunit_plugin/support/test_skip.py", line 10, in test_fail
+    assert False, "bye"
+AssertionError: bye
+]]></failure></testcase><testcase classname="test_skip" name="test_skip" time="0.000"><skipped type="unittest.case.SkipTest" message="not me"><![CDATA[SkipTest: not me
+]]></skipped></testcase></testsuite>
\ No newline at end of file
diff --git a/functional_tests/nosetests.xml b/functional_tests/nosetests.xml
new file mode 100644
index 0000000..191b966
--- /dev/null
+++ b/functional_tests/nosetests.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?><testsuite name="nosetests" tests="1" errors="0" failures="0" skip="0"><testcase classname="test" name="test_foo" time="0.000"><system-out><![CDATA[abc€
+]]></system-out></testcase></testsuite>
\ No newline at end of file
diff --git a/functional_tests/support/coverage2/.coverage b/functional_tests/support/coverage2/.coverage
new file mode 100644
index 0000000..2804a5c
Binary files /dev/null and b/functional_tests/support/coverage2/.coverage differ
diff --git a/functional_tests/support/issue191/UNKNOWN.egg-info/PKG-INFO b/functional_tests/support/issue191/UNKNOWN.egg-info/PKG-INFO
new file mode 100644
index 0000000..11b3dcd
--- /dev/null
+++ b/functional_tests/support/issue191/UNKNOWN.egg-info/PKG-INFO
@@ -0,0 +1,10 @@
+Metadata-Version: 1.0
+Name: UNKNOWN
+Version: 0.0.0
+Summary: UNKNOWN
+Home-page: UNKNOWN
+Author: UNKNOWN
+Author-email: UNKNOWN
+License: UNKNOWN
+Description: UNKNOWN
+Platform: UNKNOWN
diff --git a/functional_tests/support/issue191/UNKNOWN.egg-info/SOURCES.txt b/functional_tests/support/issue191/UNKNOWN.egg-info/SOURCES.txt
new file mode 100644
index 0000000..75d8cfe
--- /dev/null
+++ b/functional_tests/support/issue191/UNKNOWN.egg-info/SOURCES.txt
@@ -0,0 +1,6 @@
+setup.cfg
+setup.py
+UNKNOWN.egg-info/PKG-INFO
+UNKNOWN.egg-info/SOURCES.txt
+UNKNOWN.egg-info/dependency_links.txt
+UNKNOWN.egg-info/top_level.txt
\ No newline at end of file
diff --git a/functional_tests/support/issue191/UNKNOWN.egg-info/dependency_links.txt b/functional_tests/support/issue191/UNKNOWN.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/functional_tests/support/issue191/UNKNOWN.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/functional_tests/support/issue191/UNKNOWN.egg-info/top_level.txt b/functional_tests/support/issue191/UNKNOWN.egg-info/top_level.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/functional_tests/support/issue191/UNKNOWN.egg-info/top_level.txt
@@ -0,0 +1 @@
+
diff --git a/functional_tests/support/issue408/nosetests.xml b/functional_tests/support/issue408/nosetests.xml
new file mode 100644
index 0000000..e69de29
diff --git a/functional_tests/support/xunit.xml b/functional_tests/support/xunit.xml
new file mode 100644
index 0000000..3765e48
--- /dev/null
+++ b/functional_tests/support/xunit.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?><testsuite name="nosetests" tests="6" errors="2" failures="1" skip="1"><testcase classname="test_xunit_as_suite.TestForXunit" name="test_error" time="0.001"><error type="exceptions.TypeError" message="oops, wrong type"><![CDATA[Traceback (most recent call last):
+  File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/unittest/case.py", line 331, in run
+    testMethod()
+  File "/Users/jszakmeister/projects/nose/functional_tests/support/xunit/test_xunit_as_suite.py", line 15, in test_error
+    raise TypeError("oops, wrong type")
+TypeError: oops, wrong type
+]]></error></testcase><testcase classname="test_xunit_as_suite.TestForXunit" name="test_fail" time="0.000"><failure type="exceptions.AssertionError" message="'this' != 'that'"><![CDATA[Traceback (most recent call last):
+  File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/unittest/case.py", line 331, in run
+    testMethod()
+  File "/Users/jszakmeister/projects/nose/functional_tests/support/xunit/test_xunit_as_suite.py", line 12, in test_fail
+    self.assertEqual("this","that")
+  File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/unittest/case.py", line 515, in assertEqual
+    assertion_func(first, second, msg=msg)
+  File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/unittest/case.py", line 508, in _baseAssertEqual
+    raise self.failureException(msg)
+AssertionError: 'this' != 'that'
+]]></failure></testcase><testcase classname="test_xunit_as_suite.TestForXunit" name="test_non_ascii_error" time="0.000"><error type="exceptions.Exception" message="日本"><![CDATA[Traceback (most recent call last):
+  File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/unittest/case.py", line 331, in run
+    testMethod()
+  File "/Users/jszakmeister/projects/nose/functional_tests/support/xunit/test_xunit_as_suite.py", line 18, in test_non_ascii_error
+    raise Exception(u"日本")
+Exception: \u65e5\u672c
+]]></error></testcase><testcase classname="test_xunit_as_suite.TestForXunit" name="test_output" time="0.000"><system-out><![CDATA[test-generated output
+]]></system-out></testcase><testcase classname="test_xunit_as_suite.TestForXunit" name="test_skip" time="0.000"><skipped type="unittest.case.SkipTest" message="skipit"><![CDATA[SkipTest: skipit
+]]></skipped></testcase><testcase classname="test_xunit_as_suite.TestForXunit" name="test_success" time="0.000"></testcase></testsuite>
\ No newline at end of file
diff --git a/functional_tests/test_multiprocessing/test_keyboardinterrupt.py b/functional_tests/test_multiprocessing/test_keyboardinterrupt.py
index 2bcbe73..18c8af1 100644
--- a/functional_tests/test_multiprocessing/test_keyboardinterrupt.py
+++ b/functional_tests/test_multiprocessing/test_keyboardinterrupt.py
@@ -1,3 +1,4 @@
+from nose.exc import SkipTest
 from subprocess import Popen,PIPE
 import os
 import sys
@@ -36,6 +37,9 @@ runner = os.path.join(support, 'fake_nosetest.py')
 def keyboardinterrupt(case):
     #os.setsid would create a process group so signals sent to the
     #parent process will propogates to all children processes
+    if not hasattr(os, 'setsid') or not hasattr(os, 'killpg'):
+        raise SkipTest("OS does not support os.setsid or os.killpg")
+
     from tempfile import mktemp
     logfile = mktemp()
     killfile = mktemp()
diff --git a/nose.egg-info/PKG-INFO b/nose.egg-info/PKG-INFO
index bec054b..112ec15 100644
--- a/nose.egg-info/PKG-INFO
+++ b/nose.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: nose
-Version: 1.3.6
+Version: 1.3.7
 Summary: nose extends unittest to make testing easier
 Home-page: http://readthedocs.org/docs/nose/
 Author: Jason Pellerin
diff --git a/nose.egg-info/SOURCES.txt b/nose.egg-info/SOURCES.txt
index c5dc525..df3120f 100644
--- a/nose.egg-info/SOURCES.txt
+++ b/nose.egg-info/SOURCES.txt
@@ -80,6 +80,7 @@ examples/html_plugin/htmlplug.py
 examples/html_plugin/setup.py
 examples/plugin/plug.py
 examples/plugin/setup.py
+functional_tests/nosetests.xml
 functional_tests/test_attribute_plugin.py
 functional_tests/test_buggy_generators.py
 functional_tests/test_cases.py
@@ -122,6 +123,7 @@ functional_tests/doc_tests/test_allmodules/support/mod.py
 functional_tests/doc_tests/test_allmodules/support/test.py
 functional_tests/doc_tests/test_doctest_fixtures/doctest_fixtures.rst
 functional_tests/doc_tests/test_doctest_fixtures/doctest_fixtures_fixtures.py
+functional_tests/doc_tests/test_init_plugin/example.cfg
 functional_tests/doc_tests/test_init_plugin/init_plugin.rst
 functional_tests/doc_tests/test_init_plugin/init_plugin.rst.py3.patch
 functional_tests/doc_tests/test_issue089/unwanted_package.rst
@@ -166,13 +168,16 @@ functional_tests/doc_tests/test_selector_plugin/support/tests/math/basic.py
 functional_tests/doc_tests/test_selector_plugin/support/tests/mymodule/my_function.py
 functional_tests/doc_tests/test_selector_plugin/support/tests/strings/cat.py
 functional_tests/doc_tests/test_xunit_plugin/test_skips.rst
+functional_tests/doc_tests/test_xunit_plugin/support/nosetests.xml
 functional_tests/doc_tests/test_xunit_plugin/support/test_skip.py
 functional_tests/support/test.cfg
 functional_tests/support/test_buggy_generators.py
+functional_tests/support/xunit.xml
 functional_tests/support/att/test_attr.py
 functional_tests/support/attrib-static/test.py
 functional_tests/support/coverage/blah.py
 functional_tests/support/coverage/tests/test_covered.py
+functional_tests/support/coverage2/.coverage
 functional_tests/support/coverage2/blah.py
 functional_tests/support/coverage2/moo.py
 functional_tests/support/coverage2/tests/test_covered.py
@@ -226,8 +231,13 @@ functional_tests/support/issue143/not-a-package/test.py
 functional_tests/support/issue191/setup.cfg
 functional_tests/support/issue191/setup.py
 functional_tests/support/issue191/test.py
+functional_tests/support/issue191/UNKNOWN.egg-info/PKG-INFO
+functional_tests/support/issue191/UNKNOWN.egg-info/SOURCES.txt
+functional_tests/support/issue191/UNKNOWN.egg-info/dependency_links.txt
+functional_tests/support/issue191/UNKNOWN.egg-info/top_level.txt
 functional_tests/support/issue269/test_bad_class.py
 functional_tests/support/issue279/test_mod_setup_fails.py
+functional_tests/support/issue408/nosetests.xml
 functional_tests/support/issue408/test.py
 functional_tests/support/issue513/test.py
 functional_tests/support/issue649/test.py
@@ -401,6 +411,7 @@ unit_tests/support/doctest/.gitignore
 unit_tests/support/doctest/err_doctests.py
 unit_tests/support/doctest/no_doctests.py
 unit_tests/support/doctest/noname_wrapped.not_py
+unit_tests/support/doctest/noname_wrapped.not_pyc
 unit_tests/support/doctest/noname_wrapper.py
 unit_tests/support/foo/__init__.py
 unit_tests/support/foo/doctests.txt
diff --git a/nose/__init__.py b/nose/__init__.py
index bc51e89..1ae1362 100644
--- a/nose/__init__.py
+++ b/nose/__init__.py
@@ -4,7 +4,7 @@ from nose.exc import SkipTest, DeprecatedTest
 from nose.tools import with_setup
 
 __author__ = 'Jason Pellerin'
-__versioninfo__ = (1, 3, 6)
+__versioninfo__ = (1, 3, 7)
 __version__ = '.'.join(map(str, __versioninfo__))
 
 __all__ = [
diff --git a/nose/loader.py b/nose/loader.py
index efe1b10..3744e54 100644
--- a/nose/loader.py
+++ b/nose/loader.py
@@ -341,15 +341,13 @@ class TestLoader(unittest.TestLoader):
             path = os.path.normcase(os.path.realpath(path))
 
         for module_path in module_paths:
-            log.debug('os.path.normcase(%r): %r', module_path,
-                      os.path.normcase(module_path))
-            module_path = os.path.normcase(module_path)
-
             log.debug("Load tests from module path %s?", module_path)
             log.debug("path: %s os.path.realpath(%s): %s",
-                      path, module_path, os.path.realpath(module_path))
+                      path, os.path.normcase(module_path),
+                      os.path.realpath(os.path.normcase(module_path)))
             if (self.config.traverseNamespace or not path) or \
-                    os.path.realpath(module_path).startswith(path):
+                    os.path.realpath(
+                        os.path.normcase(module_path)).startswith(path):
                 # Egg files can be on sys.path, so make sure the path is a
                 # directory before trying to load from it.
                 if os.path.isdir(module_path):
diff --git a/setup.py b/setup.py
index 5695444..a2091c0 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 import sys
 import os
 
-VERSION = '1.3.6'
+VERSION = '1.3.7'
 py_vers_tag = '-%s.%s' % sys.version_info[:2]
 
 test_dirs = ['functional_tests', 'unit_tests', os.path.join('doc','doc_tests'), 'nose']
diff --git a/unit_tests/support/doctest/noname_wrapped.not_pyc b/unit_tests/support/doctest/noname_wrapped.not_pyc
new file mode 100644
index 0000000..d51e059
Binary files /dev/null and b/unit_tests/support/doctest/noname_wrapped.not_pyc differ

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/nose.git



More information about the Python-modules-commits mailing list