Merge pull request #1702 from HEXRD/increase-qfib-warning-threshold

Increase qfib warning threshold to 1e8

hexrdgui/color_map_editor.py

@@ -3,7 +3,7 @@
 from PySide6.QtGui import QColor
 from PySide6.QtWidgets import QColorDialog
 
-from matplotlib import cm
+from matplotlib import colormaps as cm
 import matplotlib.colors
 
 import numpy as np

hexrdgui/indexing/fit_grains_results_dialog.py

@@ -677,7 +677,8 @@ def load_cmaps(self):
 
     def update_cmap(self):
         # Get the Colormap object from the name
-        self.cmap = matplotlib.cm.get_cmap(self.ui.color_maps.currentText())
+        self.cmap = matplotlib.colormaps.get_cmap(
+            self.ui.color_maps.currentText())
         self.update_plot()
 
     def reset_glyph_size(self, update_plot=True):

hexrdgui/indexing/run.py

@@ -250,7 +250,7 @@ def generate_orientation_fibers(self, config):
 
     def orientation_fibers_generated(self):
         # Perform some validation
-        qfib_warning_threshold = 5e7
+        qfib_warning_threshold = 1e8
         if self.qfib.shape[1] > qfib_warning_threshold:
             formatted = format_big_int(self.qfib.shape[1])
             msg = (f'Over {formatted} test orientations were '

packaging/package.py

@@ -13,6 +13,7 @@
 import click
 import coloredlogs
 
+import conda
 import conda.cli.python_api as Conda
 from conda_build import api as CondaBuild
 from conda_build.config import Config
@@ -105,15 +106,12 @@ def build_conda_pack(base_path, tmp, hexrd_package_channel, hexrdgui_output_fold
     # First build the hexrdgui package
     recipe_path = str(base_path / '..' / 'conda.recipe')
     config = Config()
-    config.channel = ['conda-forge']
     config.channel_urls = ['conda-forge']
-    config.override_channels = True
 
     if hexrdgui_output_folder is not None:
         config.output_folder = hexrdgui_output_folder
 
     if hexrd_package_channel is not None:
-        config.channel.insert(0, 'hexrd-channel')
         config.channel_urls.insert(0, hexrd_package_channel)
 
     # Determine the latest hexrd version in the hexrd_package_channel