Date: Sun, 25 Aug 2013 05:39:32 +0000 (UTC) From: Kubilay Kocak <koobs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r325328 - in head/sysutils/py-supervisor: . files Message-ID: <201308250539.r7P5dWgV047420@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: koobs Date: Sun Aug 25 05:39:31 2013 New Revision: 325328 URL: http://svnweb.freebsd.org/changeset/ports/325328 Log: sysutils/py-supervisor: Update to 3.0 - Update to 3.0 (and bump PORTEPOCH) - Update pkg-plist - Replace NOPORTDOCS with DOCS (pet portlint) - Remove unecessary test_childutils patch (upstreamed) - Disable two failing tests and report upstream [1] Changes: https://github.com/Supervisor/supervisor/blob/3.0/CHANGES.txt [1] https://github.com/Supervisor/supervisor/issues/284 [1] https://github.com/Supervisor/supervisor/issues/285 PR: ports/181138 Approved by: Ildar Hizbulin <hizel@vyborg.ru> (maintainer) Added: head/sysutils/py-supervisor/files/patch-supervisor-tests-test_options.py (contents, props changed) head/sysutils/py-supervisor/files/patch-supervisor-tests-test_supervisorctl.py (contents, props changed) Deleted: head/sysutils/py-supervisor/files/patch-supervisor-tests-test_childutils.py Modified: head/sysutils/py-supervisor/Makefile (contents, props changed) head/sysutils/py-supervisor/distinfo (contents, props changed) head/sysutils/py-supervisor/files/patch-supervisor_options.py (contents, props changed) head/sysutils/py-supervisor/pkg-plist (contents, props changed) Modified: head/sysutils/py-supervisor/Makefile ============================================================================== --- head/sysutils/py-supervisor/Makefile Sun Aug 25 05:17:05 2013 (r325327) +++ head/sysutils/py-supervisor/Makefile Sun Aug 25 05:39:31 2013 (r325328) @@ -2,7 +2,8 @@ # $FreeBSD$ PORTNAME= supervisor -PORTVERSION= 3.0b1 +PORTVERSION= 3.0 +PORTEPOCH= 1 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -42,7 +43,7 @@ post-install: [ -d ${PIDDIR} ] || ${MKDIR} ${PIDDIR} ${INSTALL_DATA} ${FILESDIR}/supervisord.conf.sample ${PREFIX}/etc [ -f ${PREFIX}/etc/supervisord.conf ] || ${CP} -p ${PREFIX}/etc/supervisord.conf.sample ${PREFIX}/etc/supervisord.conf -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} .for i in ${PORTDOCS} @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/ Modified: head/sysutils/py-supervisor/distinfo ============================================================================== --- head/sysutils/py-supervisor/distinfo Sun Aug 25 05:17:05 2013 (r325327) +++ head/sysutils/py-supervisor/distinfo Sun Aug 25 05:39:31 2013 (r325328) @@ -1,2 +1,2 @@ -SHA256 (supervisor-3.0b1.tar.gz) = 7361e224871257534cac3bc035e90571c35b9fa9245ec46207de9d89191a7d0c -SIZE (supervisor-3.0b1.tar.gz) = 452676 +SHA256 (supervisor-3.0.tar.gz) = 82aac54c5760b6a4f4c28dda203714e362a68b4a9ba8549fa65955998e3a2212 +SIZE (supervisor-3.0.tar.gz) = 459820 Added: head/sysutils/py-supervisor/files/patch-supervisor-tests-test_options.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/py-supervisor/files/patch-supervisor-tests-test_options.py Sun Aug 25 05:39:31 2013 (r325328) @@ -0,0 +1,71 @@ +--- supervisor/tests/test_options.py.old 2013-08-23 15:04:37.000000000 +0400 ++++ supervisor/tests/test_options.py 2013-08-23 15:07:45.000000000 +0400 +@@ -56,12 +56,12 @@ + short='p:', long='other=', handler=integer) + return options + +- def test_searchpaths(self): +- options = self._makeOptions() +- self.assertEquals(len(options.searchpaths), 5) +- self.assertTrue('supervisord.conf' in options.searchpaths) +- self.assertTrue('etc/supervisord.conf' in options.searchpaths) +- self.assertTrue('/etc/supervisord.conf' in options.searchpaths) ++# def test_searchpaths(self): ++# options = self._makeOptions() ++# self.assertEquals(len(options.searchpaths), 5) ++# self.assertTrue('supervisord.conf' in options.searchpaths) ++# self.assertTrue('etc/supervisord.conf' in options.searchpaths) ++# self.assertTrue('/etc/supervisord.conf' in options.searchpaths) + + def test_options_and_args_order(self): + # Only config file exists +@@ -209,15 +209,15 @@ + else: + self.fail("expected exception") + +- tempf = tempfile.NamedTemporaryFile() +- os.chmod(tempf.name, 0) # Removing read perms +- try: +- instance.read_config(tempf.name) +- except ValueError, e: +- self.assertTrue("could not read config file" in str(e)) +- else: +- self.fail("expected exception") +- tempf.close() ++# tempf = tempfile.NamedTemporaryFile() ++# os.chmod(tempf.name, 0) # Removing read perms ++# try: ++# instance.read_config(tempf.name) ++# except ValueError, e: ++# self.assertTrue("could not read config file" in str(e)) ++# else: ++# self.fail("expected exception") ++# tempf.close() + + def test_options_unixsocket_cli(self): + from StringIO import StringIO +@@ -616,15 +616,15 @@ + else: + self.fail("expected exception") + +- tempf = tempfile.NamedTemporaryFile() +- os.chmod(tempf.name, 0) # Removing read perms +- try: +- instance.read_config(tempf.name) +- except ValueError, e: +- self.assertTrue("could not read config file" in str(e)) +- else: +- self.fail("expected exception") +- tempf.close() ++# tempf = tempfile.NamedTemporaryFile() ++# os.chmod(tempf.name, 0) # Removing read perms ++# try: ++# instance.read_config(tempf.name) ++# except ValueError, e: ++# self.assertTrue("could not read config file" in str(e)) ++# else: ++# self.fail("expected exception") ++# tempf.close() + + def test_readFile_failed(self): + from supervisor.options import readFile Added: head/sysutils/py-supervisor/files/patch-supervisor-tests-test_supervisorctl.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/py-supervisor/files/patch-supervisor-tests-test_supervisorctl.py Sun Aug 25 05:39:31 2013 (r325328) @@ -0,0 +1,35 @@ +--- supervisor/tests/test_supervisorctl.py.old 2013-05-27 06:39:09.000000000 +0400 ++++ supervisor/tests/test_supervisorctl.py 2013-08-23 15:06:11.000000000 +0400 +@@ -889,19 +889,19 @@ + val = plugin.ctl.stdout.getvalue() + self.failUnless(val.startswith('Error: bad argument wrong'), val) + +- def test_maintail_dashf(self): +- plugin = self._makeOne() +- plugin.listener = DummyListener() +- result = plugin.do_maintail('-f') +- errors = plugin.listener.errors +- self.assertEqual(len(errors), 1) +- error = errors[0] +- self.assertEqual(plugin.listener.closed, +- 'http://localhost:65532/mainlogtail') +- self.assertEqual(error[0], +- 'http://localhost:65532/mainlogtail') +- for msg in ('Cannot connect', 'socket.error'): +- self.assertTrue(msg in error[1]) ++# def test_maintail_dashf(self): ++# plugin = self._makeOne() ++# plugin.listener = DummyListener() ++# result = plugin.do_maintail('-f') ++# errors = plugin.listener.errors ++# self.assertEqual(len(errors), 1) ++# error = errors[0] ++# self.assertEqual(plugin.listener.closed, ++# 'http://localhost:65532/mainlogtail') ++# self.assertEqual(error[0], ++# 'http://localhost:65532/mainlogtail') ++# for msg in ('Cannot connect', 'socket.error'): ++# self.assertTrue(msg in error[1]) + + def test_maintail_nobytes(self): + plugin = self._makeOne() Modified: head/sysutils/py-supervisor/files/patch-supervisor_options.py ============================================================================== --- head/sysutils/py-supervisor/files/patch-supervisor_options.py Sun Aug 25 05:17:05 2013 (r325327) +++ head/sysutils/py-supervisor/files/patch-supervisor_options.py Sun Aug 25 05:39:31 2013 (r325328) @@ -1,14 +1,14 @@ ---- supervisor/options.py.orig 2012-01-10 12:55:20.000000000 +0300 -+++ supervisor/options.py 2012-01-10 12:56:14.000000000 +0300 -@@ -92,10 +92,7 @@ - def default_configfile(self): - """Return the name of the found config file or raise. """ +--- supervisor/options.py.orig 2013-06-20 21:00:12.000000000 +0400 ++++ supervisor/options.py 2013-08-08 14:41:08.000000000 +0400 +@@ -99,10 +99,7 @@ + self.add("configfile", None, "c:", "configuration=") + here = os.path.dirname(os.path.dirname(sys.argv[0])) -- paths = [os.path.join(here, 'etc', 'supervisord.conf'), -- os.path.join(here, 'supervisord.conf'), -- 'supervisord.conf', 'etc/supervisord.conf', -- '/etc/supervisord.conf'] -+ paths = [ '%%PREFIX%%/etc/supervisord.conf' ] - config = None - for path in paths: - if os.path.exists(path): +- searchpaths = [os.path.join(here, 'etc', 'supervisord.conf'), +- os.path.join(here, 'supervisord.conf'), +- 'supervisord.conf', 'etc/supervisord.conf', +- '/etc/supervisord.conf'] ++ searchpaths = [ '/usr/local/etc/supervisord.conf' ] + self.searchpaths = searchpaths + + def default_configfile(self): Modified: head/sysutils/py-supervisor/pkg-plist ============================================================================== --- head/sysutils/py-supervisor/pkg-plist Sun Aug 25 05:17:05 2013 (r325327) +++ head/sysutils/py-supervisor/pkg-plist Sun Aug 25 05:39:31 2013 (r325328) @@ -318,6 +318,7 @@ etc/supervisord.conf.sample %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/ui/images/button_refresh.gif %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/ui/images/button_restart.gif %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/ui/images/button_stop.gif +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/ui/images/icon.png %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/ui/images/rule.gif %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/ui/images/state0.gif %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/ui/images/state1.gif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308250539.r7P5dWgV047420>