diff --git a/appveyor.yml b/appveyor.yml index 99aecd6..c46f2ba 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,21 +1,11 @@ image: Visual Studio 2017 environment: - TWINE_USERNAME: mazurwiktor - # Note: TWINE_PASSWORD is set in Appveyor settings. - matrix: - # Stable 64-bit MSVC - - channel: stable - target: x86_64-pc-windows-msvc - PYTHON: "C:\\Python36-x64" - PYTHON_SCRIPTS: "C:\\Python36-x64\\Scripts" - PYTHON_LIB: "C:\\Python36-x64\\libs\\python36.lib" - # Stable 32-bit MSVC - - channel: stable - target: i686-pc-windows-msvc - PYTHON: "C:\\Python36" - PYTHON_SCRIPTS: "C:\\Python36\\Scripts" - PYTHON_LIB: "C:\\Python36\\libs\\python36.lib" - + # Stable 64-bit MSVC + - channel: stable + target: x86_64-pc-windows-msvc + PYTHON: "C:\\Python36-x64" + PYTHON_SCRIPTS: "C:\\Python36-x64\\Scripts" + PYTHON_LIB: "C:\\Python36-x64\\libs\\python36.lib" # From https://github.com/starkat99/appveyor-rust/blob/master/appveyor.yml install: @@ -23,27 +13,20 @@ install: - SET PATH=%PYTHON_SCRIPTS%;%path% - python --version - python -m pip install --upgrade pip - - python -m pip install --upgrade virtualenv + - choco install nsis build_script: - - python -m venv env - - ps: .\env\Scripts\activate.ps1 - - python -m pip install dataclasses - - python -m pip install -v -r requirements.txt - - pyinstaller -F -w -i assets\albion-stats-icon.ico --add-data src\assets;src\assets --add-data src\scripts;src\scripts albion-online-stats.py - - pyinstaller -F -i assets\albion-stats-icon.ico --add-data src\assets;src\assets --add-data src\scripts;src\scripts -n albion-online-stats-cmd albion-online-stats.py - - ps: deactivate + - python -m pip install pynsist + - pynsist installer.cfg test_script: - python -m pip install tox - python -m tox -e ut after_build: -- ps: mv dist\albion-online-stats.exe albion-online-stats-$Env:target.exe -- ps: mv dist\albion-online-stats-cmd.exe albion-online-stats-$Env:target-cmd.exe - ps: ls artifacts: - path: albion-online-stats*.exe + path: build\nsis\Albion_Online_Stats*.exe name: binary deploy: provider: GitHub diff --git a/installer.cfg b/installer.cfg new file mode 100644 index 0000000..cfc3d66 --- /dev/null +++ b/installer.cfg @@ -0,0 +1,32 @@ +[Application] +name=Albion Online Stats +version=0.11.6 +entry_point=src:run +icon=assets/albion-stats-icon.ico + +[Python] +version=3.6.3 + +[Include] +# Packages from PyPI that your application requires, one per line +# These must have wheels on PyPI: +pypi_wheels = + requests==2.23.0 + urllib3==1.25.9 + chardet==3.0.4 + certifi==2020.4.5.1 + idna==2.9 + dataclasses==0.7 + pyside2==5.15.0 + shiboken2==5.15.0 + toml==0.10.1 + pillow==7.1.2 + pyaoaddons==0.2.0 + +# To bundle packages which don't publish wheels, or to include directly wheel files +# from a directory, see the docs on the config file. + +# Other files and folders that should be installed +files = + LICENSE-MIT + LICENSE-APACHE \ No newline at end of file diff --git a/src/utils/version.py b/src/utils/version.py index 5e20cd6..0104648 100644 --- a/src/utils/version.py +++ b/src/utils/version.py @@ -1,7 +1,7 @@ import os import requests -_version = "0.11.5" +_version = "0.11.6" latest_url = "https://github.com/mazurwiktor/albion-online-stats/releases/latest"