From d81100a2e26f82a0e126bd6755359f13f7251490 Mon Sep 17 00:00:00 2001
From: Alberto Sottile <alby128@gmail.com>
Date: Mon, 11 Mar 2019 19:13:51 +0100
Subject: [PATCH] AppVeyor: upgrade Python and py2exe, embed TLS dependencies

---
 .appveyor.yml  | 18 +++++++++---------
 buildPy2exe.py | 11 +++++++----
 2 files changed, 16 insertions(+), 13 deletions(-)
 mode change 100644 => 100755 buildPy2exe.py

diff --git a/.appveyor.yml b/.appveyor.yml
index c746a4f..b2b1fc9 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,11 +1,11 @@
 branches:
   only:
-    - master
+    - setuptools
 
 environment:
   MINICONDA: "C:\\Miniconda"
-  PYTHON: "C:\\Python35"
-  PYTHON_VERSION: 3.5
+  PYTHON: "C:\\Python36"
+  PYTHON_VERSION: 3.6
   PYTHON_ARCH: 32
 
 platform: x86
@@ -19,12 +19,12 @@ init:
   - python --version
   - python -m pip install -U pip setuptools wheel
   - pip install -U pypiwin32==223
-  - pip install twisted
+  - pip install twisted[tls] certifi
   - pip install zope.interface
   - type nul > %PYTHON%\lib\site-packages\zope\__init__.py
-  - curl -L https://bintray.com/alby128/Syncplay/download_file?file_path=py2exe-0.9.2.2-py33.py34.py35-none-any.whl -o py2exe-0.9.2.2-py33.py34.py35-none-any.whl
-  - pip install py2exe-0.9.2.2-py33.py34.py35-none-any.whl
-  - del py2exe-0.9.2.2-py33.py34.py35-none-any.whl
+  - curl -L https://bintray.com/alby128/py2exe/download_file?file_path=py2exe-0.9.2.9-py36-none-any.whl -o py2exe-0.9.2.9-py36-none-any.whl
+  - pip install py2exe-0.9.2.9-py36-none-any.whl
+  - del py2exe-0.9.2.9-py36-none-any.whl
   - pip install shiboken2==5.12.0 PySide2==5.12.0
   - pip freeze
   
@@ -40,10 +40,10 @@ build: off
 artifacts:
   - path: 'syncplay_v$(ver)'
     type: zip
-    name: Syncplay_$(ver)_Portable
+    name: Syncplay_$(ver)_setuptools_Portable
 
   - path: Syncplay-$(ver)-Setup.exe
-    name: Syncplay-$(ver)-Setup
+    name: Syncplay-$(ver)-setuptools-Setup
 
 # Push artefact to S3 bucket and list all
 before_deploy:
diff --git a/buildPy2exe.py b/buildPy2exe.py
old mode 100644
new mode 100755
index e8254eb..6b15779
--- a/buildPy2exe.py
+++ b/buildPy2exe.py
@@ -690,6 +690,9 @@ guiIcons = [
     'resources/email_go.png',
     'resources/world_add.png', 'resources/film_add.png', 'resources/delete.png', 'resources/spinner.mng'
 ]
+
+guiIcons = ['syncplay/' + s for s in guiIcons]
+
 resources = [
     "syncplay/resources/icon.ico",
     "syncplay/resources/syncplay.png",
@@ -724,8 +727,8 @@ info = dict(
     options={
         'py2exe': {
             'dist_dir': OUT_DIR,
-            'packages': 'PySide2',
-            'includes': 'twisted, sys, encodings, datetime, os, time, math, liburl, ast, unicodedata, _ssl, win32pipe, win32file',
+            'packages': 'PySide2, cffi, OpenSSL, certifi',
+            'includes': 'twisted, sys, encodings, datetime, os, time, math, urllib, ast, unicodedata, _ssl, win32pipe, win32file',
             'excludes': 'venv, doctest, pdb, unittest, win32clipboard, win32pdh, win32security, win32trace, win32ui, winxpgui, win32process, Tkinter',
             'dll_excludes': 'msvcr71.dll, MSVCP90.dll, POWRPROF.dll',
             'optimize': 2,
@@ -737,5 +740,5 @@ info = dict(
     cmdclass={"py2exe": build_installer},
 )
 
-sys.argv.extend(['py2exe', '-p win32com ', '-i twisted.web.resource', '-p PySide2'])
-setup(**info)
+sys.argv.extend(['py2exe'])
+setup(**info)
\ No newline at end of file