Merge remote-tracking branch 'origin/master' into gevent-pool

Author: Joel Collins

.github/workflows/publish.yml

@@ -0,0 +1,39 @@
+name: Publish
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+        with:
+          fetch-depth: 1
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Poetry
+        uses: dschep/install-poetry-action@v1.3
+
+      - name: Set Poetry config
+        env:
+          POETRY_PYPI_TOKEN_PYPI: ${{ secrets.POETRY_PYPI_TOKEN_PYPI }}
+        run: |
+          poetry config virtualenvs.in-project false
+          poetry config virtualenvs.path ~/.virtualenvs
+          poetry config pypi-token.pypi "$POETRY_PYPI_TOKEN_PYPI"
+
+      - name: Install Dependencies
+        run: poetry install
+        if: steps.cache.outputs.cache-hit != 'true'
+
+      - name: Build with Poetry
+        run: poetry build
+
+      - name: Publish with Poetry
+        run: poetry publish

.github/workflows/ci.yml renamed to .github/workflows/test.yml

@@ -1,6 +1,10 @@
-name: CI
+name: Test
 
-on: [push]
+on:
+  push:
+  release:
+    types:
+      - created
 
 jobs:
   test:

labthings/server/representations.py

@@ -1,5 +1,9 @@
 from flask import make_response, current_app
-from json import dumps, JSONEncoder
+
+# Flask JSON encoder so we get UUID, datetime etc support
+from flask.json import JSONEncoder
+from json import dumps
+
 
 from ..core.utilities import PY3
 

pyproject.toml

@@ -2,7 +2,14 @@
 name = "labthings"
 version = "0.4.0"
 description = "Python implementation of LabThings, based on the Flask microframework"
+readme = "README.md"
+repository = "https://github.com/labthings/python-labthings/"
 authors = ["jtc42 <jtc9242@gmail.com>"]
+classifiers = [
+    "Topic :: System :: Hardware",
+    "Topic :: Software Development :: Libraries :: Application Frameworks",
+    "Topic :: Internet :: WWW/HTTP :: WSGI"
+]
 
 [tool.poetry.dependencies]
 python = "^3.6"