Release v0.8.1 (#308)

Release v0.8.1
ActivityWatch · Nov 12, 2019 · 2be6697 · 2be6697
2 parents 4cccfa5 + d054564
commit 2be6697
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -150,7 +150,7 @@ deploy:
   provider: GitHub
   auth_token:
     secure: fI8Ar/HiYNXcmeXQct/yzkKeEF4MHdYgP5/XL7uHKNs4lhPyUmT6GSltcLwkqk45
-  artifact: /.*\.zip/
+  artifact: /.*\.(zip|exe)/
   draft: true
   prerelease: true
   on:

diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ language: python
 python: 3.6
 
 env:
- - TRAVIS_NODE_VERSION=8
+ - TRAVIS_NODE_VERSION=12
 
 services:
  - mongodb
@@ -15,20 +15,20 @@ matrix:
      python: 3.6
      env:
       - DEPLOY=true
-      - TRAVIS_NODE_VERSION=8
+      - TRAVIS_NODE_VERSION=12
    - os: osx
      osx_image: xcode10.1
      language: generic
      python: null
      env:
       - DEPLOY=true
-      - TRAVIS_NODE_VERSION=8
+      - TRAVIS_NODE_VERSION=12
    - os: windows
      language: sh
      python: 3.6.8
      env:
       - DEPLOY=false  # set to true when tested and AppVeyor is deprecated
-      - TRAVIS_NODE_VERSION=8
+      - TRAVIS_NODE_VERSION=12
       - TRAVIS_PYTHON_VERSION=3.6.8
 
 before_install:

diff --git a/aw-core b/aw-core
diff --git a/aw-server b/aw-server
diff --git a/scripts/package/package-all.sh b/scripts/package/package-all.sh
@@ -2,6 +2,8 @@
 
 set -e
 
+echoerr() { echo "$@" 1>&2; }
+
 function get_platform() {
     # Will return "linux" for GNU/Linux
     #   I'd just like to interject for a moment...
@@ -16,8 +18,11 @@ function get_platform() {
         _platform="windows";
     elif [[ $_platform == "mingw"* ]]; then
         _platform="windows";
-    elif [[ $_platform == "cygwin"* ]]; then
-        echo "ERROR: cygwin is not a valid platform";
+    elif [[ $_platform == "linux" ]]; then
+        # Nothing to do
+        true;
+    else
+        echoerr "ERROR: $_platform is not a valid platform";
         exit 1;
     fi
 
@@ -62,7 +67,7 @@ function build_zip() {
 }
 
 function build_setup() {
-    filename="activitywatch-setup-${version}-${platform}-${arch}.exe"
+    filename="activitywatch-${version}-${platform}-${arch}-setup.exe"
     echo "Name of package will be: $filename"
 
     choco install -y innosetup
@@ -72,7 +77,6 @@ function build_setup() {
     echo "Setup built!"
 }
 
-
 build_zip
 if [[ $platform == "windows"* ]]; then
     build_setup
+1 −1		.travis.yml
+2 −6		appveyor.yml
+2 −2		aw_datastore/__init__.py
+3 −3		aw_datastore/datastore.py
+1 −1		aw_datastore/storages/__init__.py
+2 −2		aw_datastore/storages/memory.py
+3 −3		aw_datastore/storages/mongodb.py
+1 −1		aw_datastore/storages/peewee.py
+25 −2		aw_query/functions.py
+10 −6		aw_query/query2.py
+4 −0		aw_transform/__init__.py
+1 −1		aw_transform/chunk_events_by_key.py
+62 −0		aw_transform/classify.py
+7 −3		aw_transform/merge_events_by_keys.py
+10 −18		aw_transform/split_url_events.py
+56 −18		tests/test_query2.py
+62 −21		tests/test_transforms.py
+1 −1		aw-webui
+18 −2		aw_server/api.py
+2 −1		aw_server/rest.py
+23 −0		tests/test_server.py