v0.8.1 windows fix (ActivityWatch#309)

v0.8.1 windows fix
Dhruv7201 · Nov 13, 2019 · adc44f7 · adc44f7
2 parents 2be6697 + 6d79424
commit adc44f7
Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -104,9 +104,6 @@ install:
   - "%CMD_IN_ENV% pip install --upgrade pyqt5"
   - "%CMD_IN_ENV% powershell scripts\\ci\\install_pyhook.ps1"
 
-  # Packaging dependencies
-  - "%CMD_IN_ENV% pip install pyinstaller==3.3.1"
-
   # Install the build dependencies of the project. If some dependencies contain
   # compiled extensions and are not provided as pre-built wheel packages,
   # pip will build them from source using the MSVC compiler matching the
@@ -142,7 +139,7 @@ after_test:
 artifacts:
   # Archive the generated packages in the ci.appveyor.com build report.
   - path: dist\*.zip
-  #- name:
+  - path: dist\*.exe
 
 deploy:
   # release: myproduct-v$(appveyor_build_version)  # optional

diff --git a/aw-core b/aw-core
diff --git a/aw-server b/aw-server
diff --git a/scripts/ci/install_pyhook.ps1 b/scripts/ci/install_pyhook.ps1
@@ -1,8 +1,8 @@
 function main ($arch) {
     If ( $arch -eq "64" ) {
-        $url="https://github.com/ActivityWatch/wheels/raw/master/pyHook-1.5.1-cp35-cp35m-win_amd64.whl"
+        $url="https://github.com/ActivityWatch/wheels/raw/master/pyHook-1.5.1-cp36-cp36m-win_amd64.whl"
     } ElseIf ( $arch -eq "32" ) {
-        $url="https://github.com/ActivityWatch/wheels/raw/master/pyHook-1.5.1-cp35-cp35m-win32.whl"
+        $url="https://github.com/ActivityWatch/wheels/raw/master/pyHook-1.5.1-cp36-cp36m-win32.whl"
     } Else {
         Write-Output "Invalid architecture"
         return -1
+161 −122		Pipfile.lock
+18 −17		requirements-dev.txt
+8 −5		requirements.txt
+112 −75		Pipfile.lock
+1 −1		aw-webui
+14 −13		requirements-dev.txt
+13 −22		requirements.txt