From 2f31f9bef7af2f6dd0d9de13e09149545a5c3d99 Mon Sep 17 00:00:00 2001
From: Insoleet <insomniak.fr@gmail.com>
Date: Mon, 1 Feb 2016 17:00:27 +0100
Subject: [PATCH] Squashed commit of the following:
commit 5d5d7f2c9620745b7fe22d4023e5f00ef57da406
Author: Insoleet <insomniak.fr@gmail.com>
Date: Mon Feb 1 16:59:34 2016 +0100
Version 0.12.dev3
commit 4c4cac3753612f43d768472945fef1acbe86a9b1
Author: Insoleet <insomniak.fr@gmail.com>
Date: Mon Feb 1 16:34:14 2016 +0100
Disable console / debug
commit 8cc826d9aa1a9afd9d0e516a9147d669fb8f33df
Author: Insoleet <insomniak.fr@gmail.com>
Date: Mon Feb 1 16:01:52 2016 +0100
Try with installing six and packaging
commit a6e5d44461903225b4e84b5e0281f60fb4fe0e53
Author: Insoleet <insomniak.fr@gmail.com>
Date: Mon Feb 1 15:35:33 2016 +0100
Try with hook for pkg_resources
commit b99472c65bbc56cc07a5cd8a26074195b724f43f
Author: Insoleet <insomniak.fr@gmail.com>
Date: Mon Feb 1 15:03:44 2016 +0100
Use pyinstaller 3.1.1
commit 1c51cbbb8f02605e37cbb7e7a5c2e3977782804e
Author: Insoleet <insomniak.fr@gmail.com>
Date: Mon Feb 1 13:49:58 2016 +0100
Fix QT_PLUGIN_PATH
commit be67fe14151d3d2449c1f33aeb135c71cde757eb
Author: Insoleet <insomniak.fr@gmail.com>
Date: Mon Feb 1 13:30:33 2016 +0100
Enable console and debug
---
appveyor.yml | 2 +-
ci/appveyor/build.cmd | 4 +++-
hooks/hook-pkg_resources.py | 12 ++++++++++++
src/sakia/__init__.py | 2 +-
4 files changed, 17 insertions(+), 3 deletions(-)
create mode 100644 hooks/hook-pkg_resources.py
diff --git a/appveyor.yml b/appveyor.yml
index 33178e85..59fa0afa 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -40,7 +40,7 @@ install:
- "set PATH=%QTDIR%\\bin;%PATH%"
- "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
- - "SET QT_PLUGIN_PATH=%%QTDIR%%\\plugins"
+ - "SET QT_PLUGIN_PATH=%QTDIR%\\plugins"
- choco install -y vcredist2015
- "%CMD_IN_ENV% conda config --set always_yes yes --set changeps1 no"
- "%CMD_IN_ENV% conda config --add channels inso/channel/sakia"
diff --git a/ci/appveyor/build.cmd b/ci/appveyor/build.cmd
index c8feff24..4eb6a091 100644
--- a/ci/appveyor/build.cmd
+++ b/ci/appveyor/build.cmd
@@ -12,7 +12,9 @@ pyrcc5 -version
lrelease -version
pip install -r requirements.txt
-pip install https://github.com/pyinstaller/pyinstaller/archive/develop.zip
+pip install pyinstaller
+pip install six
+pip install packaging
python gen_resources.py
if %errorlevel% neq 0 exit /b 1s
diff --git a/hooks/hook-pkg_resources.py b/hooks/hook-pkg_resources.py
new file mode 100644
index 00000000..1dd01e3f
--- /dev/null
+++ b/hooks/hook-pkg_resources.py
@@ -0,0 +1,12 @@
+#-----------------------------------------------------------------------------
+# Copyright (c) 2005-2016, PyInstaller Development Team.
+#
+# Distributed under the terms of the GNU General Public License with exception
+# for distributing bootloader.
+#
+# The full license is in the file COPYING.txt, distributed with this software.
+#-----------------------------------------------------------------------------
+
+
+from PyInstaller.utils.hooks import collect_submodules
+hiddenimports = collect_submodules('pkg_resources._vendor')
\ No newline at end of file
diff --git a/src/sakia/__init__.py b/src/sakia/__init__.py
index e1705a2b..140a57a2 100644
--- a/src/sakia/__init__.py
+++ b/src/sakia/__init__.py
@@ -1,2 +1,2 @@
-__version_info__ = ('0', '12', 'dev1')
+__version_info__ = ('0', '12', 'dev3')
__version__ = '.'.join(__version_info__)
--
GitLab