upgraded dependencies; upgraded Mako version underlying docassemble.b…

…ase.mako; upgraded Font Awesome, CodeMirror, and Socket.IO; removed namespace_packages from setup.py files; use build package instead of setup.py sdist
jhpyle · Dec 1, 2024 · df785bc · df785bc
1 parent 933ad0b
commit df785bc
Show file tree

Hide file tree

Showing 61 changed files with 3,971 additions and 3,550 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -17,8 +17,6 @@ replace = {new_version}'
 search = {current_version}'
 replace = {new_version}'
 
-[bumpversion:file:docassemble/docassemble/__init__.py]
-
 [bumpversion:file:docassemble_base/docassemble/base/__init__.py]
 
 [bumpversion:file:docassemble_demo/docassemble/demo/__init__.py]

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Change Log
 
+## [1.6.0] - 2024-11-30
+
+### Added
+- The `filter`, `sort key`, and `sort reverse` options for `table` to
+  allow the presented table to be filtered and sorted.
+
+### Changed
+- Upgraded Python dependencies. Note that if you are using third-party
+  Python packages, you may encounter dependency conflicts. It is
+  possible that your interviews will need to be updated.
+- Upgraded Font Awesome, CodeMirror, and Socket.IO.
+
+### Fixed
+- The Share button in the Playground provided a relative URL instead
+  of an absolute URL.
+
 ## [1.5.16] - 2024-10-16
 
 ### Changed

diff --git a/Dockerfile b/Dockerfile
@@ -54,38 +54,38 @@ bash -c \
 && cp /usr/local/bin/unoconv /usr/bin/unoconv \
 && python3.10 -m venv --copies /usr/share/docassemble/local3.10 \
 && source /usr/share/docassemble/local3.10/bin/activate \
-&& pip install --upgrade pip==24.2 \
-&& pip install --upgrade wheel==0.44.0 \
-&& pip install --upgrade mod_wsgi==5.0.0 \
+&& pip install --upgrade pip==24.3.1 \
+&& pip install --upgrade wheel==0.45.1 \
+&& pip install --upgrade mod_wsgi==5.0.2 \
 && pip install --upgrade \
-   acme==2.11.0 \
-   certbot==2.11.0 \
-   certbot-apache==2.11.0 \
-   certbot-nginx==2.11.0 \
-   certifi==2024.7.4 \
-   cffi==1.17.0 \
-   charset-normalizer==3.3.2 \
+   acme==3.0.1 \
+   certbot==3.0.1 \
+   certbot-apache==3.0.1 \
+   certbot-nginx==3.0.1 \
+   certifi==2024.8.30 \
+   cffi==1.17.1 \
+   charset-normalizer==3.4.0 \
    click==8.1.7 \
    ConfigArgParse==1.7 \
-   configobj==5.0.8 \
-   cryptography==43.0.1 \
+   configobj==5.0.9 \
+   cryptography==44.0.0 \
    distro==1.9.0 \
-   idna==3.7 \
+   idna==3.10 \
    joblib==1.4.2 \
    josepy==1.14.0 \
    nltk==3.9.1 \
    parsedatetime==2.6 \
    pycparser==2.22 \
-   pyOpenSSL==24.2.1 \
-   pyparsing==3.1.2 \
-   pyRFC3339==1.1 \
+   pyOpenSSL==24.3.0 \
+   pyparsing==3.2.0 \
+   pyRFC3339==2.0.1 \
    python-augeas==1.1.0 \
-   pytz==2024.1 \
-   regex==2024.7.24 \
+   pytz==2024.2 \
+   regex==2024.11.6 \
    requests==2.32.3 \
    six==1.16.0 \
-   tqdm==4.66.5 \
-   urllib3==2.2.2 \
+   tqdm==4.67.1 \
+   urllib3==2.2.3 \
 && pip install \
    /tmp/docassemble/docassemble \
    /tmp/docassemble/docassemble_base \

diff --git a/docassemble/docassemble/__init__.py b/docassemble/docassemble/__init__.py
diff --git a/docassemble_base/docassemble/__init__.py b/docassemble_base/docassemble/__init__.py
diff --git a/docassemble_base/docassemble/base/mako/LICENSE b/docassemble_base/docassemble/base/mako/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2006-2022 the Mako authors and contributors <see AUTHORS file>.
+Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

diff --git a/docassemble_base/docassemble/base/mako/__init__.py b/docassemble_base/docassemble/base/mako/__init__.py
@@ -1,11 +1,11 @@
 # mako/__init__.py
-# Copyright 2006-2022 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
 
-__version__ = "1.2.2"
+__version__ = "1.3.6"
 try:
     __import__('pkg_resources').declare_namespace(__name__)
 except ImportError:

diff --git a/docassemble_base/docassemble/base/mako/_ast_util.py b/docassemble_base/docassemble/base/mako/_ast_util.py
@@ -1,5 +1,5 @@
 # mako/_ast_util.py
-# Copyright 2006-2022 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php

diff --git a/docassemble_base/docassemble/base/mako/ast.py b/docassemble_base/docassemble/base/mako/ast.py
@@ -1,5 +1,5 @@
 # mako/ast.py
-# Copyright 2006-2022 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
@@ -115,10 +115,10 @@ def __init__(self, code, **exception_kwargs):
         elif keyword in ["elif", "else"]:
             code = "if False:pass\n" + code + "pass"
         elif keyword == "except":
+            code = "try:pass\n" + code + "pass"
             thevar = re.sub(r'^.*(,| as)\s+([a-zA-z\_][0-9a-zA-Z\_]*):.*', r'\2', code)
             if thevar and thevar != code:
                 self.names_set = set([thevar])
-            code = "try:pass\n" + code + "pass"
         elif keyword == "with":
             code = code + "pass"
         else:

diff --git a/docassemble_base/docassemble/base/mako/cache.py b/docassemble_base/docassemble/base/mako/cache.py
@@ -1,5 +1,5 @@
 # mako/cache.py
-# Copyright 2006-2022 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php

diff --git a/docassemble_base/docassemble/base/mako/cmd.py b/docassemble_base/docassemble/base/mako/cmd.py
@@ -1,5 +1,5 @@
 # mako/cmd.py
-# Copyright 2006-2022 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
@@ -25,7 +25,6 @@ def _exit():
 
 
 def cmdline(argv=None):
-
     parser = ArgumentParser()
     parser.add_argument(
         "--var",

diff --git a/docassemble_base/docassemble/base/mako/codegen.py b/docassemble_base/docassemble/base/mako/codegen.py
@@ -1,5 +1,5 @@
 # mako/codegen.py
-# Copyright 2006-2022 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
@@ -836,7 +836,6 @@ def visitExpression(self, node):
             )
             or len(self.compiler.default_filters)
         ):
-
             s = self.create_filter_callable(
                 node.escapes_code.args, "%s" % node.text, True
             )
@@ -862,13 +861,24 @@ def visitControlLine(self, node):
                 text = node.text
             self.printer.writeline(text)
             children = node.get_children()
-            # this covers the three situations where we want to insert a pass:
-            #    1) a ternary control line with no children,
-            #    2) a primary control line with nothing but its own ternary
-            #          and end control lines, and
-            #    3) any control line with no content other than comments
-            if not children or (
-                all(
+
+            # this covers the four situations where we want to insert a pass:
+            # 1) a ternary control line with no children,
+            # 2) a primary control line with nothing but its own ternary
+            #       and end control lines, and
+            # 3) any control line with no content other than comments
+            # 4) the first control block with no content other than comments
+            def _search_for_control_line():
+                for c in children:
+                    if isinstance(c, parsetree.Comment):
+                        continue
+                    elif isinstance(c, parsetree.ControlLine):
+                        return True
+                    return False
+
+            if (
+                not children
+                or all(
                     isinstance(c, (parsetree.Comment, parsetree.ControlLine))
                     for c in children
                 )
@@ -877,6 +887,7 @@ def visitControlLine(self, node):
                     for c in children
                     if isinstance(c, parsetree.ControlLine)
                 )
+                or _search_for_control_line()
             ):
                 self.printer.writeline("pass")
 
@@ -1204,7 +1215,6 @@ def visitDefTag(self, node):
 
     def visitBlockTag(self, node):
         if node is not self.node and not node.is_anonymous:
-
             if isinstance(self.node, parsetree.DefTag):
                 raise exceptions.CompileException(
                     "Named block '%s' not allowed inside of def '%s'"
@@ -1274,8 +1284,13 @@ def visitCallTag(self, node):
 
 
 _FOR_LOOP = re.compile(
-    r"^for\s+((?:\(?)\s*[A-Za-z_][A-Za-z_0-9]*"
-    r"(?:\s*,\s*(?:[A-Za-z_][A-Za-z0-9_]*),??)*\s*(?:\)?))\s+in\s+(.*):"
+    r"^for\s+((?:\(?)\s*"
+    r"(?:\(?)\s*[A-Za-z_][A-Za-z_0-9]*"
+    r"(?:\s*,\s*(?:[A-Za-z_][A-Za-z_0-9]*),??)*\s*(?:\)?)"
+    r"(?:\s*,\s*(?:"
+    r"(?:\(?)\s*[A-Za-z_][A-Za-z_0-9]*"
+    r"(?:\s*,\s*(?:[A-Za-z_][A-Za-z_0-9]*),??)*\s*(?:\)?)"
+    r"),??)*\s*(?:\)?))\s+in\s+(.*):"
 )
 
 

diff --git a/docassemble_base/docassemble/base/mako/compat.py b/docassemble_base/docassemble/base/mako/compat.py
@@ -1,17 +1,17 @@
 # mako/compat.py
-# Copyright 2006-2022 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
 import collections
+from importlib import metadata as importlib_metadata
 from importlib import util
 import inspect
 import sys
 
 win32 = sys.platform.startswith("win")
 pypy = hasattr(sys, "pypy_version_info")
-py38 = sys.version_info >= (3, 8)
 
 ArgSpec = collections.namedtuple(
     "ArgSpec", ["args", "varargs", "keywords", "defaults"]
@@ -62,12 +62,6 @@ def exception_name(exc):
     return exc.__class__.__name__
 
 
-if py38:
-    from importlib import metadata as importlib_metadata
-else:
-    import importlib_metadata  # noqa
-
-
 def importlib_metadata_get(group):
     ep = importlib_metadata.entry_points()
     if hasattr(ep, "select"):

diff --git a/docassemble_base/docassemble/base/mako/exceptions.py b/docassemble_base/docassemble/base/mako/exceptions.py
@@ -1,5 +1,5 @@
 # mako/exceptions.py
-# Copyright 2006-2022 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php

diff --git a/docassemble_base/docassemble/base/mako/ext/autohandler.py b/docassemble_base/docassemble/base/mako/ext/autohandler.py
@@ -1,5 +1,5 @@
 # ext/autohandler.py
-# Copyright 2006-2022 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php

diff --git a/docassemble_base/docassemble/base/mako/ext/babelplugin.py b/docassemble_base/docassemble/base/mako/ext/babelplugin.py
@@ -1,5 +1,5 @@
 # ext/babelplugin.py
-# Copyright 2006-2022 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php

diff --git a/docassemble_base/docassemble/base/mako/ext/beaker_cache.py b/docassemble_base/docassemble/base/mako/ext/beaker_cache.py
@@ -1,5 +1,5 @@
 # ext/beaker_cache.py
-# Copyright 2006-2022 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php

diff --git a/docassemble_base/docassemble/base/mako/ext/extract.py b/docassemble_base/docassemble/base/mako/ext/extract.py
@@ -1,5 +1,5 @@
 # ext/extract.py
-# Copyright 2006-2022 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php

diff --git a/docassemble_base/docassemble/base/mako/ext/linguaplugin.py b/docassemble_base/docassemble/base/mako/ext/linguaplugin.py
@@ -1,5 +1,5 @@
 # ext/linguaplugin.py
-# Copyright 2006-2022 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php

diff --git a/docassemble_base/docassemble/base/mako/ext/preprocessors.py b/docassemble_base/docassemble/base/mako/ext/preprocessors.py
@@ -1,5 +1,5 @@
 # ext/preprocessors.py
-# Copyright 2006-2022 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php

diff --git a/docassemble_base/docassemble/base/mako/ext/pygmentplugin.py b/docassemble_base/docassemble/base/mako/ext/pygmentplugin.py
@@ -1,5 +1,5 @@
 # ext/pygmentplugin.py
-# Copyright 2006-2022 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php

diff --git a/docassemble_base/docassemble/base/mako/ext/turbogears.py b/docassemble_base/docassemble/base/mako/ext/turbogears.py
@@ -1,5 +1,5 @@
 # ext/turbogears.py
-# Copyright 2006-2022 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php

diff --git a/docassemble_base/docassemble/base/mako/filters.py b/docassemble_base/docassemble/base/mako/filters.py
@@ -1,5 +1,5 @@
 # mako/filters.py
-# Copyright 2006-2022 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php