Merge pull request #113 from IIT-EnergySystemModels/ci/consolidate-workflows

ci: consolidate workflows into ci.yml, drop broken python-app.yml

Author: erikfilias

…ithub/workflows/python-package-conda.yml .github/workflows/ci.yml.github/workflows/python-package-conda.yml renamed to .github/workflows/ci.yml .github/workflows/python-package-conda.yml renamed to .github/workflows/ci.yml

@@ -1,6 +1,13 @@
-name: Python Package using Conda
+name: CI
 
-on: [push, pull_request]
+on:
+  push:
+    branches: [master, main]
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   build:
@@ -9,12 +16,11 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.12", "3.13"]
+        python-version: ["3.11", "3.12", "3.13"]
 
     steps:
       - uses: actions/checkout@v4
 
-      # 1) Install Conda (Miniforge) + activate an env
       - name: Set up Conda (Miniforge) + Python ${{ matrix.python-version }}
         uses: conda-incubator/setup-miniconda@v3
         with:
@@ -26,35 +32,29 @@ jobs:
           channels: conda-forge,defaults
           channel-priority: strict
 
-      # Important: ensures "conda activate ci" applies to all run steps
       - name: Show conda info
         shell: bash -l {0}
         run: |
           conda info
           python --version
-          which python || where python
 
-      # 2) Install uv (so "uv pip ..." works)
       - name: Set up uv
         uses: astral-sh/setup-uv@v3
 
-      # 3) Install dependencies
       - name: Install dependencies
         shell: bash -l {0}
         run: |
-          conda install -y -c conda-forge glpk cartopy
+          conda install -y -c conda-forge flake8 pytest
           uv pip install --system -r requirements.lock
+          uv pip install --system highspy
           pip install -e .
-          pip install highspy
 
-      - name: Lint with flake8
+      - name: Lint with flake8 (syntax errors only)
         shell: bash -l {0}
         run: |
-          conda install -y flake8
           flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
-          flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+
       - name: Test with pytest
         shell: bash -l {0}
         run: |
-          conda install -y pytest
-          pytest -vv tests/test_run.py
+          pytest -vv tests/

.github/workflows/colab-compatibility.yml

@@ -2,9 +2,13 @@ name: Google Colab Compatibility
 
 on:
   push:
-    branches: [ master, main ]
+    branches: [master, main]
   pull_request:
-    branches: [ master, main ]
+    branches: [master, main]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   colab-test:
@@ -16,22 +20,14 @@ jobs:
       uses: actions/setup-python@v5
       with:
         python-version: '3.11'
-
-    - name: Install system dependencies
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y glpk-utils
+        cache: 'pip'
 
     - name: Install openTEPES
       run: |
         python -m pip install --upgrade pip
         pip install .
         pip install pytest highspy
 
-    - name: Check version
-      run: |
-        python -c "import openTEPES; print(openTEPES.__version__)" || echo "No version defined"
-
     - name: Run tests
       run: |
         pytest -vv tests/test_run.py

.github/workflows/python-app.yml

@@ -38,3 +38,7 @@ requires = [
 
 [tool.flit.scripts]
 openTEPES_Main = "openTEPES:main"
+
+[tool.pytest.ini_options]
+testpaths = ["tests"]
+python_files = ["test_*.py"]

pyproject.toml

@@ -20,7 +20,7 @@ def case_7d_system(request):
             os.path.join(os.path.dirname(__file__), "../openTEPES")
         ),
         CaseName=case_name,
-        SolverName="glpk",  # or "gurobi" or "appsi_highs"
+        SolverName="highs",  # or "gurobi" or "glpk"
         pIndLogConsole=0,
         pIndOutputResults=0,
     )