fix pipeline, update test version

.github/workflows/test.yml

@@ -29,13 +29,16 @@ jobs:
       run: echo ::set-output name=version::$(python -c "import sys; print('-'.join(str(v) for v in sys.version_info))")
     - name: Install poetry
       run: |
-        curl -sL https://install.python-poetry.org | python - -y
+        pipx install "poetry>=1.3.0,<1.4.0"
     - name: Update path
       if: ${{ matrix.os != 'windows-latest' }}
       run: echo "$HOME/.local/bin" >> $GITHUB_PATH
     - name: Update Windows path
       if: ${{ matrix.os == 'windows-latest' }}
       run: echo "$APPDATA\Python\Scripts" >> $GITHUB_PATH
+    - name: install linux dependencies
+      if: ${{ matrix.os == 'ubuntu-latest' }}
+      run: sudo apt-get install libgl1 ffmpeg libsm6 libxext6 -y
     - name: Configure poetry
       run: poetry config virtualenvs.in-project true
     - name: Set up cache

pyproject.toml

@@ -19,13 +19,17 @@ sport-activities-features = "^0.3.13"
 QtAwesome = "^1.2.1"
 PyQt6 = "^6.5.1"
 sip = "^6.7.9"
+opencv-python-headless = "^4.8"
 
 [tool.poetry.dev-dependencies]
-pytest = "^5.2"
+pytest = "^6.2.5"
 
 [tool.poetry.scripts]
 sport-activities-features-gui = 'sport_activities_features_gui.main:main'
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
+
+[tool.pytest.ini_options]
+testpaths =  "./tests"

sport_activities_features_gui/logic/__init__.py

@@ -1,7 +1,7 @@
-from .Graphs import Graphs
-from .ImportData import ImportData
-from .MultiThread import MultiThread
-from .Transformations import Transformations
+from sport_activities_features_gui.logic.graphs import Graphs
+from sport_activities_features_gui.logic.import_data import ImportData
+from sport_activities_features_gui.logic.multi_thread import MultiThread
+from sport_activities_features_gui.logic.transformations import Transformations
 
 __all__ = [
     'Graphs',

sport_activities_features_gui/logic/ImportData.py → sport_activities_features_gui/logic/import_data.py

@@ -1,7 +1,7 @@
 import sys
 from PyQt6.QtWidgets import QFileDialog
-from sport_activities_features_gui.logic.MultiThread import MultiThread
-from sport_activities_features_gui.models.User import User
+from sport_activities_features_gui.logic.multi_thread import MultiThread
+from sport_activities_features_gui.models.user import User
 import pandas as pd
 
 class ImportData:

sport_activities_features_gui/logic/MultiThread.py → sport_activities_features_gui/logic/multi_thread.py

@@ -1,6 +1,5 @@
 from sport_activities_features.tcx_manipulation import TCXFile
 import pandas as pd
-from itertools import product
 from multiprocessing import Pool, Manager
 
 class MultiThread:  

sport_activities_features_gui/logic/Transformations.py → sport_activities_features_gui/logic/transformations.py

@@ -1,5 +1,4 @@
 # NORMALIZACIJA, STANDARDIZACIJA
-from sklearn.preprocessing import OneHotEncoder
 from scipy.stats import zscore
 import pandas as pd
 import numpy as np

sport_activities_features_gui/main.py

@@ -1,6 +1,6 @@
 import sys
 from PyQt6 import QtWidgets
-from sport_activities_features_gui.windows.ProfilesWindow import Ui_ProfilesWindow
+from sport_activities_features_gui.windows.profiles_window import Ui_ProfilesWindow
 
 def main():
     app = QtWidgets.QApplication(sys.argv)

sport_activities_features_gui/models/__init__.py

@@ -1,4 +1,4 @@
-from .User import User
+from sport_activities_features_gui.models.user import User
 
 __all__ = [
     'User',

sport_activities_features_gui/models/User.py → sport_activities_features_gui/models/user.py

@@ -1,7 +1,7 @@
 import pickle
 import pandas as pd
 import os
-from ..globalVars import *
+from ..global_vars import *
 
 
 def initGlobalUser(userName, settings):

sport_activities_features_gui/widgets/__init__.py

@@ -1,7 +1,8 @@
-from .ImportDataWidget import Ui_ImportDataWidget
-from .CalendarWidget import Ui_CalendarWidget
-from .TransformationsWidget import Ui_TransformationsWidget
-from .GraphsWidget import Ui_GraphsWidget
+from sport_activities_features_gui.widgets.import_data_widget import Ui_ImportDataWidget
+from sport_activities_features_gui.widgets.calendarwidget import Ui_CalendarWidget
+from sport_activities_features_gui.widgets.tansformations_widget import Ui_TransformationsWidget
+from sport_activities_features_gui.widgets.graphs_widget import Ui_GraphsWidget
+
 
 __all__ = [
     'Ui_ImportDataWidget',

sport_activities_features_gui/widgets/CalendarWidget.py → sport_activities_features_gui/widgets/calendarwidget.py

@@ -6,7 +6,7 @@
 from datetime import datetime
 import numpy as np
 
-from sport_activities_features_gui.models.User import User
+from sport_activities_features_gui.models.user import User
 
 
 class Ui_CalendarWidget(QWidget):

sport_activities_features_gui/widgets/GraphsWidget.py → sport_activities_features_gui/widgets/graphs_widget.py

@@ -1,4 +1,4 @@
-from PyQt6 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtWidgets
 from PyQt6.QtWidgets import QWidget, QMessageBox
 class Ui_GraphsWidget(QWidget):
     exampleGraphs = ["All biking distances ridden",
@@ -165,5 +165,5 @@ def on_combobox_changed(self, value):
             self.btnViewAttributesX.setEnabled(True)
 
 
-from sport_activities_features_gui.logic.Graphs import Graphs
-from sport_activities_features_gui.windows.ViewAttributesWindow import Ui_ViewAttributesWindow
+from sport_activities_features_gui.logic.graphs import Graphs
+from sport_activities_features_gui.windows.view_attributes_window import Ui_ViewAttributesWindow

sport_activities_features_gui/widgets/ImportDataWidget.py → sport_activities_features_gui/widgets/import_data_widget.py

@@ -1,8 +1,8 @@
-from PyQt6 import QtCore, QtWidgets
-from PyQt6.QtWidgets import QWidget, QFileDialog
-
 from sport_activities_features_gui.models import User
-from sport_activities_features_gui.logic.ImportData import ImportData
+from sport_activities_features_gui.logic.import_data import ImportData
+
+import PyQt6.QtCore as QtCore
+from PyQt6.QtWidgets import QWidget, QFileDialog, QVBoxLayout, QPushButton, QLabel, QTableView, QHBoxLayout, QSpacerItem, QSizePolicy
 
 from PyQt6 import sip
 from PyQt6.QtCore import Qt
@@ -43,43 +43,43 @@ def __init__(self):
         QWidget.__init__(self)
         self.setObjectName("ImportData")
         self.resize(800, 600)
-        self.verticalLayoutWidget = QtWidgets.QWidget(self)
+        self.verticalLayoutWidget = QWidget(self)
         self.verticalLayoutWidget.setGeometry(QtCore.QRect(0, 0, 800, 600))
         self.verticalLayoutWidget.setObjectName("verticalLayoutWidget")
-        self.verticalLayout = QtWidgets.QVBoxLayout(self.verticalLayoutWidget)
+        self.verticalLayout = QVBoxLayout(self.verticalLayoutWidget)
         self.verticalLayout.setContentsMargins(15, 15, 15, 15)
         self.verticalLayout.setObjectName("verticalLayout")
-        self.lbl_ImportData = QtWidgets.QLabel(self.verticalLayoutWidget)
+        self.lbl_ImportData = QLabel(self.verticalLayoutWidget)
         self.lbl_ImportData.setObjectName("lbl_ImportData")
         self.verticalLayout.addWidget(self.lbl_ImportData)
-        self.pushButton = QtWidgets.QPushButton(self.verticalLayoutWidget)
+        self.pushButton = QPushButton(self.verticalLayoutWidget)
         self.pushButton.setObjectName("pushButton")
         self.verticalLayout.addWidget(self.pushButton)
-        self.lbl_Output = QtWidgets.QLabel(self.verticalLayoutWidget)
+        self.lbl_Output = QLabel(self.verticalLayoutWidget)
         self.lbl_Output.setObjectName("lbl_Output")
         self.verticalLayout.addWidget(self.lbl_Output)
 
-        self.pte_Output = QtWidgets.QTableView(self.verticalLayoutWidget)
+        self.pte_Output = QTableView(self.verticalLayoutWidget)
         self.pte_Output.setEnabled(True)
         self.pte_Output.setObjectName("pte_Output")
         self.verticalLayout.addWidget(self.pte_Output)
 
-        self.lbl_ExportRawData = QtWidgets.QLabel(self.verticalLayoutWidget)
+        self.lbl_ExportRawData = QLabel(self.verticalLayoutWidget)
         self.lbl_ExportRawData.setObjectName("lbl_ExportRawData")
         self.verticalLayout.addWidget(self.lbl_ExportRawData)
-        self.horizontalLayout = QtWidgets.QHBoxLayout()
+        self.horizontalLayout = QHBoxLayout()
         self.horizontalLayout.setObjectName("horizontalLayout")
-        self.btn_Csv = QtWidgets.QPushButton(self.verticalLayoutWidget)
+        self.btn_Csv = QPushButton(self.verticalLayoutWidget)
         self.btn_Csv.setObjectName("btn_Csv")
         self.horizontalLayout.addWidget(self.btn_Csv)
-        self.btn_Json = QtWidgets.QPushButton(self.verticalLayoutWidget)
+        self.btn_Json = QPushButton(self.verticalLayoutWidget)
         self.btn_Json.setObjectName("btn_Json")
         self.horizontalLayout.addWidget(self.btn_Json)
-        self.btn_Pickle = QtWidgets.QPushButton(self.verticalLayoutWidget)
+        self.btn_Pickle = QPushButton(self.verticalLayoutWidget)
         self.btn_Pickle.setObjectName("btn_Pickle")
         self.horizontalLayout.addWidget(self.btn_Pickle)
         self.verticalLayout.addLayout(self.horizontalLayout)
-        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
+        spacerItem = QSpacerItem(20, 40, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
         self.verticalLayout.addItem(spacerItem)
 
         self.retranslateUi()

sport_activities_features_gui/widgets/TransformationsWidget.py → sport_activities_features_gui/widgets/tansformations_widget.py

@@ -1,9 +1,8 @@
-from PyQt6 import QtCore, QtGui, QtWidgets
-from PyQt6.QtWidgets import QMainWindow, QApplication, QMessageBox, QWidget
-from PyQt6.QtGui import QAction
-from sport_activities_features_gui.logic.ImportData import ImportData
-from sport_activities_features_gui.logic.Transformations import Transformations
-from sport_activities_features_gui.models.User import User
+from PyQt6 import QtCore, QtWidgets
+from PyQt6.QtWidgets import QWidget
+from sport_activities_features_gui.logic.import_data import ImportData
+from sport_activities_features_gui.logic.transformations import Transformations
+from sport_activities_features_gui.models.user import User
 import pandas as pd
 
 class Ui_TransformationsWidget(QWidget):

sport_activities_features_gui/windows/__init__.py

@@ -1,8 +1,7 @@
-
-from .ViewAttributesWindow import Ui_ViewAttributesWindow
-from .ProfilesWindow import Ui_AddProfileWindow as Ui_ProfileWindow
-from .AddProfile import Ui_AddProfileWindow as Ui_AddProfileWindow
-from .MainWindow import Ui_MainWindow
+from sport_activities_features_gui.windows.view_attributes_window import Ui_ViewAttributesWindow
+from sport_activities_features_gui.windows.profiles_window import Ui_AddProfileWindow as Ui_ProfileWindow
+from sport_activities_features_gui.windows.add_profile import Ui_AddProfileWindow as Ui_AddProfileWindow
+from sport_activities_features_gui.windows.main_window import Ui_MainWindow
 
 __all__ = [
     'Ui_ViewAttributesWindow',

sport_activities_features_gui/windows/AddProfile.py → sport_activities_features_gui/windows/add_profile.py

@@ -1,5 +1,5 @@
 from PyQt6.QtWidgets import QMainWindow, QWidget, QGroupBox, QLineEdit, QPushButton, QStatusBar
-from PyQt6 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore
 
 
 class Ui_AddProfileWindow(QMainWindow):

sport_activities_features_gui/windows/MainWindow.py → sport_activities_features_gui/windows/main_window.py

@@ -1,12 +1,12 @@
 from PyQt6.QtWidgets import QMainWindow
 from PyQt6 import QtCore, QtGui, QtWidgets
 
-from sport_activities_features_gui.widgets.GraphsWidget import Ui_GraphsWidget
-from sport_activities_features_gui.widgets.CalendarWidget import Ui_CalendarWidget
-from sport_activities_features_gui.widgets.TransformationsWidget import Ui_TransformationsWidget
-from sport_activities_features_gui.widgets.ImportDataWidget import Ui_ImportDataWidget
+from sport_activities_features_gui.widgets.graphs_widget import Ui_GraphsWidget
+from sport_activities_features_gui.widgets.calendarwidget import Ui_CalendarWidget
+from sport_activities_features_gui.widgets.tansformations_widget import Ui_TransformationsWidget
+from sport_activities_features_gui.widgets.import_data_widget import Ui_ImportDataWidget
 
-from sport_activities_features_gui.models.User import User
+from sport_activities_features_gui.models.user import User
 
 
 class Ui_MainWindow(QMainWindow):

sport_activities_features_gui/windows/ProfilesWindow.py → sport_activities_features_gui/windows/profiles_window.py

@@ -1,11 +1,11 @@
 import shutil
 from PyQt6 import QtCore, QtWidgets, QtGui
 from PyQt6.QtWidgets import QMainWindow, QMessageBox
-from sport_activities_features_gui.models.User import initGlobalUser, User
-from sport_activities_features_gui.windows.AddProfile import Ui_AddProfileWindow
-from sport_activities_features_gui.windows.MainWindow import Ui_MainWindow
+from sport_activities_features_gui.models.user import initGlobalUser, User
+from sport_activities_features_gui.windows.add_profile import Ui_AddProfileWindow
+from sport_activities_features_gui.windows.main_window import Ui_MainWindow
 import os
-from ..globalVars import *
+from ..global_vars import *
 
 
 class Ui_ProfilesWindow(QMainWindow):

tests/test_sport_activities_features_gui.py

@@ -2,4 +2,4 @@
 
 
 def test_version():
-    assert __version__ == '0.2.0'
+    assert __version__ == '0.2.1'