Merge branch 'master' into dev/macos-sign-and-notarize

ActivityWatch · Sep 11, 2021 · e67a663 · e67a663
2 parents 5e6ba5a + 551dc0f
commit e67a663
Show file tree

Hide file tree

Showing 16 changed files with 56 additions and 57 deletions.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -12,7 +12,7 @@ contact_links:
     url: https://forum.activitywatch.net/
     about: The preferred place for general discussion about ActivityWatch
   - name: "\U0001F4AD Discussion (on GitHub Discussions)"
-    url: https://forum.activitywatch.net/
+    url: https://github.com/ActivityWatch/activitywatch/discussions
     about: We're testing it out (but the forum is still the preferred place).
   - name: "\U0001F4AC Chat with us on Discord"
     url: https://discord.gg/dctJK6USjK

diff --git a/.github/stale.yml b/.github/stale.yml
@@ -1,5 +1,5 @@
 # Number of days of inactivity before an issue becomes stale
-daysUntilStale: 180
+daysUntilStale: 365
 # Number of days of inactivity before a stale issue is closed
 daysUntilClose: 14
 # Issues with these labels will never be considered stale

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -20,15 +20,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-18.04, windows-latest, macOS-latest]
+        os: [ubuntu-latest, windows-latest, macOS-latest]
         python_version: [3.8]
-        node_version: [12]
+        node_version: [16]
         experimental: [false]
-        include:
-          - os: ubuntu-18.04
-            python_version: 3.9
-            node_version: 12
-            experimental: true
+        #include:
+        #  - os: ubuntu-latest
+        #    python_version: 3.9
+        #    node_version: 16
+        #    experimental: true
     steps:
     - uses: actions/checkout@v2
       with:

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -20,7 +20,7 @@ To develop on ActivityWatch you'll first want to install from source. To do so,
 
 You might then want to read about the [architecture](https://activitywatch.readthedocs.io/en/latest/architecture.html) and the [data model](https://activitywatch.readthedocs.io/en/latest/buckets-and-events.html).
 
-If you want some code examples for how to write watchers or other types of clients, see the [documentation for writing watchers](https://activitywatch.readthedocs.io/en/latest/writing-watchers.html).
+If you want some code examples for how to write watchers or other types of clients, see the [documentation for writing watchers](https://docs.activitywatch.net/en/latest/examples/writing-watchers.html).
 
 
 ## How you can help

diff --git a/README.md b/README.md
@@ -42,9 +42,6 @@
   <a href="https://github.com/ActivityWatch/activitywatch/actions?query=branch%3Amaster">
     <img title="Build Status GitHub" src="https://github.com/ActivityWatch/activitywatch/workflows/Build/badge.svg?branch=master" />
   </a>
-  <a href="https://travis-ci.com/ActivityWatch/activitywatch">
-    <img title="Build Status Travis" src="https://travis-ci.com/ActivityWatch/activitywatch.svg?branch=master" />
-  </a>
   <a href="https://ci.appveyor.com/project/ErikBjare/activitywatch">
     <img title="Build Status Appveyor" src="https://ci.appveyor.com/api/projects/status/vm7g9sdfi2vgix6n?svg=true" />
   </a>

diff --git a/aw-client b/aw-client
diff --git a/aw-core b/aw-core
diff --git a/aw-qt b/aw-qt
diff --git a/aw-server b/aw-server
diff --git a/aw-server-rust b/aw-server-rust
diff --git a/aw-watcher-afk b/aw-watcher-afk
diff --git a/aw-watcher-window b/aw-watcher-window
diff --git a/aw.spec b/aw.spec
@@ -250,6 +250,7 @@ if platform.system() == "Darwin":
         entitlements_file=entitlements_file,
         version=current_release.lstrip('v'),
         info_plist={
+            "NSPrincipalClass": "NSApplication",
             "CFBundleExecutable": "MacOS/aw-qt",
             "CFBundleIconFile": "logo.icns",
             # This could be set to a more specific version string (including the commit id, for example)

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -20,9 +20,8 @@ mypy = "*"
 pytest = "*"
 pytest-cov = "*"
 pytest-benchmark = "*"
-#pyinstaller = "4.3"
-# Need latest PyInstaller for macOS signing stuff
-pyinstaller = {git = "https://github.com/pyinstaller/pyinstaller.git", branch="develop"}
+pyinstaller = "^4.5.1"
+#pyinstaller = {git = "https://github.com/pyinstaller/pyinstaller.git", branch="develop"}
 psutil = "^5.7.0"
 pywin32-ctypes = {version = "^0.2.0", platform = "win32"}
 pefile = {version = "^2019.4.18", platform = "win32"}

diff --git a/scripts/package/activitywatch-setup.iss b/scripts/package/activitywatch-setup.iss
@@ -20,8 +20,8 @@ AppVersion={#MyAppVersion}
 ;AppVerName={#MyAppName} {#MyAppVersion}
 AppPublisher={#MyAppPublisher}
 AppPublisherURL={#MyAppURL}
-AppSupportURL={#MyAppURL}
-AppUpdatesURL={#MyAppURL}
+AppSupportURL="https://github.com/ActivityWatch/activitywatch/issues"
+AppUpdatesURL="https://github.com/ActivityWatch/activitywatch/releases"
 DefaultDirName={autopf}\{#MyAppName}
 DisableProgramGroupPage=yes
 ; Uncomment the following line to run in non administrative install mode (install for current user only.)