Feature/wsl

.github/workflows/ci.yml

@@ -10,57 +10,65 @@
   cancel-in-progress: true
 jobs:
   build-test-images:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu-latest ]
     steps:
       - uses: actions/checkout@v4
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Build service TEST image 
         env:
           DOCKER_BUILDKIT: 1
         run: |
           docker build \
             -f service/Dockerfile.test \
             -t local/service-test:ci \
             service
       - name: Save images for downstream jobs
         run: |
           docker save local/service-test:ci | gzip > service-test.tar.gz
       - uses: actions/upload-artifact@v4
         with:
           name: test-images
           path: service-test.tar.gz
   service-tests:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu-latest ]
     needs: build-test-images
     steps:
       - uses: actions/checkout@v4
       - uses: actions/download-artifact@v4
         with:
           name: test-images
       - name: Load images
         run: |
           gunzip -c service-test.tar.gz | docker load
       - name: Prepare report dir on host (mounted into /reports)
         run: mkdir -p service/reports/ci
       - name: Run service tests
         run: |
           docker compose -f docker-compose.test.yml run --rm   --entrypoint /bin/sh service_test -lc '
               python -m coverage run -m pytest
             '
       - name: Upload coverage xml
         uses: actions/upload-artifact@v4
         with:
           name: coverage-xml
           path: service/reports/ci/coverage.xml
           if-no-files-found: error
       - name: Cleanup
         env:
           DOCKER_BUILDKIT: 1
           HOST_UID: "1000"
           HOST_GID: "1000"
           DISPLAY: ":1"
           HOST_USERNAME: user
           HOST_GROUPNAME: group
         if: always()
         run: |

.github/workflows/codeql.yml

@@ -17,7 +17,7 @@ on:
   pull_request:
     branches: [ "main" ]
   schedule:
-    - cron: '32 14 * * 1'
+    - cron: '0 0 * * *'
 
 jobs:
   analyze:

.github/workflows/lint.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest ]
+        os: [ ubuntu-latest, windows-latest ]
         python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
     steps:
       - uses: actions/checkout@v4

.github/workflows/pytest.yml

@@ -0,0 +1,76 @@
+name: Pytest
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * *'
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+jobs:
+  tests:
+    name: pytest - ${{ matrix.os }} - py${{ matrix.python-version }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu-latest, windows-latest ]
+        python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
+    env:
+      PYTHONUTF8: "1"
+      PYTHONPATH: ${{ github.workspace }}/service
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache: "pip"
+
+      - name: Install deps (Ubuntu)
+        if: matrix.os == 'ubuntu-latest'
+        shell: bash
+        run: |
+          set -eux
+          python -m pip install -U pip
+          pip install -r service/requirements.test.txt
+          if [ -f service/pyproject.toml ] || [ -f service/setup.cfg ] || [ -f service/setup.py ]; then
+            pip install -e service
+          fi
+      - name: Install deps (Windows)
+        if: matrix.os == 'windows-latest'
+        shell: pwsh
+        run: |
+          $ErrorActionPreference = "Stop"
+          python -m pip install -U pip
+          pip install -r service/requirements.test.txt
+          $hasPythonProject = (Test-Path -Path 'service/pyproject.toml') -or
+                            (Test-Path -Path 'service/setup.cfg') -or
+                            (Test-Path -Path 'service/setup.py')
+          if ($hasPythonProject) {
+            python -m pip install -e service
+          } else {
+            Write-Host 'service packaging files not found; skipping'
+          }
+      - name: Show versions
+        shell: bash
+        run: |
+          python --version
+          pip --version
+          pytest --version
+          python -c "import sys,platform,os;print(platform.platform());print(sys.version);print('PYTHONPATH=',os.environ.get('PYTHONPATH'))"
+      - name: Run tests with coverage
+        shell: bash
+        run: |
+          python -m coverage run -m pytest -q
+          python -m coverage xml -o coverage.xml
+      - name: Upload coverage.xml
+        uses: actions/upload-artifact@v4
+        with:
+          name: coverage-${{ matrix.os }}-py${{ matrix.python-version }}
+          path: coverage.xml
+          if-no-files-found: error
+

README.md

@@ -2,6 +2,7 @@
 
 [![CI](https://github.com/europanite/standard_python_environment/actions/workflows/ci.yml/badge.svg)](https://github.com/europanite/standard_python_environment/actions/workflows/ci.yml)
 [![Python Lint](https://github.com/europanite/standard_python_environment/actions/workflows/lint.yml/badge.svg)](https://github.com/europanite/standard_python_environment/actions/workflows/lint.yml)
+[![Pytest](https://github.com/europanite/standard_python_environment/actions/workflows/pytest.yml/badge.svg)](https://github.com/europanite/standard_python_environment/actions/workflows/pytest.yml)
 [![pages-build-deployment](https://github.com/europanite/standard_python_environment/actions/workflows/pages/pages-build-deployment/badge.svg)](https://github.com/europanite/standard_python_environment/actions/workflows/pages/pages-build-deployment)
 [![CodeQL Advanced](https://github.com/europanite/standard_python_environment/actions/workflows/codeql.yml/badge.svg)](https://github.com/europanite/standard_python_environment/actions/workflows/codeql.yml)
 

docker-compose.yml

@@ -20,7 +20,6 @@ services:
       --port=8888
       --no-browser
       --NotebookApp.token=''
-      --notebook-dir=/NotebookApp
     volumes:
       - /tmp/.X11-unix:/tmp/.X11-unix
       - ./service/app:/app

service/app/main.ipynb

@@ -18,6 +18,38 @@
     "# write your code.\n",
     "print(\"Hello Jupyter\")"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "c9833438-76bb-4358-8771-9ee2f0e96c18",
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "5acecb0d-c4a4-4108-946a-9d4bd59cd45c",
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "3fd2a5e2-5a62-4159-ab9a-385476aee2c9",
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "934e26ad-62df-4b70-b531-992684787463",
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {
@@ -36,7 +68,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.11"
+   "version": "3.12.12"
   }
  },
  "nbformat": 4,

service/app/tests/test_notebook.py

@@ -6,7 +6,7 @@
 
 
 def test_workspace_notebook_runs_and_prints_hello():
-    nb_path = Path("/app/main.ipynb")
+    nb_path = Path(__file__).resolve().parents[1] / "main.ipynb"
     assert nb_path.exists(), f"Notebook not found: {nb_path}"
 
     nb = nbformat.read(str(nb_path), as_version=4)

service/pyproject.toml

@@ -14,3 +14,15 @@ exclude = [
 [tool.ruff.lint]
 select = ["E", "F", "I"]
 ignore = []
+
+[build-system]
+requires = ["setuptools>=68", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "standard_python_environment"
+version = "0.0.0"
+requires-python = ">=3.9"
+
+[tool.setuptools]
+packages = ["app", "data"]

service/requirements.test.txt

@@ -1,4 +1,5 @@
 # write required libraries.
+-r requirements.txt
 pytest==8.4.2
 pytest-cov==5.0.0
 ruff==0.13.1