fix #13

Author: bckohan

django_routines/__init__.py

@@ -74,18 +74,19 @@ class _RoutineCommand(ABC):
     or for all invocations of the routine if no switches are configured.
     """
 
+    # todo
     # pre_hook: t.Optional[t.Callable[[Command], t.Optional[bool]]] = None
-    """
-    A function to run before the command is run. The function should take the command instance and
-    may return True to skip the command.
-    """
+    # """
+    # A function to run before the command is run. The function should take the command instance and
+    # may return True to skip the command.
+    # """
 
     # post_hook: t.Optional[t.Callable[[Command, t.Any], t.Any]] = None
-    """
-    A function to run after the command has been run. The function should take the command instance
-    and the result of the function which will be whatever call_command returns if run in the same
-    process, or the result object returned by subprocess.run() if run in a subprocess.
-    """
+    # """
+    # A function to run after the command has been run. The function should take the command instance
+    # and the result of the function which will be whatever call_command returns if run in the same
+    # process, or the result object returned by subprocess.run() if run in a subprocess.
+    # """
 
     @property
     @abstractmethod

django_routines/management/commands/routine.py

@@ -1,3 +1,4 @@
+import importlib
 import os
 import subprocess
 import sys
@@ -162,6 +163,8 @@ def _call_command(self, command: ManagementCommand):
             if self.verbosity > 0:
                 self.secho(command.command_str, fg="cyan")
             call_command(cmd, *command.command_args, **options)
+            if command.command_name == "makemigrations":
+                importlib.invalidate_caches()
         except KeyError:
             raise CommandError(f"Command not found: {command.command_name}")
 
@@ -217,38 +220,11 @@ def _subprocess(self, command: RCommand):
         if self.verbosity > 0:
             self.secho(" ".join(args), fg="cyan")
 
-        # result = subprocess.run(args, env=os.environ.copy(), capture_output=True)
-        # self.stdout.write(result.stdout.decode())
-        # self.stderr.write(result.stderr.decode())
-
-        with subprocess.Popen(
-            args,
-            env=os.environ.copy(),
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-            text=True,
-        ) as proc:
-            assert proc.stdout
-            assert proc.stderr
-            while True:
-                output = proc.stdout.readline()
-                if output:
-                    self.stdout.write(output)
-                    self.stdout.flush()
-                error = proc.stderr.readline()
-                if error:
-                    self.stderr.write(error)
-                    self.stderr.flush()
-
-                if output == "" and error == "" and proc.poll() is not None:
-                    break
-
-            if proc.returncode != 0:
-                for line in proc.stderr:
-                    self.stderr.write(line)
-                    self.stderr.flush()
-
-            return proc.returncode
+        # todo make this async
+        result = subprocess.run(args, env=os.environ.copy(), capture_output=True)
+        self.stdout.write(result.stdout.decode())
+        self.stderr.write(result.stderr.decode())
+        return result.returncode
 
     def _list(self) -> None:
         """

doc/source/changelog.rst

@@ -5,7 +5,7 @@ Change Log
 v1.1.0
 ======
 
-* `Support function pre and post hooks to be run prior to and after given commands. <https://github.com/bckohan/django-routines/issues/9>`_
+* `Invalidate importlib caches if command is makemigrations. <https://github.com/bckohan/django-routines/issues/13>`_
 * `Command type for system commands (i.e. non-management commands) to be run as subprocesses <https://github.com/bckohan/django-routines/issues/7>`_
 * `Option to run management commands as subprocesses instead of in the same process space. <https://github.com/bckohan/django-routines/issues/6>`_
 

tests/pytest_routine.py

@@ -1,6 +1,53 @@
-from .settings import *
+import os
+from pathlib import Path
 from django_routines import system
 
-DJANGO_ROUTINES = {}
+USE_TZ = True
 
-system('test', 'pytest')
+
+# Set default terminal width for help outputs - necessary for
+# testing help output in CI environments.
+os.environ["TERMINAL_WIDTH"] = "80"
+
+# Build paths inside the project like this: BASE_DIR / 'subdir'.
+BASE_DIR = Path(__file__).resolve().parent.parent
+
+# Application definition
+
+INSTALLED_APPS = [
+    "tests.django_routines_tests",
+    "django_routines",
+    "django_typer",
+    "django.contrib.auth",
+    "django.contrib.contenttypes",
+    "django.contrib.sessions",
+    "django.contrib.messages",
+    "django.contrib.staticfiles",
+]
+
+
+DATABASES = {
+    "default": {
+        "ENGINE": "django.db.backends.sqlite3",
+        "NAME": BASE_DIR / "db.sqlite3",
+        "TEST": {"NAME": BASE_DIR / "db.sqlite3"},
+    }
+}
+
+MIDDLEWARE = [
+    "django.middleware.security.SecurityMiddleware",
+    "django.contrib.sessions.middleware.SessionMiddleware",
+    "django.middleware.common.CommonMiddleware",
+    "django.middleware.csrf.CsrfViewMiddleware",
+    "django.contrib.auth.middleware.AuthenticationMiddleware",
+    "django.contrib.messages.middleware.MessageMiddleware",
+    "django.middleware.clickjacking.XFrameOptionsMiddleware",
+]
+
+DJANGO_ROUTINES = None
+
+STATIC_URL = "static/"
+
+SECRET_KEY = "fake"
+
+system("pytest", "pytest", "-k", "test_core", "-s")