Merge pull request #4 from cgq-qgc/setup_azure_pipeline_and_build_exe

PR: Setup azure pipeline and build an exe

Author: jnsebgosselin

.gitignore

@@ -10,6 +10,12 @@ __pycache__/
 *.so
 
 # Distribution / packaging
+releases/Output
+releases/build
+releases/*.zip
+releases/*.sig
+releases/*.iss
+releases/*win_amd64
 .Python
 build/
 develop-eggs/
@@ -34,7 +40,6 @@ MANIFEST
 #  Usually these files are written by a python script from a template
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.
 *.manifest
-*.spec
 
 # Installer logs
 pip-log.txt

azure-pipelines.yml

@@ -1,21 +1,22 @@
 # Python package
 # Create and test a Python package on multiple Python versions.
-# Add steps that analyze code, save the dist with the build record, publish to a PyPI-compatible index, and more:
+# Add steps that analyze code, save the dist with the build record,
+# publish to a PyPI-compatible index, and more:
 # https://docs.microsoft.com/azure/devops/pipelines/languages/python
 
 trigger:
 - master
 
+variables:
+  AZURE: True
+  CODECOV_TOKEN: "e1a9c98d-d8db-471d-a31d-af2a535323cd"
+  CDPREP_OUTPUT_DIRNAME: 'cdprep_0.1.0.dev0_win_amd64'
+
 pool:
-  vmImage: 'ubuntu-latest'
+  vmImage: 'windows-2019'
+
 strategy:
   matrix:
-    Python27:
-      python.version: '2.7'
-    Python35:
-      python.version: '3.5'
-    Python36:
-      python.version: '3.6'
     Python37:
       python.version: '3.7'
 
@@ -28,9 +29,28 @@ steps:
 - script: |
     python -m pip install --upgrade pip
     pip install -r requirements.txt
+    pip install -r requirements-dev.txt
+    pip install pytest-azurepipelines
   displayName: 'Install dependencies'
 
 - script: |
-    pip install pytest pytest-azurepipelines
-    pytest
-  displayName: 'pytest'
+    python runtests.py
+  displayName: 'Run tests'
+  continueOnError: false
+
+- script: |
+    codecov
+  displayName: 'Run codecov'
+
+- script: |
+    python -m pip install pyinstaller==3.6 pywin32 tornado
+    set PYTHONPATH=$(Build.SourcesDirectory);%PYTHONPATH%
+    cd ./releases
+    pyinstaller.exe cdprep.spec
+    cd ..
+  displayName: 'Build package'
+
+- task: PublishPipelineArtifact@0
+  inputs:
+    artifactName: '$(CDPREP_OUTPUT_DIRNAME)'
+    targetPath: '$(Build.SourcesDirectory)/releases/$(CDPREP_OUTPUT_DIRNAME)'

cdprep/__init__.py

@@ -1,15 +1,14 @@
 # -*- coding: utf-8 -*-
-
 """
-GWHAT License Agreement (GNU-GPLv3)
+Climate Data Preprocessing Tool License Agreement (GNU-GPLv3)
 --------------------------------------
 
-Copyright (c) 2014-2018 GWHAT Project Contributors
-https://github.com/jnsebgosselin/gwhat
+Copyright (c) 2014-2020 Climate Data Preprocessing Tool Project Contributors
+https://github.com/cgq-qgc/climate-data-preprocessing-tool
 
-GWHAT is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
+limate Data Preprocessing Tool is free software: you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,

cdprep/app/__init__.py

@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+# -----------------------------------------------------------------------------
+# Copyright © Climate Data Preprocessing Tool Project Contributors
+# https://github.com/cgq-qgc/climate-data-preprocessing-tool
+#
+# This file is part of Climate Data Preprocessing Tool.
+# Licensed under the terms of the GNU General Public License.
+# -----------------------------------------------------------------------------

cdprep/mainwindow.py cdprep/app/mainwindow.pycdprep/mainwindow.py renamed to cdprep/app/mainwindow.py

@@ -7,15 +7,21 @@
 # Licensed under the terms of the GNU General Public License.
 # -----------------------------------------------------------------------------
 
-# ---- Standard imports
+from cdprep import __appname__
+print('Starting {}...'.format(__appname__))
+
+# ---- Setup the main Qt application.
 import sys
-import os
+from qtpy.QtWidgets import QApplication
+app = QApplication(sys.argv)
+
+# ---- Standard imports
 import os.path as osp
 import platform
 
 # ---- Third parties imports
 from appconfigs.base import get_home_dir
-from qtpy.QtCore import Qt
+from qtpy.QtCore import Qt, QPoint
 from qtpy.QtWidgets import (
     QApplication, QMainWindow, QToolBar, QToolButton, QLineEdit, QGridLayout,
     QLabel, QWidget, QFileDialog)
@@ -28,8 +34,7 @@
 from cdprep.gapfill_data.gapfill_weather_gui import WeatherDataGapfiller
 from cdprep.utils.qthelpers import (
     create_toolbar_stretcher, qbytearray_to_hexstate, hexstate_to_qbytearray)
-from cdprep.config.ospath import (
-    get_select_file_dialog_dir, set_select_file_dialog_dir)
+from cdprep.config.ospath import set_select_file_dialog_dir
 
 
 class MainWindow(QMainWindow):
@@ -49,17 +54,18 @@ def __init__(self):
             ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(
                 myappid)
 
-        self.data_downloader = WeatherStationDownloader(self)
+        self.data_downloader = None
 
         # Setup the toolbar.
         self.show_data_downloader_btn = QToolButton()
         self.show_data_downloader_btn.setIcon(get_icon('search_weather_data'))
         self.show_data_downloader_btn.setAutoRaise(True)
         self.show_data_downloader_btn.setToolTip("Download Data")
         self.show_data_downloader_btn.clicked.connect(
-            self.data_downloader.show)
+            self.show_data_downloader)
 
         toolbar = QToolBar('Main')
+        toolbar.setObjectName('main_toolbar')
         toolbar.setFloatable(False)
         toolbar.setMovable(False)
         toolbar.setIconSize(get_iconsize('normal'))
@@ -102,7 +108,8 @@ def set_workdir(self, workdir):
             self._workdir = workdir
             CONF.set('main', 'working_dir', workdir)
             self.workdir_ledit.setText(workdir)
-            self.data_downloader.workdir = workdir
+            if self.data_downloader is not None:
+                self.data_downloader.workdir = workdir
             self.gapfiller.set_workdir(workdir)
         else:
             self.set_workdir(get_home_dir())
@@ -118,6 +125,24 @@ def select_working_directory(self):
             set_select_file_dialog_dir(dirname)
             self.set_workdir(dirname)
 
+    def show_data_downloader(self):
+        """
+        Show the download data dialog.
+        """
+        if self.data_downloader is None:
+            self.data_downloader = WeatherStationDownloader(self)
+            self.data_downloader.workdir = self._workdir
+            self.data_downloader.show()
+            qr = self.data_downloader.frameGeometry()
+            wp = self.frameGeometry().width()
+            hp = self.frameGeometry().height()
+            cp = self.mapToGlobal(QPoint(wp/2, hp/2))
+            qr.moveCenter(cp)
+            self.data_downloader.move(qr.topLeft())
+        self.data_downloader.show()
+        self.data_downloader.activateWindow()
+        self.data_downloader.raise_()
+
     # ---- Main window settings
     def _restore_window_geometry(self):
         """
@@ -129,7 +154,7 @@ def _restore_window_geometry(self):
             hexstate = hexstate_to_qbytearray(hexstate)
             self.restoreGeometry(hexstate)
         else:
-            from gwhat.config.gui import INIT_MAINWINDOW_SIZE
+            from cdprep.config.gui import INIT_MAINWINDOW_SIZE
             self.resize(*INIT_MAINWINDOW_SIZE)
 
     def _save_window_geometry(self):
@@ -164,11 +189,29 @@ def closeEvent(self, event):
         self._save_window_geometry()
         self._save_window_state()
         self.gapfiller.close()
+        if self.data_downloader is not None:
+            self.data_downloader.close()
         event.accept()
 
 
+def except_hook(cls, exception, traceback):
+    """
+    Used to override the default sys except hook so that this application
+    doesn't automatically exit when an unhandled exception occurs.
+
+    See this StackOverflow answer for more details :
+    https://stackoverflow.com/a/33741755/4481445
+    """
+    sys.__excepthook__(cls, exception, traceback)
+
+
 if __name__ == '__main__':
-    app = QApplication(sys.argv)
-    mainwindow = MainWindow()
-    mainwindow.show()
+    sys.excepthook = except_hook
+    main = MainWindow()
+
+    if platform.system() == 'Windows':
+        from PyQt5.QtWidgets import QStyleFactory
+        app.setStyle(QStyleFactory.create('WindowsVista'))
+
+    main.show()
     sys.exit(app.exec_())

cdprep/app/tests/__init__.py

@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+# -----------------------------------------------------------------------------
+# Copyright © Climate Data Preprocessing Tool Project Contributors
+# https://github.com/cgq-qgc/climate-data-preprocessing-tool
+#
+# This file is part of Climate Data Preprocessing Tool.
+# Licensed under the terms of the GNU General Public License.
+# -----------------------------------------------------------------------------

cdprep/app/tests/test_mainwindow.py

@@ -0,0 +1,64 @@
+# -*- coding: utf-8 -*-
+# -----------------------------------------------------------------------------
+# Copyright © Climate Data Preprocessing Tool Project Contributors
+# https://github.com/cgq-qgc/climate-data-preprocessing-tool
+#
+# This file is part of Climate Data Preprocessing Tool.
+# Licensed under the terms of the GNU General Public License.
+# -----------------------------------------------------------------------------
+
+"""
+Tests for the mainwindow.
+"""
+
+# ---- Standard imports
+import os
+import os.path as osp
+os.environ['CDPREP_PYTEST'] = 'True'
+
+# ---- Third party imports
+from appconfigs.base import get_home_dir
+import pytest
+from qtpy.QtCore import QSize
+
+# ---- Local imports
+from cdprep.config.gui import INIT_MAINWINDOW_SIZE
+from cdprep.app.mainwindow import MainWindow, CONF
+
+
+# =============================================================================
+# ---- Fixtures
+# =============================================================================
+@pytest.fixture()
+def conf():
+    CONF.reset_to_defaults()
+
+
+@pytest.fixture(scope='module')
+def workdir(tmp_path_factory):
+    tmp_path = tmp_path_factory.mktemp("test_project")
+    return osp.join(tmp_path, 'mainwindow_test_project.gwp')
+
+
+@pytest.fixture()
+def mainwindow(qtbot, mocker, conf):
+    """A fixture for Gwire mainwindow."""
+    mainwindow = MainWindow()
+    qtbot.addWidget(mainwindow)
+    mainwindow.show()
+    qtbot.waitForWindowShown(mainwindow)
+    return mainwindow
+
+
+# =============================================================================
+# ---- Tests for MainWindow
+# =============================================================================
+def test_mainwindow_init(mainwindow):
+    """Test that the mainwindow is initialized correctly."""
+    assert mainwindow
+    assert mainwindow.size() == QSize(*INIT_MAINWINDOW_SIZE)
+    assert mainwindow._workdir == get_home_dir()
+
+
+if __name__ == "__main__":
+    pytest.main(['-x', __file__, '-v', '-rw', '-s'])

cdprep/config/gui.py

@@ -14,5 +14,5 @@
 YELLOWLIGHT = '#fcf7b6'
 LIGHTGRAY = '#F0F0F0'
 
-INIT_MAINWINDOW_SIZE = (1260, 740)
+INIT_MAINWINDOW_SIZE = (1028, 740)
 FRAME_SYLE = 22