Modernize things a bit. (#3)

Author: mrstegeman

.github/workflows/build.yml

@@ -0,0 +1,26 @@
+name: Build
+
+on:
+  pull_request:
+    branches:
+      - master
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install flake8
+      - name: Lint with flake8
+        run: |
+          python -m flake8 . --count --max-line-length=79 --statistics

.github/workflows/pythonapp.yml

@@ -0,0 +1,51 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+      - name: Set env
+        run: echo ::set-env name=RELEASE_VERSION::$(echo ${GITHUB_REF:11})
+      - name: Package project
+        run: |
+          ./package.sh
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1.0.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Release ${{ env.RELEASE_VERSION }}
+          draft: false
+          prerelease: false
+      - name: Upload Release Asset
+        id: upload-release-asset
+        uses: actions/upload-release-asset@v1.0.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: tide-calendar-adapter-${{ env.RELEASE_VERSION }}.tgz
+          asset_name: tide-calendar-adapter-${{ env.RELEASE_VERSION }}.tgz
+          asset_content_type: application/gnutar
+      - name: Upload Release Asset Checksum
+        id: upload-release-asset-checksum
+        uses: actions/upload-release-asset@v1.0.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: tide-calendar-adapter-${{ env.RELEASE_VERSION }}.tgz.sha256sum
+          asset_name: tide-calendar-adapter-${{ env.RELEASE_VERSION }}.tgz.sha256sum
+          asset_content_type: text/plain

.github/workflows/release.yml

@@ -1,4 +1,5 @@
 *.pyc
+*.sha256sum
 *.swp
 *.tgz
 lib/

.gitignore

@@ -11,6 +11,7 @@
 from pkg.tide_calendar_adapter import TideCalendarAdapter  # noqa
 
 
+_DEBUG = False
 _ADAPTER = None
 
 print = functools.partial(print, flush=True)
@@ -27,7 +28,7 @@ def cleanup(signum, frame):
 if __name__ == '__main__':
     signal.signal(signal.SIGINT, cleanup)
     signal.signal(signal.SIGTERM, cleanup)
-    _ADAPTER = TideCalendarAdapter(verbose=True)
+    _ADAPTER = TideCalendarAdapter(verbose=_DEBUG)
 
     # Wait until the proxy stops running, indicating that the gateway shut us
     # down.

main.py

@@ -45,5 +45,5 @@
     }
   },
   "short_name": "Tide",
-  "version": "0.2.1"
+  "version": "0.3.0"
 }

manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "tide-calendar-adapter",
   "display_name": "Tide Calendar",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "Tide calendar for Mozilla WebThings Gateway",
   "author": "Mozilla IoT",
   "main": "main.py",

package.json

@@ -1,6 +1,4 @@
-#!/bin/bash
-
-set -e
+#!/bin/bash -e
 
 version=$(grep version package.json | cut -d: -f2 | cut -d\" -f2)
 
@@ -20,8 +18,13 @@ find package -type d -empty -delete
 
 # Generate checksums
 cd package
-find . -type f \! -name SHA256SUMS -exec sha256sum {} \; >> SHA256SUMS
+find . -type f \! -name SHA256SUMS -exec shasum --algorithm 256 {} \; >> SHA256SUMS
 cd -
 
 # Make the tarball
-tar czf "tide-calendar-adapter-${version}.tgz" package
+TARFILE="tide-calendar-adapter-${version}.tgz"
+tar czf ${TARFILE} package
+
+shasum --algorithm 256 ${TARFILE} > ${TARFILE}.sha256sum
+
+rm -rf SHA256SUMS package

package.sh

@@ -47,7 +47,7 @@ def __init__(self, adapter, _id, station_id, unit):
                 self,
                 'lowTideTime',
                 {
-                    'label': 'Low Tide Time',
+                    'title': 'Low Tide Time',
                     'type': 'string',
                     'readOnly': True,
                 },
@@ -58,7 +58,7 @@ def __init__(self, adapter, _id, station_id, unit):
                 self,
                 'lowTideLevel',
                 {
-                    'label': 'Low Tide Level',
+                    'title': 'Low Tide Level',
                     'type': 'number',
                     'unit': 'foot' if self.unit == 'english' else 'meter',
                     'readOnly': True,
@@ -70,7 +70,7 @@ def __init__(self, adapter, _id, station_id, unit):
                 self,
                 'lowTide',
                 {
-                    'label': 'Low Tide',
+                    'title': 'Low Tide',
                     'type': 'boolean',
                     'readOnly': True,
                 },
@@ -81,7 +81,7 @@ def __init__(self, adapter, _id, station_id, unit):
                 self,
                 'highTideTime',
                 {
-                    'label': 'High Tide Time',
+                    'title': 'High Tide Time',
                     'type': 'string',
                     'readOnly': True,
                 },
@@ -92,7 +92,7 @@ def __init__(self, adapter, _id, station_id, unit):
                 self,
                 'highTideLevel',
                 {
-                    'label': 'High Tide Level',
+                    'title': 'High Tide Level',
                     'type': 'number',
                     'unit': 'foot' if self.unit == 'english' else 'meter',
                     'readOnly': True,
@@ -104,7 +104,7 @@ def __init__(self, adapter, _id, station_id, unit):
                 self,
                 'highTide',
                 {
-                    'label': 'High Tide',
+                    'title': 'High Tide',
                     'type': 'boolean',
                     'readOnly': True,
                 },
@@ -116,7 +116,7 @@ def __init__(self, adapter, _id, station_id, unit):
                 self,
                 'currentLevel',
                 {
-                    'label': 'Current Level',
+                    'title': 'Current Level',
                     'type': 'number',
                     'unit': 'foot' if self.unit == 'english' else 'meter',
                     'readOnly': True,