setup: Bump to 0.0.4.

We actually had a function that would sort the facts tables by default
based on the first column but weren't using this. Testing with the
upcoming PuppetDB 1.6 made this bug surface because PuppetDB stopped
sorting facts by itself.

CHANGELOG.rst

@@ -4,6 +4,14 @@ Changelog
 
 This is the changelog for Puppetboard.
 
+0.0.4
+=====
+
+* Fix the sorting of the different tables containing facts.
+* Fix the license in our ``setup.py``. The license shouldn't be longer than
+  200 characters. We were including the full license tripping up tools like
+  bdist_rpm.
+
 0.0.3
 =====
 This release introduces a few big changes. The most obvious one is the

README.rst

@@ -172,7 +172,7 @@ If you don't need to change any settings you can skip the creation of the
 Now create a ``wsgi.py`` with the following content in the newly created
 puppetboard directory:
 
-.. code-block::
+.. code-block:: python
 
     from __future__ import absolute_import
     import os
@@ -185,7 +185,7 @@ Make sure this file is owned by the user and group the webserver runs as.
 
 The last thing we need to do is configure Apache:
 
-.. code-block::
+.. code-block:: apache
 
     <VirtualHost *:80>
         ServerName puppetboard.example.tld
@@ -240,7 +240,7 @@ If you don't need to change any settings you can skip the creation of the
 Now create a ``passenger_wsgi.py`` with the following content in the newly
 created puppetboard directory:
 
-.. code-block::
+.. code-block:: python
 
     from __future__ import absolute_import
     import os
@@ -264,7 +264,7 @@ this setting will take precedence over it.
 
 Now the only thing left to do is configure Apache:
 
-.. code-block::
+.. code-block:: apache
 
    <VirtualHost *:80>
        ServerName puppetboard.example.tld
@@ -311,7 +311,7 @@ If you don't need to change any settings you can skip the creation of the
 Now create a ``wsgi.py`` with the following content in the newly created
 puppetboard directory:
 
-.. code-block::
+.. code-block:: python
 
     from __future__ import absolute_import
     import os
@@ -333,7 +333,7 @@ Feel free to change the port to something other than ``9090``.
 
 The last thing we need to do is configure nginx to proxy the requests:
 
-.. code-block::
+.. code-block:: nginx
 
    upstream puppetboard {
        server 127.0.0.1:9090;
@@ -372,7 +372,7 @@ Apache
 
 Inside the ``VirtualHost``:
 
-.. code-block::
+.. code-block:: apache
 
     <Location "/">
         AuthType Basic
@@ -387,7 +387,7 @@ nginx
 
 Inside the ``location / {}`` block that has the ``uwsgi_pass`` directive:
 
-.. code-block::
+.. code-block:: nginx
 
     auth_basic "Puppetboard";
     auth_basic_user_file /path/to/a/file.htpasswd;

puppetboard/templates/_macros.html

@@ -2,7 +2,7 @@
 <div class="filter" style="margin-bottom:{{margin_bottom}}px;margin-top:{{margin_top}}px;">
   <input {% if autofocus %} autofocus="autofocus" {% endif %} style="width:100%" type="text" class="filter-table input-medium search-query" placeholder="Type here to filter">
 </div>
-<table class="filter-table table table-striped {% if condensed %}table-condensed{% endif%}" style="table-layout:fixed">
+<table class="filter-table facts table table-striped {% if condensed %}table-condensed{% endif%}" style="table-layout:fixed">
   <thead>
     <tr>
       {% if show_node %}

setup.py

@@ -9,7 +9,7 @@ if sys.argv[-1] == 'publish':
     os.system('python setup.py sdist upload')
     sys.exit()
 
-VERSION = "0.0.3"
+VERSION = "0.0.4"
 
 with codecs.open('README.rst', encoding='utf-8') as f:
     README = f.read()
@@ -17,9 +17,6 @@ with codecs.open('README.rst', encoding='utf-8') as f:
 with codecs.open('CHANGELOG.rst', encoding='utf-8') as f:
     CHANGELOG = f.read()
 
-with codecs.open('LICENSE', encoding='utf-8') as f:
-    LICENSE = f.read()
-
 setup(
     name='puppetboard',
     version=VERSION,
@@ -27,7 +24,7 @@ setup(
     author_email='daniele.sluijters+pypi@gmail.com',
     packages=find_packages(),
     url='https://github.com/nedap/puppetboard',
-    license=LICENSE,
+    license='Apache License 2.0',
     description='Web frontend for PuppetDB',
     include_package_data=True,
     long_description='\n'.join((README, CHANGELOG)),