this updates puppetboard to 0.3.0, required are the updates to
www/py-flask-wtf, www/py-wtforms, and the two new ports www/py-commonmark and
devel/py-future.
works for me, I'd go on with it after the others are updated/imported.
other than that, comments, OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/puppetboard/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- Makefile 19 Apr 2017 14:26:24 -0000 1.22
+++ Makefile 17 Oct 2017 21:45:22 -0000
@@ -2,7 +2,7 @@
COMMENT= web interface to PuppetDB
-MODPY_EGG_VERSION= 0.2.2
+MODPY_EGG_VERSION= 0.3.0
DISTNAME= puppetboard-${MODPY_EGG_VERSION}
CATEGORIES= www
@@ -20,8 +20,9 @@
NO_TEST= Yes
PKG_ARCH= *
-RUN_DEPENDS= databases/py-puppetdb${MODPY_FLAVOR}>=0.3.2 \
- www/py-flask-wtf${MODPY_FLAVOR}>=0.9.4p0 \
+RUN_DEPENDS= databases/py-puppetdb${MODPY_FLAVOR}>=0.3.3 \
+ textproc/py-commonmark${MODPY_FLAVOR}>=0.7.2 \
+ www/py-flask-wtf${MODPY_FLAVOR}>=0.14.2 \
www/py-gunicorn${MODPY_FLAVOR} \
www/py-requests${MODPY_FLAVOR}
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/puppetboard/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo 19 Apr 2017 14:26:24 -0000 1.7
+++ distinfo 17 Oct 2017 21:45:22 -0000
@@ -1,2 +1,2 @@
-SHA256 (puppetboard-0.2.2.tar.gz) =
YN6cLpLqR+PWvPvP9I3meRdgsxuuMyGAku6fKsh4JbQ=
-SIZE (puppetboard-0.2.2.tar.gz) = 846428
+SHA256 (puppetboard-0.3.0.tar.gz) =
Xt0496ggg6deNJznWWe/lqQzH4dXcHETLdlhcIwn7bI=
+SIZE (puppetboard-0.3.0.tar.gz) = 847086
Index: patches/patch-puppetboard_app_py
===================================================================
RCS file: patches/patch-puppetboard_app_py
diff -N patches/patch-puppetboard_app_py
--- patches/patch-puppetboard_app_py 19 Apr 2017 14:26:24 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-puppetboard_app_py,v 1.5 2017/04/19 14:26:24 sebastia Exp $
-
-actually puppetboard only supports werkzeug <= 0.11.X
-but we have 0.12 already, so cope with it
-This requirement was only added for the 0.2.2 version,
-just too late
-
---- puppetboard/app.py.orig Wed Apr 19 16:14:19 2017
-+++ puppetboard/app.py Wed Apr 19 16:14:32 2017
-@@ -114,7 +114,7 @@ class NoContent(ex.HTTPException):
- code = 204
- description = '<p>No content</p'
-
--abort.mapping[204] = NoContent
-+#abort.mapping[204] = NoContent
-
- try:
- @app.errorhandler(204)
Index: patches/patch-puppetboard_templates_inventory_html
===================================================================
RCS file: patches/patch-puppetboard_templates_inventory_html
diff -N patches/patch-puppetboard_templates_inventory_html
--- patches/patch-puppetboard_templates_inventory_html 13 Feb 2017 14:22:00
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-puppetboard_templates_inventory_html,v 1.1 2017/02/13 14:22:00
sebastia Exp $
-
-fix inventory page table rendering see:
-https://github.com/voxpupuli/puppetboard/issues/361
-
---- puppetboard/templates/inventory.html.orig Mon Feb 13 13:32:15 2017
-+++ puppetboard/templates/inventory.html Mon Feb 13 13:32:25 2017
-@@ -12,7 +12,7 @@
- </tr>
- </thead>
- <tbody class="searchable">
-- {% for node, facts in fact_data.iteritems() %}
-+ {% for node, facts in fact_data.items() %}
- <tr>
- {% for name in fact_names %}
- <td><a href="{{url_for('node', env=current_env,
node_name=node)}}">{{facts.get(name, 'undef')}}</a></td>
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/puppetboard/pkg/PLIST,v
retrieving revision 1.10
diff -u -r1.10 PLIST
--- pkg/PLIST 19 Apr 2017 14:26:24 -0000 1.10
+++ pkg/PLIST 17 Oct 2017 21:45:22 -0000
@@ -16,10 +16,12 @@
puppetboard/puppetboard.egg-info/top_level.txt
puppetboard/puppetboard/__init__.py
puppetboard/puppetboard/app.py
+puppetboard/puppetboard/core.py
puppetboard/puppetboard/dailychart.py
puppetboard/puppetboard/default_settings.py.dist
@sample puppetboard/puppetboard/default_settings.py
puppetboard/puppetboard/docker_settings.py
+puppetboard/puppetboard/errors.py
puppetboard/puppetboard/forms.py
puppetboard/puppetboard/public/
puppetboard/puppetboard/static/
@@ -71,10 +73,12 @@
puppetboard/puppetboard/templates/catalog.html
puppetboard/puppetboard/templates/catalog_compare.html
puppetboard/puppetboard/templates/catalogs.html
+puppetboard/puppetboard/templates/catalogs.json.tpl
puppetboard/puppetboard/templates/fact.html
puppetboard/puppetboard/templates/facts.html
puppetboard/puppetboard/templates/index.html
puppetboard/puppetboard/templates/inventory.html
+puppetboard/puppetboard/templates/inventory.json.tpl
puppetboard/puppetboard/templates/layout.html
puppetboard/puppetboard/templates/metric.html
puppetboard/puppetboard/templates/metrics.html
@@ -87,6 +91,7 @@
puppetboard/puppetboard/templates/reports.json.tpl
puppetboard/puppetboard/tmp/
puppetboard/puppetboard/utils.py
+puppetboard/puppetboard/version.py
puppetboard/puppetboard_wsgi.py
puppetboard/setup.cfg
puppetboard/setup.py
@@ -95,6 +100,7 @@
puppetboard/test/test_app.py
puppetboard/test/test_app_error.py
puppetboard/test/test_docker_settings.py
+puppetboard/test/test_form.py
puppetboard/test/test_utils.py
@rcscript ${RCDIR}/puppetboard
@cwd ${LOCALBASE}/share/doc/pkg-readmes
