Hi,
here's an update to supervisor 4.1.0, while here switch here to py3, and
remove the dependency on py-meld3 (now bundled within supervisor per
changelog) and no need for the TDEP on mock (was for py < 3.3). All
tests pass fine here, and that would allow us to cvs rm www/py-meld3,
supervisor being the only consumer for now.
looking for feedback and testing from actual supervisor users.
Landry
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/supervisor/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile 12 Jul 2019 20:49:52 -0000 1.14
+++ Makefile 17 Mar 2020 12:44:50 -0000
@@ -2,7 +2,7 @@
COMMENT= system to monitor and control processes
-MODPY_EGG_VERSION = 4.0.2
+MODPY_EGG_VERSION = 4.1.0
DISTNAME= supervisor-${MODPY_EGG_VERSION}
CATEGORIES= sysutils
@@ -18,10 +18,7 @@
MODPY_SETUPTOOLS= Yes
-RUN_DEPENDS= www/py-meld3
-TEST_DEPENDS= devel/py-mock \
- www/py-meld3
-
+MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
SUBST_VARS+= VARBASE
pre-configure:
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/supervisor/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo 4 May 2019 15:08:44 -0000 1.9
+++ distinfo 17 Mar 2020 12:44:50 -0000
@@ -1,2 +1,2 @@
-SHA256 (supervisor-4.0.2.tar.gz) = VgRFfaT7idhQ54wSggX+STjJJ3+HMBiFszyUxgNh5XU=
-SIZE (supervisor-4.0.2.tar.gz) = 434408
+SHA256 (supervisor-4.1.0.tar.gz) = Lchv4EdulF5hSD1hTOss9Pk7lSguskO995JiGZQ2A4M=
+SIZE (supervisor-4.1.0.tar.gz) = 459020
Index: patches/patch-supervisor_skel_sample_conf
===================================================================
RCS file:
/cvs/ports/sysutils/supervisor/patches/patch-supervisor_skel_sample_conf,v
retrieving revision 1.6
diff -u -r1.6 patch-supervisor_skel_sample_conf
--- patches/patch-supervisor_skel_sample_conf 4 May 2019 15:08:44 -0000
1.6
+++ patches/patch-supervisor_skel_sample_conf 17 Mar 2020 12:44:50 -0000
@@ -2,8 +2,8 @@
Index: supervisor/skel/sample.conf
--- supervisor/skel/sample.conf.orig
+++ supervisor/skel/sample.conf
-@@ -13,7 +13,7 @@
- ; "command=bash -c 'foo ; bar'" will truncate to "command=bash -c 'foo ".
+@@ -20,7 +20,7 @@
+ ; is deleted, supervisorctl will be unable to connect to supervisord.
[unix_http_server]
-file=/tmp/supervisor.sock ; the path to the socket file
@@ -11,7 +11,7 @@
;chmod=0700 ; socket file mode (default 0700)
;chown=nobody:nogroup ; socket file uid:gid owner
;username=user ; default is no username (open server)
-@@ -25,11 +25,11 @@ file=/tmp/supervisor.sock ; the path to the socket f
+@@ -42,11 +42,11 @@ file=/tmp/supervisor.sock ; the path to the socket f
;password=123 ; default is no password (open server)
[supervisord]
@@ -25,7 +25,7 @@
nodaemon=false ; start in foreground if true; default false
minfds=1024 ; min. avail startup file descriptors; default
1024
minprocs=200 ; min. avail process descriptors;default 200
-@@ -54,7 +54,7 @@ supervisor.rpcinterface_factory = supervisor.rpcinterf
+@@ -71,7 +71,7 @@ supervisor.rpcinterface_factory = supervisor.rpcinterf
; or inet_http_server section.
[supervisorctl]
@@ -34,7 +34,7 @@
;serverurl=http://127.0.0.1:9001 ; use an http:// url to specify an inet
socket
;username=chris ; should be same as in [*_http_server] if set
;password=123 ; should be same as in [*_http_server] if set
-@@ -73,7 +73,7 @@ serverurl=unix:///tmp/supervisor.sock ; use a unix://
+@@ -90,7 +90,7 @@ serverurl=unix:///tmp/supervisor.sock ; use a unix://
;umask=022 ; umask for process (default None)
;priority=999 ; the relative start priority (default 999)
;autostart=true ; start at supervisord start (default: true)
@@ -43,7 +43,7 @@
;startretries=3 ; max # of serial start failures when starting
(default 3)
;autorestart=unexpected ; when to restart if exited after running
(def: unexpected)
;exitcodes=0 ; 'expected' exit codes used with autorestart
(default 0)
-@@ -95,7 +95,7 @@ serverurl=unix:///tmp/supervisor.sock ; use a unix://
+@@ -112,7 +112,7 @@ serverurl=unix:///tmp/supervisor.sock ; use a unix://
;stderr_capture_maxbytes=1MB ; number of bytes in 'capturemode' (default 0)
;stderr_events_enabled=false ; emit events on stderr writes (default false)
;stderr_syslog=false ; send stderr to syslog with process name
(default false)
@@ -52,7 +52,7 @@
;serverurl=AUTO ; override serverurl computation (childutils)
; The sample eventlistener section below shows all possible eventlistener
-@@ -112,7 +112,7 @@ serverurl=unix:///tmp/supervisor.sock ; use a unix://
+@@ -129,7 +129,7 @@ serverurl=unix:///tmp/supervisor.sock ; use a unix://
;umask=022 ; umask for process (default None)
;priority=-1 ; the relative start priority (default -1)
;autostart=true ; start at supervisord start (default: true)
@@ -61,7 +61,7 @@
;startretries=3 ; max # of serial start failures when starting
(default 3)
;autorestart=unexpected ; autorestart if exited after running (def:
unexpected)
;exitcodes=0 ; 'expected' exit codes used with autorestart
(default 0)
-@@ -132,7 +132,7 @@ serverurl=unix:///tmp/supervisor.sock ; use a unix://
+@@ -149,7 +149,7 @@ serverurl=unix:///tmp/supervisor.sock ; use a unix://
;stderr_logfile_backups=10 ; # of stderr logfile backups (0 means none,
default 10)
;stderr_events_enabled=false ; emit events on stderr writes (default false)
;stderr_syslog=false ; send stderr to syslog with process name
(default false)
@@ -70,7 +70,7 @@
;serverurl=AUTO ; override serverurl computation (childutils)
; The sample group section below shows all possible group values. Create one
-@@ -148,5 +148,5 @@ serverurl=unix:///tmp/supervisor.sock ; use a unix://
+@@ -165,5 +165,5 @@ serverurl=unix:///tmp/supervisor.sock ; use a unix://
; interpreted as relative to this file. Included files *cannot*
; include files themselves.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/supervisor/pkg/PLIST,v
retrieving revision 1.6
diff -u -r1.6 PLIST
--- pkg/PLIST 4 May 2019 15:08:44 -0000 1.6
+++ pkg/PLIST 17 Mar 2020 12:44:51 -0000
@@ -14,97 +14,130 @@
lib/python${MODPY_VERSION}/site-packages/supervisor-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/supervisor-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/supervisor/__init__.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/supervisor/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/supervisor/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/${MODPY_PYCACHE}childutils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/${MODPY_PYCACHE}confecho.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/${MODPY_PYCACHE}datatypes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/${MODPY_PYCACHE}dispatchers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/${MODPY_PYCACHE}events.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/${MODPY_PYCACHE}http_client.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/${MODPY_PYCACHE}loggers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/${MODPY_PYCACHE}options.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/${MODPY_PYCACHE}pidproxy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/${MODPY_PYCACHE}poller.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/${MODPY_PYCACHE}process.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/${MODPY_PYCACHE}rpcinterface.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/${MODPY_PYCACHE}socket_manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/${MODPY_PYCACHE}states.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/${MODPY_PYCACHE}supervisorctl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/${MODPY_PYCACHE}supervisord.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/${MODPY_PYCACHE}templating.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/${MODPY_PYCACHE}web.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/${MODPY_PYCACHE}xmlrpc.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/childutils.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/childutils.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/compat.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/compat.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/confecho.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/confecho.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/datatypes.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/datatypes.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/dispatchers.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/dispatchers.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/events.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/events.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/http.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/http.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/http_client.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/http_client.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/loggers.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/loggers.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/
lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/__init__.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/${MODPY_PYCACHE}asynchat_25.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/${MODPY_PYCACHE}asyncore_25.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/${MODPY_PYCACHE}auth_handler.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/${MODPY_PYCACHE}counter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/${MODPY_PYCACHE}default_handler.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/${MODPY_PYCACHE}filesys.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/${MODPY_PYCACHE}http_date.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/${MODPY_PYCACHE}http_server.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/${MODPY_PYCACHE}producers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/${MODPY_PYCACHE}xmlrpc_handler.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/asynchat_25.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/asynchat_25.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/asyncore_25.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/asyncore_25.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/auth_handler.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/auth_handler.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/counter.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/counter.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/default_handler.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/default_handler.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/filesys.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/filesys.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/http_date.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/http_date.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/http_server.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/http_server.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/logger.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/logger.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/producers.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/producers.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/util.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/util.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/xmlrpc_handler.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/xmlrpc_handler.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/options.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/options.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/pidproxy.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/pidproxy.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/poller.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/poller.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/process.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/process.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/rpcinterface.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/rpcinterface.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/scripts/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/supervisor/scripts/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/supervisor/scripts/${MODPY_PYCACHE}loop_eventgen.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/scripts/${MODPY_PYCACHE}loop_listener.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/scripts/${MODPY_PYCACHE}sample_commevent.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/scripts/${MODPY_PYCACHE}sample_eventlistener.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/scripts/${MODPY_PYCACHE}sample_exiting_eventlistener.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/scripts/loop_eventgen.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/scripts/loop_eventgen.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/scripts/loop_listener.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/scripts/loop_listener.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/scripts/sample_commevent.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/scripts/sample_commevent.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/scripts/sample_eventlistener.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/scripts/sample_eventlistener.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/scripts/sample_exiting_eventlistener.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/scripts/sample_exiting_eventlistener.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/skel/
lib/python${MODPY_VERSION}/site-packages/supervisor/skel/sample.conf
@sample ${SYSCONFDIR}/supervisord.conf
lib/python${MODPY_VERSION}/site-packages/supervisor/socket_manager.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/socket_manager.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/states.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/states.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/supervisorctl.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/supervisorctl.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/supervisord.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/supervisord.pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/templating.py
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/__init__.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/tests/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/supervisor/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/supervisor/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/tests/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/tests/${MODPY_PYCACHE}test_childutils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/tests/${MODPY_PYCACHE}test_confecho.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/tests/${MODPY_PYCACHE}test_datatypes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/tests/${MODPY_PYCACHE}test_dispatchers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/tests/${MODPY_PYCACHE}test_end_to_end.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/tests/${MODPY_PYCACHE}test_events.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/tests/${MODPY_PYCACHE}test_http.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/tests/${MODPY_PYCACHE}test_http_client.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/tests/${MODPY_PYCACHE}test_loggers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/tests/${MODPY_PYCACHE}test_options.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/tests/${MODPY_PYCACHE}test_poller.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/tests/${MODPY_PYCACHE}test_process.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/tests/${MODPY_PYCACHE}test_rpcinterfaces.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/tests/${MODPY_PYCACHE}test_socket_manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/tests/${MODPY_PYCACHE}test_states.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/tests/${MODPY_PYCACHE}test_supervisorctl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/tests/${MODPY_PYCACHE}test_supervisord.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/tests/${MODPY_PYCACHE}test_templating.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/tests/${MODPY_PYCACHE}test_web.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/tests/${MODPY_PYCACHE}test_xmlrpc.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/base.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/tests/base.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/${MODPY_PYCACHE}listener.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/${MODPY_PYCACHE}spew.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/${MODPY_PYCACHE}test_1231.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/${MODPY_PYCACHE}unkillable_spew.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/donothing.conf
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/example/
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/example/included.conf
-lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/example/issue-1184.conf
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/include.conf
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/issue-1054.conf
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/issue-1224.conf
+lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/issue-1231.conf
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/issue-565.conf
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/issue-638.conf
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/issue-663.conf
@@ -112,49 +145,29 @@
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/issue-835.conf
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/issue-836.conf
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/listener.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/listener.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/spew.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/spew.pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/test_1231.py
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/unkillable_spew.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/unkillable_spew.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_childutils.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_childutils.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_confecho.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_confecho.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_datatypes.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_datatypes.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_dispatchers.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_dispatchers.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_end_to_end.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_end_to_end.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_events.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_events.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_http.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_http.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_http_client.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_http_client.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_loggers.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_loggers.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_options.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_options.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_poller.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_poller.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_process.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_process.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_rpcinterfaces.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_rpcinterfaces.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_socket_manager.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_socket_manager.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_states.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_states.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_supervisorctl.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_supervisorctl.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_supervisord.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_supervisord.pyc
+lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_templating.py
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_web.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_web.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_xmlrpc.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_xmlrpc.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/ui/
lib/python${MODPY_VERSION}/site-packages/supervisor/ui/images/
lib/python${MODPY_VERSION}/site-packages/supervisor/ui/images/button_refresh.gif
@@ -173,9 +186,7 @@
lib/python${MODPY_VERSION}/site-packages/supervisor/ui/tail.html
lib/python${MODPY_VERSION}/site-packages/supervisor/version.txt
lib/python${MODPY_VERSION}/site-packages/supervisor/web.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/web.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/xmlrpc.py
-lib/python${MODPY_VERSION}/site-packages/supervisor/xmlrpc.pyc
share/doc/supervisor/
share/doc/supervisor/Makefile
share/doc/supervisor/api.rst