Skip to content
Snippets Groups Projects
Commit 2f31f9be authored by inso's avatar inso
Browse files

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
parent d63811d1
No related branches found
No related tags found
No related merge requests found
...@@ -40,7 +40,7 @@ install: ...@@ -40,7 +40,7 @@ install:
- "set PATH=%QTDIR%\\bin;%PATH%" - "set PATH=%QTDIR%\\bin;%PATH%"
- "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
- "SET QT_PLUGIN_PATH=%%QTDIR%%\\plugins" - "SET QT_PLUGIN_PATH=%QTDIR%\\plugins"
- choco install -y vcredist2015 - choco install -y vcredist2015
- "%CMD_IN_ENV% conda config --set always_yes yes --set changeps1 no" - "%CMD_IN_ENV% conda config --set always_yes yes --set changeps1 no"
- "%CMD_IN_ENV% conda config --add channels inso/channel/sakia" - "%CMD_IN_ENV% conda config --add channels inso/channel/sakia"
......
...@@ -12,7 +12,9 @@ pyrcc5 -version ...@@ -12,7 +12,9 @@ pyrcc5 -version
lrelease -version lrelease -version
pip install -r requirements.txt 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 python gen_resources.py
if %errorlevel% neq 0 exit /b 1s if %errorlevel% neq 0 exit /b 1s
......
#-----------------------------------------------------------------------------
# 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
__version_info__ = ('0', '12', 'dev1') __version_info__ = ('0', '12', 'dev3')
__version__ = '.'.join(__version_info__) __version__ = '.'.join(__version_info__)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment