diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml new file mode 100644 index 0000000..046dd20 --- /dev/null +++ b/.github/workflows/pytest.yml @@ -0,0 +1,37 @@ +name: Python Tests + +# Trigger the workflow on push or pull request +on: + push: + branches: + - main + pull_request: + branches: + - main + +jobs: + test: + runs-on: ubuntu-latest + + strategy: + matrix: + python-version: [3.8, 3.9, 3.10, 3.11] + + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + + - name: Install dependencies + run: | + python -m pip install --upgrade pip + python -m pip install pytest + python -m pip install + + - name: Run tests + run: | + python -m pytest tests/ \ No newline at end of file diff --git a/app/main.py b/app/main.py index d9f23e2..4d69592 100644 --- a/app/main.py +++ b/app/main.py @@ -201,6 +201,7 @@ def open(self, file_paths=None): - dataframes (Excel) - saved work of SPECTROview (.maps, .spectra, .graphs) """ + if file_paths is None: # Initialize the last used directory from QSettings last_dir = self.settings.value("last_directory", "/") diff --git a/app/maps.py b/app/maps.py index 9a16efd..4e7e588 100644 --- a/app/maps.py +++ b/app/maps.py @@ -217,6 +217,7 @@ def process_old_format(self, map_df, map_name): def process_new_format(self, map_df, map_name): """Process new format wafer dataframe.""" + print('The support of new data format of SEMILAB is deactivated in this SPECTROview version') return for i in range(0, len(map_df), 2): coord_row = map_df.iloc[i] diff --git a/data_test/examples/ex_reading_all_suported_data b/data_test/examples/ex_reading_all_suported_data new file mode 100644 index 0000000..5fed4f9 --- /dev/null +++ b/data_test/examples/ex_reading_all_suported_data @@ -0,0 +1,43 @@ +import sys +import os +from pathlib import Path + +from PySide6.QtWidgets import QApplication +from PySide6.QtGui import QIcon + +from app.main import Main + +# DATA = Path(__file__).parent / "data" + +def ex_reading_all_supported_data(file_paths=None): + """Example of reading different supported .CSV and .txt data formats""" + app = QApplication() + window = Main() + app.setStyle("Fusion") + + if file_paths is not None: + window.open(file_paths=file_paths) + window.ui.show() + sys.exit(app.exec()) + + +if __name__ == "__main__": + # DIRNAME = os.path.dirname(__file__) + # DATA = os.path.join(DIRNAME, "data_test", "example", "spectroscopic_data") + # file_path_1 = os.path.join(DATA, 'spectrum1_1ML.txt') + # file_path_2 = os.path.join(DATA, 'spectrum4_3ML.txt') + # file_path_3 = os.path.join(DATA, '2Dmap_MoS2.txt') + # file_paths = ['file_path_1', 'file_path_2', 'file_path_3'] + # ex_reading_all_supported_data() + + DATA_DIR = Path(__file__).parent / "spectroscopic_data" + # DATA_DIR = DIRNAME / "data_test" / "example" / "spectroscopic_data" + file_paths = [str(file) for file in DATA_DIR.glob("*.txt")] + if file_paths: + ex_reading_all_supported_data(file_paths=file_paths) + else: + print(f"No supported data files found in {DATA_DIR}") + + + + \ No newline at end of file diff --git a/data_test/Spectra data/2Dmap_MoS2.txt b/data_test/spectroscopic_data/2Dmap_MoS2.txt similarity index 100% rename from data_test/Spectra data/2Dmap_MoS2.txt rename to data_test/spectroscopic_data/2Dmap_MoS2.txt diff --git a/data_test/Spectra data/2Dmap_NCTs.txt b/data_test/spectroscopic_data/2Dmap_NCTs.txt similarity index 100% rename from data_test/Spectra data/2Dmap_NCTs.txt rename to data_test/spectroscopic_data/2Dmap_NCTs.txt diff --git a/data_test/Spectra data/F550DB00 b/data_test/spectroscopic_data/F550DB00 similarity index 100% rename from data_test/Spectra data/F550DB00 rename to data_test/spectroscopic_data/F550DB00 diff --git a/data_test/Spectra data/Time-resolved_PL_map_MoS2.txt b/data_test/spectroscopic_data/Time-resolved_PL_map_MoS2.txt similarity index 100% rename from data_test/Spectra data/Time-resolved_PL_map_MoS2.txt rename to data_test/spectroscopic_data/Time-resolved_PL_map_MoS2.txt diff --git a/data_test/Spectra data/data_inline.xlsx b/data_test/spectroscopic_data/data_inline.xlsx similarity index 100% rename from data_test/Spectra data/data_inline.xlsx rename to data_test/spectroscopic_data/data_inline.xlsx diff --git a/data_test/Spectra data/spectrum1_1ML.txt b/data_test/spectroscopic_data/spectrum1_1ML.txt similarity index 100% rename from data_test/Spectra data/spectrum1_1ML.txt rename to data_test/spectroscopic_data/spectrum1_1ML.txt diff --git a/data_test/Spectra data/spectrum2_1ML.txt b/data_test/spectroscopic_data/spectrum2_1ML.txt similarity index 100% rename from data_test/Spectra data/spectrum2_1ML.txt rename to data_test/spectroscopic_data/spectrum2_1ML.txt diff --git a/data_test/Spectra data/spectrum3_3ML.txt b/data_test/spectroscopic_data/spectrum3_3ML.txt similarity index 100% rename from data_test/Spectra data/spectrum3_3ML.txt rename to data_test/spectroscopic_data/spectrum3_3ML.txt diff --git a/data_test/Spectra data/spectrum4_3ML.txt b/data_test/spectroscopic_data/spectrum4_3ML.txt similarity index 100% rename from data_test/Spectra data/spectrum4_3ML.txt rename to data_test/spectroscopic_data/spectrum4_3ML.txt diff --git a/data_test/Spectra data/spectrum5_12ML.txt b/data_test/spectroscopic_data/spectrum5_12ML.txt similarity index 100% rename from data_test/Spectra data/spectrum5_12ML.txt rename to data_test/spectroscopic_data/spectrum5_12ML.txt diff --git a/data_test/Spectra data/spectrum6_12ML.txt b/data_test/spectroscopic_data/spectrum6_12ML.txt similarity index 100% rename from data_test/Spectra data/spectrum6_12ML.txt rename to data_test/spectroscopic_data/spectrum6_12ML.txt diff --git a/data_test/Spectra data/wafer10_newformat.csv b/data_test/spectroscopic_data/wafer10_newformat.csv similarity index 100% rename from data_test/Spectra data/wafer10_newformat.csv rename to data_test/spectroscopic_data/wafer10_newformat.csv diff --git a/data_test/Spectra data/wafer4_process1.csv b/data_test/spectroscopic_data/wafer4_process1.csv similarity index 100% rename from data_test/Spectra data/wafer4_process1.csv rename to data_test/spectroscopic_data/wafer4_process1.csv diff --git a/data_test/Spectra data/wafer5_process2.csv b/data_test/spectroscopic_data/wafer5_process2.csv similarity index 100% rename from data_test/Spectra data/wafer5_process2.csv rename to data_test/spectroscopic_data/wafer5_process2.csv diff --git a/data_test/Spectra data/wafer6_process3.csv b/data_test/spectroscopic_data/wafer6_process3.csv similarity index 100% rename from data_test/Spectra data/wafer6_process3.csv rename to data_test/spectroscopic_data/wafer6_process3.csv diff --git a/data_test/Spectra data/wafer7_process2.csv b/data_test/spectroscopic_data/wafer7_process2.csv similarity index 100% rename from data_test/Spectra data/wafer7_process2.csv rename to data_test/spectroscopic_data/wafer7_process2.csv diff --git a/data_test/Spectra data/wafer8_process3.csv b/data_test/spectroscopic_data/wafer8_process3.csv similarity index 100% rename from data_test/Spectra data/wafer8_process3.csv rename to data_test/spectroscopic_data/wafer8_process3.csv diff --git a/tests/test_1.py b/tests/test_1.py new file mode 100644 index 0000000..77d41f2 --- /dev/null +++ b/tests/test_1.py @@ -0,0 +1,9 @@ +import pytest + +# from data_test.examples.ex_reading_all_suported_data import ex_reading_all_suported_data + + +def test_1(): + print('test pytest') + + \ No newline at end of file