pull request

.coveragerc

@@ -1,2 +1,2 @@
 [run]
-omit = ./venv/*,*tests*,*__init__.py,*.pyw
+omit = *__init__.py,*.pyw,./venv/*,*tests*

.editorconfig

@@ -3,23 +3,23 @@
 root = true
 
 [*]
-indent_style = space
-indent_size = 4
-trim_trailing_whitespace = true
-insert_final_newline = true
 charset = utf-8
 end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
 
-[*.yml]
-indent_size = 2
+[*.bat]
+end_of_line = crlf
+indent_style = tab
 
 [*.md]
 insert_final_newline = false
 trim_trailing_whitespace = false
 
-[*.bat]
-indent_style = tab
-end_of_line = crlf
+[*.yml]
+indent_size = 2
 
 [LICENSE]
 insert_final_newline = false

.github/workflows/pytest.yml

@@ -4,6 +4,9 @@ on:
     types: [opened, synchronize, reopened, ready_for_review, unlabeled]
     branches:
       - develop
+  push:
+    branches:
+      - develop
 
 jobs:
   build:
@@ -13,7 +16,7 @@ jobs:
     runs-on: ubuntu-22.04
 
     strategy:
-      fail-fast: False
+      fail-fast: false
       matrix:
         python-version:
           - "3.8"
@@ -92,14 +95,15 @@ jobs:
 
     - name: Install Python dependencies
       run: |
-        pip install -r requirements-tests.txt
-        pip install -r requirements-dev.txt
+        pip install -r requirements-tests.txt -r requirements-dev.txt
 
     - name: Build DisplayCAL
       run: |
         sudo chmod a+rw /etc/udev/rules.d
         python3 -m build
-        pip install dist/DisplayCAL-*.whl
+        ls -l dist/
+        wheel_file=$(ls dist/DisplayCAL-*.whl)
+        pip install $wheel_file
 
     - name: Test with pytest
       run: |
@@ -111,3 +115,74 @@ jobs:
         name: code-coverage-report-${{ env.py_version }}-${{ matrix.wx-version }}
         path: htmlcov
         retention-days: 10
+
+  windows:
+    name: Test with Python ${{ matrix.python-version }} on Windows
+    runs-on: windows-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version:
+          - "3.8"
+          - "3.9"
+          - "3.10"
+          - "3.11"
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set Environment Variables
+      run: |
+        $py_version = "${{ matrix.python-version }}" -replace '\.', ''
+        echo "py_version=$py_version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        if ("${{ matrix.python-version }}" -eq "3.8") {
+          echo "add_dir_str=${{ matrix.python-version }}" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        } elseif ("${{ matrix.python-version }}" -eq "3.9") {
+          echo "add_dir_str=${{ matrix.python-version }}" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        } elseif ("${{ matrix.python-version }}" -eq "3.10") {
+          echo "add_dir_str=cpython-310" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        } elseif ("${{ matrix.python-version }}" -eq "3.11") {
+          echo "add_dir_str=cpython-311" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        } elseif ("${{ matrix.python-version }}" -eq "3.12") {
+          echo "add_dir_str=cpython-312" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        }
+
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python-version }}
+
+    - name: Update pip
+      run: |
+        python -m pip install --upgrade pip
+        pip install wheel
+
+    # - name: Install wxPython
+    #   run: |
+    #     pip install -U wxPython
+
+    - name: Install Python dependencies
+      run: |
+        pip install -r requirements-tests.txt -r requirements-dev.txt
+
+    # - name: Compile C-Extensions
+    #   run: |
+    #     python -m build
+    #     ls -l dist/
+    #     $wheel_file = Get-ChildItem -Path dist -Filter DisplayCAL-*.whl
+    #     pip install $wheel_file.FullName
+    #     $PYPATH = Get-Command python | Select-Object -ExpandProperty Source
+    #     $PYDIR = Split-Path $PYPATH
+    #     Copy-Item -Path "$PYDIR\Lib\site-packages\DisplayCAL\lib64\python${{ env.py_version }}\RealDisplaySizeMM.*.pyd" -Destination "./DisplayCAL/lib64/python${{ env.py_version }}/"
+
+    - name: Test with pytest
+      run: |
+        python -m pytest --verbose -n auto -W ignore --color=yes --cov=. --cov-report html
+
+    - name: Archive code coverage results
+      uses: actions/upload-artifact@v4
+      with:
+        name: code-coverage-report-${{ env.py_version }}-windows
+        path: htmlcov
+        retention-days: 10

.gitignore

@@ -1,33 +1,34 @@
+__pycache__/
 .DS_Store
-/.venv/
-.vscode/
-/DisplayCAL/__version__.py
-/build/
-/dist/
-/venv/
 .venv*/
-/INSTALLED_FILES
-/MANIFEST.in
-MANIFEST.in
-/VERSION
-__pycache__/
+.vscode/
+*.blend1
+*.code-workspace
+/.coverage
 /.pytest_cache/
-/tests/data/icc/Monitor 1 #1 2022-03-09 16-13 D6500 2.2 F-S XYZLUT+MTX.B2A1.post.CLUT.png
-/tests/data/icc/Monitor 1 #1 2022-03-09 16-13 D6500 2.2 F-S XYZLUT+MTX.B2A1.post.CLUT.smooth.png
-/DisplayCAL.egg-info/top_level.txt
+/.venv/
+/build/
+/DisplayCAL.egg-info/dependency_links.txt
+/DisplayCAL.egg-info/PKG-INFO
 /DisplayCAL.egg-info/requires.txt
 /DisplayCAL.egg-info/SOURCES.txt
-/DisplayCAL.egg-info/PKG-INFO
-/DisplayCAL.egg-info/dependency_links.txt
-*.blend1
-/.coverage
-/DisplayCAL/ref/*.log
+/DisplayCAL.egg-info/top_level.txt
+/DisplayCAL/__version__.py
+/DisplayCAL/lib64/python310/*.so
+/DisplayCAL/lib64/python311/*.pyd
 /DisplayCAL/lib64/python38/*.so
 /DisplayCAL/lib64/python39/*.so
-/DisplayCAL/lib64/python310/*.so
 /DisplayCAL/lib64/RealDisplaySizeMM.cpython-310-darwin.so
 /DisplayCAL/lib64/RealDisplaySizeMM.cpython-311-darwin.so
 /DisplayCAL/lib64/RealDisplaySizeMM.cpython-312-darwin.so
+/DisplayCAL/ref/*.log
+/dist/
+/INSTALLED_FILES
+/MANIFEST.in
+/tests/data/icc/Monitor 1 #1 2022-03-09 16-13 D6500 2.2 F-S XYZLUT+MTX.B2A1.post.CLUT.png
+/tests/data/icc/Monitor 1 #1 2022-03-09 16-13 D6500 2.2 F-S XYZLUT+MTX.B2A1.post.CLUT.smooth.png
+/venv/
+/VERSION
 cacert.pem
-*.code-workspace
-main.py
+main.py
+MANIFEST.in