diff options
| author | Ben Finney <ben+debian@benfinney.id.au> | 2010-04-10 15:44:43 +1000 |
|---|---|---|
| committer | git-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com> | 2010-05-09 15:48:31 +0000 |
| commit | 69bbbfeb38ce972c106880c02684af5c1fa5bada (patch) | |
| tree | 571e7654ad8adedecbff4bfcfeb53a6738179d3a | |
| parent | 159e1f2c2459d030ce55381d725720da83011a6a (diff) | |
1.5.5-1 (patches unapplied)import/1.5.5-1ubuntu/oneiric-develubuntu/oneiricubuntu/natty-develubuntu/nattyubuntu/maverick-develubuntu/maverickdebian/wheezydebian/squeezedebian/jessie
Imported using git-ubuntu import.
Notes
Notes:
* New upstream version. Highlights since previous release:
+ Stop using ‘pkg_resources’ and revert to pre-1.5.3 version-string
handling, until a better way that doesn't break everyone else's
installation can be found.
* New upstream version. Highlights since previous release:
* Invoke the pidfile context manager's ‘__exit__’
method with the correct arguments (as per
<URL:http://docs.python.org/library/stdtypes.html#typecontextmanager>).
* debian/source/format:
* Declare source package format.
* debian/control:
* Build-Depends on all dependencies, so that ‘pkg_resources.require’
works for all packaging actions.
* Conform to ‘Standards-Version: 3.8.4’ (no additional changes needed).
| -rw-r--r-- | ChangeLog | 32 | ||||
| -rw-r--r-- | PKG-INFO | 2 | ||||
| -rw-r--r-- | daemon/__init__.py | 2 | ||||
| -rw-r--r-- | daemon/daemon.py | 6 | ||||
| -rw-r--r-- | daemon/pidlockfile.py | 2 | ||||
| -rw-r--r-- | daemon/runner.py | 2 | ||||
| -rw-r--r-- | daemon/version/__init__.py | 4 | ||||
| -rw-r--r-- | debian/changelog | 24 | ||||
| -rw-r--r-- | debian/control | 3 | ||||
| -rw-r--r-- | debian/source/format | 1 | ||||
| -rw-r--r-- | python_daemon.egg-info/PKG-INFO | 2 | ||||
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | test/__init__.py | 2 | ||||
| -rw-r--r-- | test/scaffold.py | 2 | ||||
| -rw-r--r-- | test/test_daemon.py | 4 | ||||
| -rw-r--r-- | test/test_pidlockfile.py | 2 | ||||
| -rw-r--r-- | test/test_runner.py | 9 |
17 files changed, 80 insertions, 21 deletions
@@ -1,3 +1,35 @@ +2010-03-02 Ben Finney <ben+python@benfinney.id.au> + + Version 1.5.5 released. + + * Stop using ‘pkg_resources’ and revert to pre-1.5.3 version-string + handling, until a better way that doesn't break everyone else's + installation can be found. + +2010-02-27 Ben Finney <ben+python@benfinney.id.au> + + Version 1.5.4 released. + + * MANIFEST.in: Explicitly include version data file, otherwise + everything breaks for users of the sdist. + +2010-02-26 Ben Finney <ben+python@benfinney.id.au> + + Version 1.5.3 released. + + * daemon/daemon.py: Invoke the pidfile context manager's ‘__exit__’ + method with the correct arguments (as per + <URL:http://docs.python.org/library/stdtypes.html#typecontextmanager>). + Thanks to Ludvig Ericson for the bug report. + * version: New plain-text data file to store project version string. + * setup.py: Read version string from data file. + * daemon/version/__init__.py: Query version string with ‘pkg_resources’. + +2010-01-20 Ben Finney <ben+python@benfinney.id.au> + + * Add ‘pylint’ configuration for this project. + * Update copyright notices. + 2009-10-24 Ben Finney <ben+python@benfinney.id.au> Version 1.5.2 released. @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: python-daemon -Version: 1.5.2 +Version: 1.5.5 Summary: Library to implement a well-behaved Unix daemon process. Home-page: http://pypi.python.org/pypi/python-daemon/ Author: Ben Finney diff --git a/daemon/__init__.py b/daemon/__init__.py index 9c2ab8c..d8dc171 100644 --- a/daemon/__init__.py +++ b/daemon/__init__.py @@ -3,7 +3,7 @@ # daemon/__init__.py # Part of python-daemon, an implementation of PEP 3143. # -# Copyright © 2009 Ben Finney <ben+python@benfinney.id.au> +# Copyright © 2009–2010 Ben Finney <ben+python@benfinney.id.au> # Copyright © 2006 Robert Niederreiter # # This is free software: you may copy, modify, and/or distribute this work diff --git a/daemon/daemon.py b/daemon/daemon.py index bb86a15..28db695 100644 --- a/daemon/daemon.py +++ b/daemon/daemon.py @@ -3,7 +3,7 @@ # daemon/daemon.py # Part of python-daemon, an implementation of PEP 3143. # -# Copyright © 2008–2009 Ben Finney <ben+python@benfinney.id.au> +# Copyright © 2008–2010 Ben Finney <ben+python@benfinney.id.au> # Copyright © 2007–2008 Robert Niederreiter, Jens Klein # Copyright © 2004–2005 Chad J. Schroeder # Copyright © 2003 Clark Evans @@ -373,7 +373,9 @@ class DaemonContext(object): return if self.pidfile is not None: - self.pidfile.__exit__() + # Follow the interface for telling a context manager to exit, + # <URL:http://docs.python.org/library/stdtypes.html#typecontextmanager>. + self.pidfile.__exit__(None, None, None) self._is_open = False diff --git a/daemon/pidlockfile.py b/daemon/pidlockfile.py index f1d70fe..c38beae 100644 --- a/daemon/pidlockfile.py +++ b/daemon/pidlockfile.py @@ -3,7 +3,7 @@ # daemon/pidlockfile.py # Part of python-daemon, an implementation of PEP 3143. # -# Copyright © 2008–2009 Ben Finney <ben+python@benfinney.id.au> +# Copyright © 2008–2010 Ben Finney <ben+python@benfinney.id.au> # # This is free software: you may copy, modify, and/or distribute this work # under the terms of the Python Software Foundation License, version 2 or diff --git a/daemon/runner.py b/daemon/runner.py index 7053c92..0642695 100644 --- a/daemon/runner.py +++ b/daemon/runner.py @@ -3,7 +3,7 @@ # daemon/runner.py # Part of python-daemon, an implementation of PEP 3143. # -# Copyright © 2009 Ben Finney <ben+python@benfinney.id.au> +# Copyright © 2009–2010 Ben Finney <ben+python@benfinney.id.au> # Copyright © 2007–2008 Robert Niederreiter, Jens Klein # Copyright © 2003 Clark Evans # Copyright © 2002 Noah Spurrier diff --git a/daemon/version/__init__.py b/daemon/version/__init__.py index 4ec92d8..d2eafa6 100644 --- a/daemon/version/__init__.py +++ b/daemon/version/__init__.py @@ -3,7 +3,7 @@ # daemon/version/__init__.py # Part of python-daemon, an implementation of PEP 3143. # -# Copyright © 2008–2009 Ben Finney <ben+python@benfinney.id.au> +# Copyright © 2008–2010 Ben Finney <ben+python@benfinney.id.au> # This is free software: you may copy, modify, and/or distribute this work # under the terms of the Python Software Foundation License, version 2 or # later as published by the Python Software Foundation. @@ -13,7 +13,7 @@ from version_info import version_info -version_info['version_string'] = u"1.5.2" +version_info['version_string'] = u"1.5.5" version_short = u"%(version_string)s" % version_info version_full = u"%(version_string)s.r%(revno)s" % version_info diff --git a/debian/changelog b/debian/changelog index e837dc8..3a95656 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,27 @@ +python-daemon (1.5.5-1) unstable; urgency=low + + * New upstream version. Highlights since previous release: + + Stop using ‘pkg_resources’ and revert to pre-1.5.3 version-string + handling, until a better way that doesn't break everyone else's + installation can be found. + + -- Ben Finney <ben+debian@benfinney.id.au> Sat, 10 Apr 2010 15:44:43 +1000 + +python-daemon (1.5.4-1) unstable; urgency=low + + * New upstream version. Highlights since previous release: + * Invoke the pidfile context manager's ‘__exit__’ + method with the correct arguments (as per + <URL:http://docs.python.org/library/stdtypes.html#typecontextmanager>). + * debian/source/format: + * Declare source package format. + * debian/control: + * Build-Depends on all dependencies, so that ‘pkg_resources.require’ + works for all packaging actions. + * Conform to ‘Standards-Version: 3.8.4’ (no additional changes needed). + + -- Ben Finney <ben+debian@benfinney.id.au> Sat, 27 Feb 2010 22:57:50 +1100 + python-daemon (1.5.2-2) unstable; urgency=medium * Urgency ‘medium’ to address serious packaging bug. diff --git a/debian/control b/debian/control index aece268..b46583a 100644 --- a/debian/control +++ b/debian/control @@ -9,8 +9,9 @@ Build-Depends: debhelper (>= 7.0.14), python-support (>= 0.90), python-setuptools, python-minimock (>= 1.2.2), + python-lockfile, python -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Package: python-daemon Architecture: all diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/python_daemon.egg-info/PKG-INFO b/python_daemon.egg-info/PKG-INFO index 647c847..df8f553 100644 --- a/python_daemon.egg-info/PKG-INFO +++ b/python_daemon.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: python-daemon -Version: 1.5.2 +Version: 1.5.5 Summary: Library to implement a well-behaved Unix daemon process. Home-page: http://pypi.python.org/pypi/python-daemon/ Author: Ben Finney @@ -3,7 +3,7 @@ # setup.py # Part of python-daemon, an implementation of PEP 3143. # -# Copyright © 2008–2009 Ben Finney <ben+python@benfinney.id.au> +# Copyright © 2008–2010 Ben Finney <ben+python@benfinney.id.au> # Copyright © 2008 Robert Niederreiter, Jens Klein # # This is free software: you may copy, modify, and/or distribute this work diff --git a/test/__init__.py b/test/__init__.py index 2fb4ced..b3efac7 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -3,7 +3,7 @@ # test/__init__.py # Part of python-daemon, an implementation of PEP 3143. # -# Copyright © 2008–2009 Ben Finney <ben+python@benfinney.id.au> +# Copyright © 2008–2010 Ben Finney <ben+python@benfinney.id.au> # # This is free software: you may copy, modify, and/or distribute this work # under the terms of the Python Software Foundation License, version 2 or diff --git a/test/scaffold.py b/test/scaffold.py index 5fe0e58..566cfb9 100644 --- a/test/scaffold.py +++ b/test/scaffold.py @@ -3,7 +3,7 @@ # test/scaffold.py # Part of python-daemon, an implementation of PEP 3143. # -# Copyright © 2007–2009 Ben Finney <ben+python@benfinney.id.au> +# Copyright © 2007–2010 Ben Finney <ben+python@benfinney.id.au> # This is free software; you may copy, modify and/or distribute this work # under the terms of the GNU General Public License, version 2 or later. # No warranty expressed or implied. See the file LICENSE.GPL-2 for details. diff --git a/test/test_daemon.py b/test/test_daemon.py index 5bd2dc6..c3f46e3 100644 --- a/test/test_daemon.py +++ b/test/test_daemon.py @@ -3,7 +3,7 @@ # test/test_daemon.py # Part of python-daemon, an implementation of PEP 3143. # -# Copyright © 2008–2009 Ben Finney <ben+python@benfinney.id.au> +# Copyright © 2008–2010 Ben Finney <ben+python@benfinney.id.au> # # This is free software: you may copy, modify, and/or distribute this work # under the terms of the Python Software Foundation License, version 2 or @@ -610,7 +610,7 @@ class DaemonContext_close_TestCase(scaffold.TestCase): instance = self.test_instance instance.pidfile = self.mock_pidlockfile expect_mock_output = """\ - Called pidlockfile.PIDLockFile.__exit__() + Called pidlockfile.PIDLockFile.__exit__(None, None, None) """ instance.close() self.failUnlessMockCheckerMatch(expect_mock_output) diff --git a/test/test_pidlockfile.py b/test/test_pidlockfile.py index 599353b..c8f952e 100644 --- a/test/test_pidlockfile.py +++ b/test/test_pidlockfile.py @@ -3,7 +3,7 @@ # test/test_pidlockfile.py # Part of python-daemon, an implementation of PEP 3143. # -# Copyright © 2008–2009 Ben Finney <ben+python@benfinney.id.au> +# Copyright © 2008–2010 Ben Finney <ben+python@benfinney.id.au> # # This is free software: you may copy, modify, and/or distribute this work # under the terms of the Python Software Foundation License, version 2 or diff --git a/test/test_runner.py b/test/test_runner.py index d6cacc2..11551ab 100644 --- a/test/test_runner.py +++ b/test/test_runner.py @@ -3,7 +3,7 @@ # test/test_runner.py # Part of python-daemon, an implementation of PEP 3143. # -# Copyright © 2009 Ben Finney <ben+python@benfinney.id.au> +# Copyright © 2009–2010 Ben Finney <ben+python@benfinney.id.au> # # This is free software: you may copy, modify, and/or distribute this work # under the terms of the Python Software Foundation License, version 2 or @@ -485,7 +485,7 @@ class DaemonRunner_do_action_start_TestCase(scaffold.TestCase): else: raise self.failureException( "Failed to raise " + expect_error.__name__) - self.failUnlessIn(exc.message, expect_message_content) + self.failUnlessIn(str(exc), expect_message_content) def test_breaks_lock_if_no_such_process(self): """ Should request breaking lock if PID file process is not running. """ @@ -580,7 +580,7 @@ class DaemonRunner_do_action_stop_TestCase(scaffold.TestCase): raise self.failureException( "Failed to raise " + expect_error.__name__) scaffold.mock_restore() - self.failUnlessIn(exc.message, expect_message_content) + self.failUnlessIn(str(exc), expect_message_content) def test_breaks_lock_if_pidfile_stale(self): """ Should break lock if PID file is stale. """ @@ -628,8 +628,7 @@ class DaemonRunner_do_action_stop_TestCase(scaffold.TestCase): else: raise self.failureException( "Failed to raise " + expect_error.__name__) - scaffold.mock_restore() - self.failUnlessIn(exc.message, expect_message_content) + self.failUnlessIn(str(exc), expect_message_content) class DaemonRunner_do_action_restart_TestCase(scaffold.TestCase): |