Merge ~adam-collard/maas:nuke-scss-remnants into maas:master

[Adam Collard]

Remove last vestiges of scss

[Alberto Donato (ack)]

+1, small nit inline

review: Approve

e259ec6... by Adam Collard on 2021-01-04

Use f-string instead of .format()

diff --git a/Makefile b/Makefile
index c0efcd1..42cc456 100644
--- a/Makefile
+++ b/Makefile
@@ -543,7 +543,7 @@ source-package-clean:
 
 # Debugging target. Allows printing of any variable.
 # As an example, try:
-#     make print-scss_input
+#     make print-BIN_SCRIPTS
 print-%:
 	@echo $* = $($*)
 
diff --git a/services/reloader/run b/services/reloader/run
index 43382c9..b1083f6 100755
--- a/services/reloader/run
+++ b/services/reloader/run
@@ -27,33 +27,20 @@ import pyinotify
 
 
 TRIGGER_EVENTS = (
-    pyinotify.IN_CLOSE_WRITE |
-    pyinotify.IN_MOVED_FROM |
-    pyinotify.IN_MOVED_TO |
-    pyinotify.IN_DELETE)
+    pyinotify.IN_CLOSE_WRITE
+    | pyinotify.IN_MOVED_FROM
+    | pyinotify.IN_MOVED_TO
+    | pyinotify.IN_DELETE
+)
 
 
 def is_interesting_python_change(filename):
     return (
-        filename is not None and
-        filename.endswith(".py") and
-        not filename.startswith(".") and
-        not filename.endswith("_flymake.py"))
-
-
-def is_interesting_scss_change(filename):
-    return (
-        filename is not None and
-        filename.endswith(".scss") and
-        not filename.startswith("."))
-
-
-def is_interesting_js_change(filename):
-    return (
-        filename is not None and
-        filename.endswith(".js") and
-        not filename.startswith(".") and
-        not filename.endswith("min.js"))
+        filename is not None
+        and filename.endswith(".py")
+        and not filename.startswith(".")
+        and not filename.endswith("_flymake.py")
+    )
 
 
 def is_supervised(dirname):
@@ -64,28 +51,13 @@ def handle_python_change(event, *services):
     for service in services:
         service_dir = "services/%s" % service
         if is_supervised(service_dir):
-            print("<-- {0.pathname} changed; reloading {1}.".format(
-                event, service))
+            print(f"<-- {event.pathname} changed; reloading {service}.")
             check_call(("svc", "-du", service_dir))
 
 
-def handle_scss_change(event):
-    print("<-- {0.pathname} changed; rebuilding CSS.".format(event))
-    check_call(("make", "-s", "assets"))
-
-
-def handle_js_change(event):
-    print("<-- {0.pathname} changed; rebuilding JavaScript.".format(event))
-    check_call(("make", "-s", "assets"))
-
-
 def handle_maas_change(event):
     if is_interesting_python_change(event.name):
         handle_python_change(event, "regiond")
-    if is_interesting_scss_change(event.name):
-        handle_scss_change(event)
-    if is_interesting_js_change(event.name):
-        handle_js_change(event)
 
 
 def handle_pserv_change(event):
@@ -103,38 +75,11 @@ class TestReloader(unittest.TestCase):
             "module.py": True,
             ".hidden.py": False,
             "module_flymake.py": False,
-            }
+        }
         observed = {
             filename: is_interesting_python_change(filename)
             for filename in expected
-            }
-        self.assertEqual(expected, observed)
-
-    def test_is_interesting_scss_change(self):
-        expected = {
-            None: False,
-            "script": False,
-            "module.scss": True,
-            ".hidden.scss": False,
-            }
-        observed = {
-            filename: is_interesting_scss_change(filename)
-            for filename in expected
-            }
-        self.assertEqual(expected, observed)
-
-    def test_is_interesting_js_change(self):
-        expected = {
-            None: False,
-            "script": False,
-            "module.js": True,
-            "module.min.js": False,
-            ".hidden.js": False,
-            }
-        observed = {
-            filename: is_interesting_js_change(filename)
-            for filename in expected
-            }
+        }
         self.assertEqual(expected, observed)
 
 
@@ -155,13 +100,25 @@ if __name__ == "__main__":
     # Start watch src/ for changes.
     wm = pyinotify.WatchManager(
         exclude_filter=lambda path: (
-            "/test/" in path or "/testing/" in path or "/." in path))
+            "/test/" in path or "/testing/" in path or "/." in path
+        )
+    )
     wm.add_watch(
-        ["src/maasserver", "src/metadataserver"], TRIGGER_EVENTS,
-        proc_fun=handle_maas_change, rec=True, auto_add=True, do_glob=True)
+        ["src/maasserver", "src/metadataserver"],
+        TRIGGER_EVENTS,
+        proc_fun=handle_maas_change,
+        rec=True,
+        auto_add=True,
+        do_glob=True,
+    )
     wm.add_watch(
-        ["src/prov*"], TRIGGER_EVENTS, proc_fun=handle_pserv_change,
-        rec=True, auto_add=True, do_glob=True)
+        ["src/prov*"],
+        TRIGGER_EVENTS,
+        proc_fun=handle_pserv_change,
+        rec=True,
+        auto_add=True,
+        do_glob=True,
+    )
     # Open log file.
     if "logdir" in environ:
         logdir = environ["logdir"]
@@ -173,13 +130,13 @@ if __name__ == "__main__":
     if not sys.stdout.line_buffering:
         sys.stdout.flush()
         sys.stdout = TextIOWrapper(
-            sys.stdout.buffer, sys.stdout.encoding,
-            line_buffering=True)
+            sys.stdout.buffer, sys.stdout.encoding, line_buffering=True
+        )
     if not sys.stderr.line_buffering:
         sys.stderr.flush()
         sys.stderr = TextIOWrapper(
-            sys.stderr.buffer, sys.stderr.encoding,
-            line_buffering=True)
+            sys.stderr.buffer, sys.stderr.encoding, line_buffering=True
+        )
     # Keep watching for ever.
     notifier = pyinotify.Notifier(wm)
     notifier.loop()
diff --git a/src/maastesting/tests/test_scss.py b/src/maastesting/tests/test_scss.py
deleted file mode 100644
index a9c33e5..0000000
--- a/src/maastesting/tests/test_scss.py
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2015 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""Check the current generated css matches generated css."""
-
-
-import os
-from os.path import exists, join
-from pipes import quote
-from subprocess import PIPE, Popen, STDOUT
-from unittest import skipUnless
-
-from testtools.content import Content, UTF8_TEXT
-
-from maastesting import root
-from maastesting.testcase import MAASTestCase
-
-
-class TestCompiledSCSS(MAASTestCase):
-    def execute(self, *command):
-        process = Popen(command, stdout=PIPE, stderr=STDOUT, cwd=root)
-        output, _ = process.communicate()
-        if len(output) != 0:
-            name = "stdout/err from `%s`" % " ".join(map(quote, command))
-            self.addDetail(name, Content(UTF8_TEXT, lambda: [output]))
-        self.assertEqual(0, process.wait(), "failed to compile css.")
-
-    def read_content(self, filename):
-        with open(filename, "rb") as stream:
-            return stream.read()
-
-    @skipUnless(
-        exists(join(root, "bin", "sass")), "bin/sass is not available."
-    )
-    def test_css_up_to_date(self):
-        """
-        In-tree compiled CSS must match SCSS compilation.
-        """
-        in_tree_css_path = os.path.join(
-            root, "src", "maasserver", "static", "css", "build.css"
-        )
-
-        self.assertIs(
-            os.path.exists(in_tree_css_path), True, "build.css is missing."
-        )
-
-        # Compile the scss into css into a temp directory.
-        output_dir = self.make_dir()
-        self.execute(
-            "bin/sass",
-            "--include-path=src/maasserver/static/scss",
-            "--output-style",
-            "compressed",
-            "src/maasserver/static/scss/build.scss",
-            "-o",
-            output_dir,
-        )
-
-        # Content should be equal. Doesn't use assertEquals so the error
-        # output doesn't contain the contents.
-        in_tree_css = self.read_content(in_tree_css_path)
-        tmp_css = self.read_content(os.path.join(output_dir, "build.css"))
-        if in_tree_css != tmp_css:
-            self.fail("build.css is out-of-date. (run 'make styles')")