3 new commits in pytest:
https://bitbucket.org/hpk42/pytest/commits/8828c924acae/
Changeset: 8828c924acae
User: hpk42
Date: 2013-10-02 09:16:51
Summary: 2.4.1 release preps
Affected #: 4 files
diff -r 8f9abe7698e264a3ef3d2c58678537ace8017cde -r
8828c924acae0b4cad2e2cb92943d51da7cb744a _pytest/__init__.py
--- a/_pytest/__init__.py
+++ b/_pytest/__init__.py
@@ -1,2 +1,2 @@
#
-__version__ = '2.4.1.dev1'
+__version__ = '2.4.1'
diff -r 8f9abe7698e264a3ef3d2c58678537ace8017cde -r
8828c924acae0b4cad2e2cb92943d51da7cb744a doc/en/announce/release-2.4.1.txt
--- /dev/null
+++ b/doc/en/announce/release-2.4.1.txt
@@ -0,0 +1,25 @@
+pytest-2.4.1: fixing three regressions compared to 2.3.5
+===========================================================================
+
+pytest-2.4.1 is a quick follow up release to fix three regressions
+compared to 2.3.5 before they hit more people:
+
+- When using parser.addoption() unicode arguments to the
+ "type" keyword should also be converted to the respective types.
+ thanks Floris Bruynooghe, @dnozay. (fixes issue360 and issue362)
+
+- fix dotted filename completion when using argcomplete
+ thanks Anthon van der Neuth. (fixes issue361)
+
+- fix regression when a 1-tuple ("arg",) is used for specifying
+ parametrization (the values of the parametrization were passed
+ nested in a tuple). Thanks Donald Stufft.
+
+- also merge doc typo fixes, thanks Andy Dirnberger
+
+as usual, docs at http://pytest.org and upgrades via::
+
+ pip install -U pytest
+
+have fun,
+holger krekel
diff -r 8f9abe7698e264a3ef3d2c58678537ace8017cde -r
8828c924acae0b4cad2e2cb92943d51da7cb744a doc/en/conf.py
--- a/doc/en/conf.py
+++ b/doc/en/conf.py
@@ -17,7 +17,8 @@
#
# The full version, including alpha/beta/rc tags.
# The short X.Y version.
-version = release = "2.4.0"
+version = "2.4.1"
+release = "2.4.1"
import sys, os
diff -r 8f9abe7698e264a3ef3d2c58678537ace8017cde -r
8828c924acae0b4cad2e2cb92943d51da7cb744a setup.py
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@
name='pytest',
description='py.test: simple powerful testing with Python',
long_description = long_description,
- version='2.4.1.dev1',
+ version='2.4.1',
url='http://pytest.org',
license='MIT license',
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
https://bitbucket.org/hpk42/pytest/commits/42e0e9d8db2e/
Changeset: 42e0e9d8db2e
User: hpk42
Date: 2013-10-02 12:09:19
Summary: reference CHANGELOG
Affected #: 1 file
diff -r 8828c924acae0b4cad2e2cb92943d51da7cb744a -r
42e0e9d8db2e172ec6588acafa8102e343979375 README.rst
--- a/README.rst
+++ b/README.rst
@@ -1,3 +1,6 @@
+
+Changelog: http://pytest.org/latest/changelog.html
+
The ``py.test`` testing tool makes it easy to write small tests, yet
scales to support complex functional testing. It provides
https://bitbucket.org/hpk42/pytest/commits/6d1e3a0d4746/
Changeset: 6d1e3a0d4746
User: hpk42
Date: 2013-10-02 12:39:01
Summary: avoid "IOError: Bad Filedescriptor" on pytest shutdown by not
closing
the internal dupped stdout (fix is slightly hand-wavy but work).
Affected #: 5 files
diff -r 42e0e9d8db2e172ec6588acafa8102e343979375 -r
6d1e3a0d474693b63a9ada2b4cac0283c90f0f45 CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+Changes between 2.4.1 and 2.4.2
+-----------------------------------
+
+- avoid "IOError: Bad Filedescriptor" on pytest shutdown by not closing
+ the internal dupped stdout (fix is slightly hand-wavy but work).
+
Changes between 2.4.0 and 2.4.1
-----------------------------------
diff -r 42e0e9d8db2e172ec6588acafa8102e343979375 -r
6d1e3a0d474693b63a9ada2b4cac0283c90f0f45 _pytest/__init__.py
--- a/_pytest/__init__.py
+++ b/_pytest/__init__.py
@@ -1,2 +1,2 @@
#
-__version__ = '2.4.1'
+__version__ = '2.4.2.dev1'
diff -r 42e0e9d8db2e172ec6588acafa8102e343979375 -r
6d1e3a0d474693b63a9ada2b4cac0283c90f0f45 _pytest/capture.py
--- a/_pytest/capture.py
+++ b/_pytest/capture.py
@@ -29,7 +29,7 @@
except ValueError:
pass
early_config.pluginmanager.add_shutdown(teardown)
- # make sure logging does not raise exceptions if it is imported
+ # make sure logging does not raise exceptions at the end
def silence_logging_at_shutdown():
if "logging" in sys.modules:
sys.modules["logging"].raiseExceptions = False
diff -r 42e0e9d8db2e172ec6588acafa8102e343979375 -r
6d1e3a0d474693b63a9ada2b4cac0283c90f0f45 _pytest/terminal.py
--- a/_pytest/terminal.py
+++ b/_pytest/terminal.py
@@ -33,20 +33,23 @@
def pytest_configure(config):
config.option.verbose -= config.option.quiet
+
# we try hard to make printing resilient against
- # later changes on FD level. (unless capturing is turned off)
- stdout = py.std.sys.stdout
- capture = config.option.capture != "no"
- if capture and hasattr(os, 'dup') and hasattr(stdout, 'fileno'):
+ # later changes on FD level. (unless capturing is off/sys)
+ stdout = sys.stdout
+ if config.option.capture == "fd" and hasattr(os, "dup"):
try:
newstdout = py.io.dupfile(stdout, buffering=1,
encoding=stdout.encoding)
except ValueError:
pass
else:
- config._cleanup.append(lambda: newstdout.close())
assert stdout.encoding == newstdout.encoding
stdout = newstdout
+ #we don't close on shutdown because this can
+ #cause logging to fail on a second close
+ #(not really clear to me how it happens exactly, though)
+ #config.pluginmanager.add_shutdown(fin)
reporter = TerminalReporter(config, stdout)
config.pluginmanager.register(reporter, 'terminalreporter')
diff -r 42e0e9d8db2e172ec6588acafa8102e343979375 -r
6d1e3a0d474693b63a9ada2b4cac0283c90f0f45 setup.py
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@
name='pytest',
description='py.test: simple powerful testing with Python',
long_description = long_description,
- version='2.4.1',
+ version='2.4.2.dev1',
url='http://pytest.org',
license='MIT license',
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
Repository URL: https://bitbucket.org/hpk42/pytest/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
pytest-commit mailing list
pytest-commit@python.org
https://mail.python.org/mailman/listinfo/pytest-commit
