diff --git a/.travis.yml b/.travis.yml index 27bf3c68..841c9fa4 100644 --- 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 index 514e593f..37d914e8 100644 --- 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 index fcbb07a7..b6694675 100644 --- a/poetry.lock +++ b/poetry.lock @@ -306,7 +306,7 @@ docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] testing = ["jaraco.itertools", "func-timeout"] [metadata] -content-hash = "d46994e3e58f7a0613bacce4128b8cd9b3ae5ea3652cf33e1bda73406e4ec134" +content-hash = "8c296249df49a6d5abb880b14c59b343ae8b2b266a5c198833d3b2511fe356eb" python-versions = "^3.6" [metadata.files] diff --git a/pyproject.toml b/pyproject.toml index 6d1e73d3..351a668a 100644 --- 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"]