diff --git a/appveyor.yml b/appveyor.yml index adaaa3f08..147f81d98 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,6 +3,10 @@ init: - ps: iex ((new-object net.webclient).DownloadString('https://github.com/raw/appveyor/ci/master/scripts/enable-rdp.ps1')) +branches: + only: + - master + environment: COVERALLS_REPO_TOKEN: secure: EWOwdKViJaHUARUcX4FHynz8eAlQxwWYLgWFg7C+MH1vgVlkBkMPYOSH4ysxs3kT diff --git a/docs/conf.py b/docs/conf.py index 26966865b..4b81a2ffa 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -74,7 +74,7 @@ # The short X.Y version. version = '0.3' # The full version, including alpha/beta/rc tags. -release = '0.3.2' +release = '0.3.3' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/gwhat/__init__.py b/gwhat/__init__.py index 08c62e18d..c6e233285 100644 --- a/gwhat/__init__.py +++ b/gwhat/__init__.py @@ -53,11 +53,11 @@ import sys -version_info = (0, 3, 3, 'dev') +version_info = (0, 3, 3) __version__ = '.'.join(map(str, version_info)) __appname__ = 'GWHAT' __namever__ = __appname__ + " " + __version__ -__date__ = '14/05/2018' +__date__ = '12/12/2018' __project_url__ = "https://github.com/jnsebgosselin/gwhat" __releases_url__ = __project_url__ + "/releases" __releases_api__ = "https://github.com/gitapi/repos/jnsebgosselin/gwhat/releases" diff --git a/gwhat/ressources/WHAT_banner.svg b/gwhat/ressources/WHAT_banner.svg index ee162812a..26b47abfc 100644 --- a/gwhat/ressources/WHAT_banner.svg +++ b/gwhat/ressources/WHAT_banner.svg @@ -17,7 +17,7 @@ version="1.1" inkscape:version="0.92.2 (5c3e80d, 2017-08-06)" sodipodi:docname="WHAT_banner.svg" - inkscape:export-filename="C:\Users\jsgosselin\gwhat\gwhat\ressources\WHAT_banner_750px.png" + inkscape:export-filename="C:\Users\User\gwhat\gwhat\ressources\WHAT_banner_750px.png" inkscape:export-xdpi="37.954659" inkscape:export-ydpi="37.954659"> Version 0.3.2 + sodipodi:role="line">Version 0.3.3 diff --git a/gwhat/ressources/WHAT_banner_750px.png b/gwhat/ressources/WHAT_banner_750px.png index 484977a05..11d1d10ea 100644 Binary files a/gwhat/ressources/WHAT_banner_750px.png and b/gwhat/ressources/WHAT_banner_750px.png differ diff --git a/gwhat/ressources/splash.png b/gwhat/ressources/splash.png index 46a40db7e..8132890b0 100644 Binary files a/gwhat/ressources/splash.png and b/gwhat/ressources/splash.png differ diff --git a/gwhat/ressources/splash.svg b/gwhat/ressources/splash.svg index 91c8611c9..7a4a578a5 100644 --- a/gwhat/ressources/splash.svg +++ b/gwhat/ressources/splash.svg @@ -17,7 +17,7 @@ version="1.1" inkscape:version="0.92.2 (5c3e80d, 2017-08-06)" sodipodi:docname="splash.svg" - inkscape:export-filename="C:\Users\jsgosselin\gwhat\gwhat\ressources\splash.png" + inkscape:export-filename="C:\Users\User\gwhat\gwhat\ressources\splash.png" inkscape:export-xdpi="31.663383" inkscape:export-ydpi="31.663383"> Version 0.3.2 + sodipodi:role="line">Version 0.3.3 diff --git a/releases/GNU-GPLv3.pdf b/releases/GNU-GPLv3.pdf deleted file mode 100644 index 551a2b21a..000000000 Binary files a/releases/GNU-GPLv3.pdf and /dev/null differ diff --git a/releases/build_gwhat_on_windows.bat b/releases/build_gwhat_on_windows.bat index db344558a..6aef1821c 100644 --- a/releases/build_gwhat_on_windows.bat +++ b/releases/build_gwhat_on_windows.bat @@ -1,2 +1,2 @@ -..\environment\Scripts\python.exe ..\..\PyInstaller\pyinstaller.py gwhat.spec +..\environment\Scripts\pyinstaller.exe gwhat.spec pause \ No newline at end of file diff --git a/releases/gwhat.spec b/releases/gwhat.spec index b09dfb7ff..a59291cca 100644 --- a/releases/gwhat.spec +++ b/releases/gwhat.spec @@ -11,7 +11,7 @@ added_files = [('../gwhat/ressources/splash.png', 'ressources'), ] a = Analysis(['../gwhat/mainwindow.py'], - pathex=[], + pathex=['C:\\Program Files (x86)\\Windows Kits\\10\\Redist\\ucrt\\DLLs\\x64'], binaries=[], datas=added_files , hiddenimports=['h5py.defs', 'h5py.utils', 'h5py.h5ac', 'h5py._proxy', 'scipy.stats._continuous_distns', 'scipy._lib.messagestream'], @@ -39,6 +39,6 @@ coll = COLLECT(exe, upx=True, name='GWHAT') -shutil.copyfile("GNU-GPLv3.pdf", "dist/GNU-GPLv3.pdf") +shutil.copyfile("../LICENSE", "dist/LICENSE") shutil.copytree("Projects", "dist/Projects") os.rename('dist', 'gwhat_'+__version__+'_win_amd64')