Move to qgridnext (#2814)

* use qgridnext * rename * update tests.yml * update tests.yml * use pip * ran black * add condition test.yml * add pip in env * install qgridnext
tardis-sn · Sep 9, 2024 · 260207c · 260207c
1 parent be4ec9a
commit 260207c
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 27 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -7,10 +7,10 @@ name: tests
 on:
   push:
     branches:
-    - '*'
+      - "*"
   pull_request:
     branches:
-    - '*'
+      - "*"
     types:
       - opened
       - reopened
@@ -25,18 +25,17 @@ on:
         default: false
 
 env:
-  CACHE_NUMBER: 0  # increase to reset cache manually
-  PYTEST_FLAGS: --tardis-refdata=${{ github.workspace }}/tardis-refdata --tardis-regression-data=${{ github.workspace }}/tardis-regression-data --cov=tardis --cov-report=xml --cov-report=html --cov-append 
+  CACHE_NUMBER: 0 # increase to reset cache manually
+  PYTEST_FLAGS: --tardis-refdata=${{ github.workspace }}/tardis-refdata --tardis-regression-data=${{ github.workspace }}/tardis-regression-data --cov=tardis --cov-report=xml --cov-report=html --cov-append
   CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
 defaults:
   run:
     shell: bash -l {0}
- 
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
   cancel-in-progress: true
-
 
 jobs:
   tests:
@@ -47,11 +46,11 @@ jobs:
       fail-fast: false
       matrix:
         label: [osx-arm64, linux-64]
-        continuum: ['not', '']
-        rpacket_tracking: ['not', '']
+        continuum: ["not", ""]
+        rpacket_tracking: ["not", ""]
         exclude:
-          - continuum: ''
-            rpacket_tracking: ''
+          - continuum: ""
+            rpacket_tracking: ""
         include:
           - label: osx-arm64
             os: macos-latest
@@ -65,29 +64,34 @@ jobs:
 
       - name: Setup LFS
         uses: ./.github/actions/setup_lfs
-      
+
       - name: Setup environment
         uses: ./.github/actions/setup_env
         with:
           os-label: ${{ matrix.label }}
-      
+
       - name: Install package editable
         if: ${{ !inputs.pip_git }}
         run: |
           pip install -e . --user
-      
+
       - name: Install package git
         if: ${{ inputs.pip_git }}
         run: |
           pip install git+https://github.com/tardis-sn/tardis.git@master
 
+      - name: Install qgridnext
+        if: ${{ !inputs.pip_git }}
+        run: |
+          pip install qgridnext
+
       - name: Run tests
-        run: pytest tardis ${{ env.PYTEST_FLAGS }} -m "${{ matrix.continuum }} continuum and ${{ matrix.rpacket_tracking }} rpacket_tracking" 
-      
+        run: pytest tardis ${{ env.PYTEST_FLAGS }} -m "${{ matrix.continuum }} continuum and ${{ matrix.rpacket_tracking }} rpacket_tracking"
+
       - name: Refdata Generation tests
-        run: pytest tardis ${{ env.PYTEST_FLAGS }} --generate-reference -m "${{ matrix.continuum }} continuum and ${{ matrix.rpacket_tracking }} rpacket_tracking" 
+        run: pytest tardis ${{ env.PYTEST_FLAGS }} --generate-reference -m "${{ matrix.continuum }} continuum and ${{ matrix.rpacket_tracking }} rpacket_tracking"
         if: contains(github.event.pull_request.labels.*.name, 'run-generation-tests') || github.ref == 'refs/heads/master'
-      
+
       - run: mv .coverage .coverage.${{ strategy.job-index }}
 
       - uses: actions/upload-artifact@v4
@@ -96,7 +100,7 @@ jobs:
           path: |
             .coverage*
             !.coveragerc
-    
+
   combine_coverage_reports:
     needs: [tests]
     if: github.repository_owner == 'tardis-sn'
@@ -110,16 +114,16 @@ jobs:
 
       # will download all artifacts(in this case all are coverage reports)
       - uses: actions/download-artifact@v4
-        with: 
+        with:
           path: .
           merge-multiple: true
-      
+
       - name: Combine coverage reports
         run: |
           coverage combine
           coverage xml
           coverage html
-      
+
       - name: Print report
         run: coverage report
 

diff --git a/tardis/visualization/widgets/line_info.py b/tardis/visualization/widgets/line_info.py
@@ -5,7 +5,6 @@
 from astropy import units as u
 import numpy as np
 import pandas as pd
-import qgrid
 from plotly import graph_objects as go
 from plotly.callbacks import BoxSelector
 import ipywidgets as ipw

diff --git a/tardis/visualization/widgets/util.py b/tardis/visualization/widgets/util.py
@@ -1,7 +1,7 @@
 """Utility classes and functions for widgets."""
 
 import logging
-import qgrid
+import qgridnext
 import ipywidgets as ipw
 import asyncio
 
@@ -95,7 +95,7 @@ def create_table_widget(
             )
 
     # Create the table widget using qgrid
-    return qgrid.show_grid(
+    return qgridnext.show_grid(
         data,
         grid_options=grid_options,
         column_options=column_options,

diff --git a/tardis_env3.yml b/tardis_env3.yml
@@ -4,7 +4,6 @@ channels:
   - conda-forge
 
 dependencies:
-
   # WARNING: any change to this section must be applied to the conda-forge
   # package recipe at https://github.com/conda-forge/tardis-sn-feedstock
 
@@ -38,7 +37,8 @@ dependencies:
   - matplotlib-base
   - ipywidgets
   - plotly
-  - qgrid
+  - pip:
+      - qgridnext
 
   # --- Packages not required for conda-forge recipe ---
 
@@ -74,4 +74,3 @@ dependencies:
 
   # Other
   - git-lfs
-