lino 25.4.0__tar.gz → 25.4.1__tar.gz

{lino-25.4.0 → lino-25.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lino
-Version: 25.4.0
+Version: 25.4.1
 Summary: A framework for writing desktop-like web applications using Django and ExtJS or React
 Project-URL: Homepage, https://www.lino-framework.org
 Project-URL: Repository, https://gitlab.com/lino-framework/lino

{lino-25.4.0 → lino-25.4.1}/lino/__init__.py

@@ -31,7 +31,7 @@ from django import VERSION
 from django.apps import AppConfig
 from django.conf import settings
 import warnings
-__version__ = '25.4.0'
+__version__ = '25.4.1'
 
 # import setuptools  # avoid UserWarning "Distutils was imported before Setuptools"?
 

{lino-25.4.0 → lino-25.4.1}/lino/core/kernel.py

@@ -41,7 +41,7 @@ from django.db import models
 
 # import lino  # for is_testing
 from lino import logger
-from lino.utils import codetime
+# from lino.utils import codetime
 from lino.utils.html import E
 # from lino.core.utils import format_request
 # from lino.utils import isiterable
@@ -111,22 +111,21 @@ class Kernel(object):
         self.GFK_LIST = []
         # logger.info("20140227 Kernel.__init__() done")
 
-    _code_mtime = None
-    _lino_version = None
-
-    @property
-    def code_mtime(self):
-        if self._code_mtime is None:
-            # packages = [os.environ['DJANGO_SETTINGS_MODULE'], 'lino']
-            # self._code_mtime = codetime(*packages)
-            if self.site.developer_site_cache:
-                self._code_mtime = codetime()
-            else:
-                # On a production server we test only the timestamp of
-                # settings.py file because otherwise the result can differ
-                # depending on which modules have already been imported.
-                self._code_mtime = codetime(settings.SETTINGS_MODULE)
-        return self._code_mtime
+    # _code_mtime = None
+    #
+    # @property
+    # def code_mtime(self):
+    #     if self._code_mtime is None:
+    #         # packages = [os.environ['DJANGO_SETTINGS_MODULE'], 'lino']
+    #         # self._code_mtime = codetime(*packages)
+    #         if self.site.developer_site_cache:
+    #             self._code_mtime = codetime()
+    #         else:
+    #             # On a production server we test only the timestamp of
+    #             # settings.py file because otherwise the result can differ
+    #             # depending on which modules have already been imported.
+    #             self._code_mtime = codetime(settings.SETTINGS_MODULE)
+    #     return self._code_mtime
 
     def kernel_startup(self, site):
         """This is a part of a Lino site startup.  The Django Model
@@ -908,7 +907,7 @@ class Kernel(object):
         self._must_build = True
 
     def make_cache_file(self, fn, write, force=False, verbosity=1):
-        """Make the specified cache file.  This is used internally at server
+        """Make the specified cache file.  This is used internally at site
         startup.
 
         """
@@ -919,7 +918,8 @@ class Kernel(object):
         fn = self.site.media_root / fn
         if not force and not self._must_build and fn.exists():
             mtime = os.stat(fn).st_mtime
-            if mtime > self.code_mtime:
+            # if mtime > self.code_mtime:
+            if mtime > self.site.lino_version:
                 # logger.debug("%s (%s) is up to date.", fn, time.ctime(mtime))
                 return 0
 

{lino-25.4.0 → lino-25.4.1}/lino/core/site.py

@@ -558,17 +558,18 @@ class Site(object):
                     break
 
         if self.master_site is None:
-            cache_root = os.environ.get("LINO_CACHE_ROOT", None)
-            if cache_root:
-                # TODO: deprecate
-                cr = Path(cache_root).absolute()
-                if not cr.exists():
-                    msg = "LINO_CACHE_ROOT ({0}) does not exist!".format(cr)
-                    raise Exception(msg)
-                self.site_dir = (cr / self.project_name).resolve()
-                self.setup_cache_directory()
-            else:
-                self.site_dir = self.project_dir
+            # cache_root = os.environ.get("LINO_CACHE_ROOT", None)
+            # if cache_root:
+            #     # TODO: deprecate
+            #     cr = Path(cache_root).absolute()
+            #     if not cr.exists():
+            #         msg = "LINO_CACHE_ROOT ({0}) does not exist!".format(cr)
+            #         raise Exception(msg)
+            #     self.site_dir = (cr / self.project_name).resolve()
+            #     self.setup_cache_directory()
+            # else:
+            #     self.site_dir = self.project_dir
+            self.site_dir = self.project_dir
             db = self.get_database_settings()
             if db is not None:
                 self.django_settings.update(DATABASES=db)
@@ -987,11 +988,12 @@ class Site(object):
         self.update_settings(MEDIA_URL="/media/")
 
         if not "STATIC_ROOT" in self.django_settings:
-            cache_root = os.environ.get("LINO_CACHE_ROOT", None)
-            if cache_root:
-                p = Path(cache_root)
-            else:
-                p = self.site_dir
+            # cache_root = os.environ.get("LINO_CACHE_ROOT", None)
+            # if cache_root:
+            #     p = Path(cache_root)
+            # else:
+            #     p = self.site_dir
+            p = self.site_dir
             self.update_settings(STATIC_ROOT=str(p / "static_root"))
         if not "STATIC_URL" in self.django_settings:
             self.update_settings(STATIC_URL="/static/")
@@ -1142,40 +1144,40 @@ class Site(object):
 
         # print(20150331, self.django_settings['FIXTURE_DIRS'])
 
-    def setup_cache_directory(self):
-        stamp = self.site_dir / "lino_cache.txt"
-        this = class2str(self.__class__)
-        if stamp.exists():
-            other = stamp.read_file()
-            if other == this:
-                ok = True
-            else:
-                ok = False
-                for parent in self.__class__.__mro__:
-                    if other == class2str(parent):
-                        ok = True
-                        break
-            if not ok:
-                # Can happen e.g. when `python -m lino.hello` is
-                # called.  in certain conditions.
-                msg = (
-                    "Cannot use {site_dir} for {this} "
-                    "because it is used for {other}. (Settings {settings})"
-                )
-                msg = msg.format(
-                    site_dir=self.site_dir,
-                    this=this,
-                    settings=self.django_settings.get("SETTINGS_MODULE"),
-                    other=other,
-                )
-                if True:
-                    raise Exception(msg)
-                else:
-                    # print(msg)
-                    self.site_dir = None
-        else:
-            self.makedirs_if_missing(self.site_dir)
-            stamp.write_file(this)
+    # def setup_cache_directory(self):
+    #     stamp = self.site_dir / "lino_cache.txt"
+    #     this = class2str(self.__class__)
+    #     if stamp.exists():
+    #         other = stamp.read_file()
+    #         if other == this:
+    #             ok = True
+    #         else:
+    #             ok = False
+    #             for parent in self.__class__.__mro__:
+    #                 if other == class2str(parent):
+    #                     ok = True
+    #                     break
+    #         if not ok:
+    #             # Can happen e.g. when `python -m lino.hello` is
+    #             # called.  in certain conditions.
+    #             msg = (
+    #                 "Cannot use {site_dir} for {this} "
+    #                 "because it is used for {other}. (Settings {settings})"
+    #             )
+    #             msg = msg.format(
+    #                 site_dir=self.site_dir,
+    #                 this=this,
+    #                 settings=self.django_settings.get("SETTINGS_MODULE"),
+    #                 other=other,
+    #             )
+    #             if True:
+    #                 raise Exception(msg)
+    #             else:
+    #                 # print(msg)
+    #                 self.site_dir = None
+    #     else:
+    #         self.makedirs_if_missing(self.site_dir)
+    #         stamp.write_file(this)
 
     def set_user_model(self, spec):
         # if self.user_model is not None:
@@ -2004,6 +2006,17 @@ class Site(object):
         s = self.plugins.jinja.render_from_ar(ar, "admin_main.html", **context)
         return mark_safe(s)
 
+    _lino_version = None
+
+    @property
+    def lino_version(self):
+        p = self.site_dir / "lino_version.txt"
+        if self._lino_version is None:
+            if not p.exists():
+                p.touch()
+            self._lino_version = p.stat().st_mtime
+        return self._lino_version
+
     def build_site_cache(self, force=False, later=False, verbosity=1):
         from lino.modlib.users.utils import with_user_profile
         from lino.modlib.users.choicelists import UserTypes
@@ -2011,10 +2024,12 @@ class Site(object):
         # if not self.is_prepared:
         #     self.prepare_layouts()
         #     self.is_prepared = True
+        # settings_file = self.django_settings.get("__file__")
+        # Path(settings_file).touch()
+        p = self.site_dir / "lino_version.txt"
+        p.touch()
 
         if later:
-            settings_file = self.django_settings.get("__file__")
-            Path(settings_file).touch()
             # print("20230823 later")
             return
 

{lino-25.4.0 → lino-25.4.1}/lino/modlib/about/models.py

@@ -119,7 +119,7 @@ class About(EmptyTable):
         packages = set(["django"])
 
         items.append(
-            E.li(gettext("Server timestamp"), " : ", E.b(dtfmt(site.kernel.code_mtime)))
+            E.li(gettext("Server timestamp"), " : ", E.b(dtfmt(site.lino_version)))
         )
 
         for p in site.installed_plugins:

{lino-25.4.0 → lino-25.4.1}/lino/modlib/extjs/ext_renderer.py

@@ -1481,7 +1481,7 @@ class ExtRenderer(JsCacheRenderer):
             # if settings.SITE.never_build_site_cache:
             #     yield "GEN_TIMESTAMP = '%s';" % settings.SITE.kernel.lino_version
             # else:
-            yield "GEN_TIMESTAMP = %s;" % py2js(settings.SITE.kernel.code_mtime)
+            yield "GEN_TIMESTAMP = %s;" % py2js(settings.SITE.lino_version)
 
         return "\n".join(fn())
 

{lino-25.4.0 → lino-25.4.1}/lino/modlib/extjs/views.py

@@ -138,7 +138,7 @@ def test_version_mismatch(request):
     if os.environ.get("PYCHARM_HOSTED", False):
         return {}
     lv = request.GET.get(constants.URL_PARAM_LINO_VERSION)
-    if lv is None or float(lv) == settings.SITE.kernel.code_mtime:
+    if lv is None or float(lv) == settings.SITE.lino_version:
         return {}
     # print("20201217", lv, settings.SITE.kernel.code_mtime)
     cache.clear()

{lino-25.4.0 → lino-25.4.1}/lino/modlib/memo/parser.py

@@ -13,6 +13,9 @@ TODO:
   which would be empty for # and @ but "]" for memo commands.
 
 """
+from etgen import etree
+from django.db.models import Model
+from django.conf import settings
 from lino import logger
 
 import re
@@ -24,9 +27,6 @@ import warnings
 
 warnings.filterwarnings("ignore", category=MarkupResemblesLocatorWarning)
 
-from django.conf import settings
-from django.db.models import Model
-from etgen import etree
 
 # COMMAND_REGEX = re.compile(r"\[(\w+)\s*((?:[^[\]]|\[.*?\])*?)\]")
 #                                         ===...... .......=
@@ -139,7 +139,7 @@ class Parser:
                 for key in self.suggesters.keys()
             ]
         )
-        return re.compile(r"([^\w])?([" + triggers + "])(\w+)")
+        return re.compile(r"([^\w])?([" + triggers + r"])(\w+)")
 
     def register_command(self, cmdname, func: Callable[[Any, str, str, dict], None]):
         """Register a memo command identified by the given text `cmd`.

{lino-25.4.0 → lino-25.4.1}/lino/help_texts.py

@@ -153,13 +153,13 @@ help_texts = {
     'lino.modlib.memo.Plugin' : _("""Base class for this plugin."""),
     'lino.modlib.memo.Plugin.parser' : _("""An instance of lino.modlib.memo.parser.Parser."""),
     'lino.modlib.memo.Plugin.front_end' : _("""The front end to use when writing previews."""),
+    'lino.modlib.memo.parser.Suggester' : _("""Holds the configuration for the behaviour of a given “trigger”."""),
     'lino.modlib.memo.parser.Parser' : _("""The memo parser."""),
     'lino.modlib.memo.parser.Parser.add_suggester' : _("""Add a Suggester (see there for args and kwargs)."""),
-    'lino.modlib.memo.parser.Parser.get_referred_objects' : _("""Yield all database objects referred in the given text using a suggester."""),
-    'lino.modlib.memo.parser.Parser.parse' : _("""Parse the given string src, replacing memo commands by their result."""),
     'lino.modlib.memo.parser.Parser.register_command' : _("""Register a memo command identified by the given text cmd."""),
     'lino.modlib.memo.parser.Parser.register_django_model' : _("""Register the given string name as command for referring to database rows of the given Django database model model."""),
-    'lino.modlib.memo.parser.Suggester' : _("""Holds the configuration for the behaviour of a given “trigger”."""),
+    'lino.modlib.memo.parser.Parser.get_referred_objects' : _("""Yield all database objects referred in the given text using a suggester."""),
+    'lino.modlib.memo.parser.Parser.parse' : _("""Parse the given string src, replacing memo commands by their result."""),
     'lino.modlib.restful.Plugin' : _("""See /dev/plugins."""),
     'lino.modlib.smtpd.Plugin' : _("""See /dev/plugins."""),
     'lino.modlib.system.Plugin' : _("""See /dev/plugins."""),