Remove silx

It is installing pyside2, and having pyside2 and pyside6 at the same time can cause compatibility issues. Now, the period table will not work, but we can try to fix it later. Signed-off-by: Patrick Avery <[email protected]>
HEXRD · Oct 12, 2023 · dc72808 · dc72808
1 parent 68cc62c
commit dc72808
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
@@ -26,7 +26,6 @@ requirements:
     - pyyaml
     - hexrd=={{ hexrd_version }}
     - pyhdf
-    - silx
 
 test:
   imports:

diff --git a/hexrd/ui/periodic_table_dialog.py b/hexrd/ui/periodic_table_dialog.py
@@ -2,7 +2,8 @@
     QDialog, QDialogButtonBox, QMessageBox, QPushButton, QVBoxLayout
 )
 
-from silx.gui.widgets.PeriodicTable import PeriodicTable
+# FIXME: we need silx to use pyside6 or we need to get rid of it
+# from silx.gui.widgets.PeriodicTable import PeriodicTable
 
 from hexrd.ui.ui_loader import UiLoader
 

diff --git a/setup.py b/setup.py
@@ -9,7 +9,6 @@
     'Pillow',
     'pyside6',
     'pyyaml',
-    'silx',
 ]
 
 setup(
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,6 @@ requirements: @@
         - pyyaml
         - hexrd=={{ hexrd_version }}
         - pyhdf
-        - silx
     test:
       imports:
@@ Expand Down @@