ci: downgraded setuptools as workaround for PyInstaller issue

snowy1220 · Mar 23, 2020 · 35c4fc6 · 35c4fc6
1 parent d55f36c
commit 35c4fc6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -32,13 +32,13 @@ jobs:
      env:
       - DEPLOY=true
       - 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=12
-      - TRAVIS_PYTHON_VERSION=3.6.8
+   #- os: windows
+   #  language: sh
+   #  python: 3.6.8
+   #  env:
+   #   - DEPLOY=false  # set to true when tested and AppVeyor is deprecated
+   #   - TRAVIS_NODE_VERSION=12
+   #   - TRAVIS_PYTHON_VERSION=3.6.8
   allow_failures:
    - os: windows
 

diff --git a/Makefile b/Makefile
@@ -150,6 +150,7 @@ 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/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -25,6 +25,7 @@ pyinstaller = "3.5"
 psutil = "^5.7.0"
 pywin32-ctypes = {version = "^0.2.0", platform = "win32"}
 pefile = {version = "^2019.4.18", platform = "win32"}
+setuptools = "<45.0.0"  # workaround for https://github.com/pypa/setuptools/issues/1963#issuecomment-573675633
 
 [build-system]
 requires = ["poetry>=0.12"]