Squashed 'vimhelp/' changes from ba25e9b..8b4ae03

8b4ae03 Bump dependencies
900f2f4 Tweaks
73f3e82 Minor refactor
4b65628 Avoid a var shadowing an imported module name
7d49516 Use 'ruff format' instead of 'black' as formatter
bb16c5d Update tom-select from 2.3.1 to 2.4.1
b7f237c webapp.py: move things around a bit
6592e93 Add .editorconfig
efdf11b Bump dependencies
5f6fa4c Upgrade to Python 3.12
21e3571 Bump dependencies
b78c52e Only write assets to datastore if needed
0e3bebc pyproject.toml: updates for new ruff version
9be2b04 tasks: add new "sh" task
8fc6638 Get secrets from Google Cloud
17c5d21 vimhelp.js: Gracefully support offline mode
699698c tasks.py: support deploying cron.yaml
aadc049 Remove now-duplicative static asset directory
15d7022 Fix failure to retrieve assets from db
afbb77e Cache busting for static assets
ea4174b Revert noscript.css back to old version
bd5bbed Yet another tweak
0efa488 More tweaks
bc83219 Tweaks
90468a4 Refine tag/site search placeholders
23af00e "Go to keyword" & "Site search": inlay hints
2cdd8f5 "Go to keyword" & "Site search" fields: tweaks
e2c69ce vim: add editorconfig.txt (bundled with Vim 9.1)
85a141b Add keyboard shortcuts for focusing <input>s
467d0f1 Remove unneeded .flake8 file
86f7f4d Bump dependencies
80a134f vimh2h tweaks

git-subtree-dir: vimhelp
git-subtree-split: 8b4ae032ad764bf56d2638070e66242b57d3ec93

Author: ychin

.editorconfig

@@ -0,0 +1,4 @@
+root = true
+
+[*.py]
+max_line_length = 88

.flake8

@@ -2,7 +2,6 @@
 /.gitignore
 /.gcloudignore
 /.venv
-/.flake8
 /.ruff_cache
 /scripts
 /README.md
@@ -11,3 +10,4 @@
 /tasks.py
 /gunicorn.conf.dev.py
 __pycache__/
+html/

.gcloudignore

@@ -1,4 +1,3 @@
 TODO
-/vimhelp/secret.py
 /.venv/
 __pycache__/

.gitignore

@@ -1,4 +1,4 @@
-runtime: python311
+runtime: python312
 
 automatic_scaling:
   max_instances: 2
@@ -10,31 +10,10 @@ automatic_scaling:
 
 entrypoint: gunicorn -b :$PORT -k gevent -w 1 'vimhelp.webapp:create_app()'
 
-default_expiration: "1h"
-
 inbound_services:
 - warmup
 
 handlers:
-- url: /(?:.*\.html)?
-  script: auto
-  secure: always
-- url: /api/.+
-  script: auto
-  secure: always
-- url: /(?:robots|sitemap)\.txt
-  script: auto
-  secure: always
-- url: /favicon\.ico
-  script: auto
-  secure: always
-- url: /(?:enqueue_)?update
+- url: /.*
   script: auto
   secure: always
-- url: /_ah/warmup
-  script: auto
-  secure: always
-- url: /(.+)
-  static_files: static/\1
-  upload: static/(.*)
-  secure: always

app.yaml

@@ -5,3 +5,6 @@ cron:
 - description: fetch and process neovim docs
   url: /enqueue_update?project=neovim
   schedule: every 32 minutes
+- description: clean up old static asset versions
+  url: /enqueue_clean_assets
+  schedule: every 33 minutes

cron.yaml

@@ -3,7 +3,6 @@
 
 loglevel = "debug"
 reload = True
-reload_extra_files = ["static", "templates"]
 timeout = 15
 worker_class = "gevent"
 wsgi_app = "vimhelp.webapp:create_app()"

gunicorn.conf.dev.py

@@ -13,8 +13,11 @@ build-backend = "setuptools.build_meta"
 dependencies = { file = "requirements.txt" }
 
 [tool.ruff]
+extend-exclude = [".pyre"]
+
+[tool.ruff.lint]
 select = ["E", "F", "W", "I002", "N", "UP", "S", "B", "A", "C4", "DTZ", "SIM", "PTH", "PLE", "PLW", "RUF"]
 ignore = ["DTZ003", "PLW0603", "SIM102", "SIM108", "UP007"]
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 "vimhelp/vimh2h.py" = ["E501", "PLW2901"]

pyproject.toml

@@ -1,6 +1,7 @@
-Flask ~= 2.3
-gevent ~= 23.7
-geventhttpclient ~= 2.0
-google-cloud-ndb ~= 2.2
-google-cloud-tasks ~= 2.14
-gunicorn ~= 21.2
+Flask ~= 3.1
+gevent ~= 24.11
+geventhttpclient ~= 2.3
+google-cloud-ndb ~= 2.3
+google-cloud-secret-manager ~= 2.22
+google-cloud-tasks ~= 2.18
+gunicorn ~= 23.0

requirements.txt

@@ -69,12 +69,11 @@ def main():
     app = flask.Flask(
         __name__,
         root_path=pathlib.Path(__file__).resolve().parent,
-        static_url_path="",
-        static_folder="../static",
-        template_folder="../templates",
+        template_folder="../vimhelp/templates",
     )
     app.jinja_options["trim_blocks"] = True
     app.jinja_options["lstrip_blocks"] = True
+    app.jinja_env.filters["static_path"] = lambda p: p
 
     with app.app_context():
         if args.profile:
@@ -129,19 +128,17 @@ def run(args):
                 f.write(html)
 
     if args.out_dir is not None:
-        print("Symlinking static files...")
-        static_dir_rel = os.path.relpath(root_path / "static", args.out_dir)
-        for target in (root_path / "static").iterdir():
+        print("Symlinking/creating static files...")
+        static_dir = root_path / "vimhelp" / "static"
+        static_dir_rel = os.path.relpath(static_dir, args.out_dir)
+        for target in static_dir.iterdir():
             target_name = target.name
-            if target_name == f"favicon-{args.project}.ico":
-                src_name = "favicon.ico"
-            elif target_name.startswith("favicon-"):
-                continue
-            else:
-                src_name = target_name
-            src = pathlib.Path(args.out_dir / src_name)
+            src = args.out_dir / target_name
             src.unlink(missing_ok=True)
             src.symlink_to(f"{static_dir_rel}/{target_name}")
+        for name in "vimhelp.css", "vimhelp.js":
+            content = flask.render_template(name, mode=mode)
+            (args.out_dir / name).write_text(content)
 
     print("Done.")