Restore support for BOKEH_MINIFIED=no in Resources (#13974)

bokeh · Jul 25, 2024 · 043e1e4 · 043e1e4
1 parent 48a075f
commit 043e1e4
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 1 deletion.
diff --git a/src/bokeh/resources.py b/src/bokeh/resources.py
@@ -336,7 +336,9 @@ def __init__(
  del root_dir
  self.version = settings.cdn_version(version)
  del version
- self.minified = settings.minified(minified if minified is not None else not self.dev)
+ if minified is None and self.dev:
+ minified = False
+ self.minified = settings.minified(minified)
  del minified
  self.log_level = settings.log_level(log_level)
  del log_level

diff --git a/tests/unit/bokeh/test_resources.py b/tests/unit/bokeh/test_resources.py
@@ -31,6 +31,7 @@
 from bokeh.models import Model
 from bokeh.resources import RuntimeMessage, _get_cdn_urls
 from bokeh.settings import LogLevel, settings
+from tests.support.util.env import envset
 
 # Module under test
 import bokeh.resources as resources # isort:skip
@@ -455,6 +456,49 @@ class AClass(Model):
  assert r.css_files.index("external_css_3") > r.css_files.index("external_css_2")
  assert r.js_files.index("external_js_3") > r.js_files.index("external_js_2")
 
+
+@pytest.mark.parametrize("mode", ["cdn", "inline"])
+def test_Resources_with_BOKEH_MINIFIED(mode: resources.ResourcesMode) -> None:
+ with envset(BOKEH_MINIFIED="yes"):
+ r = resources.Resources(mode=mode)
+ assert r.minified is True
+
+ with envset(BOKEH_MINIFIED="no"):
+ r = resources.Resources(mode=mode)
+ assert r.minified is False
+
+ with envset(BOKEH_DEV="yes"):
+ r = resources.Resources(mode=mode, minified=True)
+ assert r.minified is True
+
+ with envset(BOKEH_DEV="yes"):
+ r = resources.Resources(mode=mode, minified=False)
+ assert r.minified is False
+
+ with envset(BOKEH_DEV="no"):
+ r = resources.Resources(mode=mode, minified=True)
+ assert r.minified is True
+
+ with envset(BOKEH_DEV="no"):
+ r = resources.Resources(mode=mode, minified=False)
+ assert r.minified is False
+
+ with envset(BOKEH_MINIFIED="yes", BOKEH_DEV="yes"):
+ r = resources.Resources(mode=mode)
+ assert r.minified is False
+
+ with envset(BOKEH_MINIFIED="yes", BOKEH_DEV="no"):
+ r = resources.Resources(mode=mode)
+ assert r.minified is True
+
+ with envset(BOKEH_MINIFIED="no", BOKEH_DEV="yes"):
+ r = resources.Resources(mode=mode)
+ assert r.minified is False
+
+ with envset(BOKEH_MINIFIED="no", BOKEH_DEV="no"):
+ r = resources.Resources(mode=mode)
+ assert r.minified is False
+
 # -----------------------------------------------------------------------------
 # Dev API
 # -----------------------------------------------------------------------------