build: attempt at fixing ci, updated submodules

snowy1220 · Oct 4, 2020 · b91e719 · b91e719
1 parent 59f3f93
commit b91e719
Show file tree

Hide file tree

Showing 8 changed files with 107 additions and 104 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -88,6 +88,7 @@ jobs:
       shell: bash
       run: |
         source venv/bin/activate || source venv/Scripts/activate
+        poetry install  # run again to ensure we have the correct version of PyInstaller
         make package
     - name: Package dmg
       if: startsWith(runner.os, 'macOS')

diff --git a/Makefile b/Makefile
@@ -150,7 +150,6 @@ dist/ActivityWatch.app: aw-qt/media/logo/logo.icns
 	pyinstaller --clean --noconfirm --windowed aw.spec
 
 package:
-	pip install 'setuptools<45.0.0'  # workaround for https://github.com/pypa/setuptools/issues/1963#issuecomment-573675633
 	mkdir -p dist/activitywatch
 #
 	make --directory=aw-watcher-afk package

diff --git a/aw-client b/aw-client
diff --git a/aw-core b/aw-core
diff --git a/aw-server b/aw-server
diff --git a/aw-watcher-afk b/aw-watcher-afk
diff --git a/aw-watcher-window b/aw-watcher-window
diff --git a/poetry.lock b/poetry.lock
+30 −2		aw_watcher_window/macos.py
+5 −0		aw_watcher_window/main.py
+125 −37		poetry.lock
+3 −0		pyproject.toml