changelog; startup hook

boubakarforseti · Nov 28, 2020 · 5917b33 · 5917b33
1 parent 0b8f534
commit 5917b33
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 46 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,13 +1,16 @@
 # Change Log
 
-## [1.2.0] - 2020-11-27
+## [1.2.0] - 2020-11-28
 ### Changed
-- Upgraded Python to 3.8 and updated dependencies.  These changes
-  require a system upgrade.  See
+- Upgraded Python to version 3.8 and upgraded dependencies.  These
+  changes require a system upgrade.  See
   https://docassemble.org/docs/docker.html#upgrading for instructions
   on how to perform a system upgrade.  Because Python changed between
   version 3.6 and and 3.8, you should test your code carefully to make
   sure it still works in Python 3.8.
+- Among other upgrades, Bootstrap has been upgraded to version 4.5.3.
+  If you are using Bootstrap themes, you may wish to upgrade your
+  Bootstrap theme.
 ### Fixed
 - Issue with user privileges.
 

diff --git a/Docker/initialize.sh b/Docker/initialize.sh
@@ -429,6 +429,10 @@ echo "16" >&2
 source /dev/stdin < <(su -c "source \"${DA_ACTIVATE}\" && python -m docassemble.base.read_config \"${DA_CONFIG_FILE}\"" www-data)
 export LOGDIRECTORY="${LOGDIRECTORY:-${DA_ROOT}/log}"
 
+echo "16.1" >&2
+
+python -m docassemble.webapp.starthook "${DA_CONFIG_FILE}"
+
 echo "16.5" >&2
 
 if [ "${DAWEBSERVER:-nginx}" = "nginx" ]; then

diff --git a/README.md b/README.md
@@ -5,4 +5,4 @@ To get help with using **docassemble**, join the [docassemble Slack
 group].
 
 [docassemble web site]: https://docassemble.org
-[docassemble Slack group]: https://join.slack.com/t/docassemble/shared_invite/enQtMjQ0Njc1NDk0NjU2LTUyOGIxMDcxYzg1NGZhNDY5NDI2ZTVkMDhlOGJlNTgzZTUwYzNhYTJiMTJmMDYzYjQ0YWNmNjFiOTE5NmQzMjc
+[docassemble Slack group]: https://docassemble.org/docs/support.html
diff --git a/docassemble/README.md b/docassemble/README.md
@@ -5,4 +5,4 @@ To get help with using **docassemble**, join the [docassemble Slack
 group].
 
 [docassemble web site]: https://docassemble.org
-[docassemble Slack group]: https://join.slack.com/t/docassemble/shared_invite/enQtMjQ0Njc1NDk0NjU2LTUyOGIxMDcxYzg1NGZhNDY5NDI2ZTVkMDhlOGJlNTgzZTUwYzNhYTJiMTJmMDYzYjQ0YWNmNjFiOTE5NmQzMjc
+[docassemble Slack group]: https://docassemble.org/docs/support.html
diff --git a/docassemble_base/README.md b/docassemble_base/README.md
@@ -5,4 +5,4 @@ To get help with using **docassemble**, join the [docassemble Slack
 group].
 
 [docassemble web site]: https://docassemble.org
-[docassemble Slack group]: https://join.slack.com/t/docassemble/shared_invite/enQtMjQ0Njc1NDk0NjU2LTUyOGIxMDcxYzg1NGZhNDY5NDI2ZTVkMDhlOGJlNTgzZTUwYzNhYTJiMTJmMDYzYjQ0YWNmNjFiOTE5NmQzMjc
+[docassemble Slack group]: https://docassemble.org/docs/support.html
diff --git a/docassemble_base/setup.py b/docassemble_base/setup.py
@@ -45,8 +45,6 @@ def find_package_data(where='.', package='', exclude=standard_exclude, exclude_d
                 out.setdefault(package, []).append(prefix+name)
     return out
 
-openpyxl_version = "2.5.14" if sys.version.startswith('3.5') else "3.0.5"
-twine_version = "1.15.0" if sys.version.startswith('3.5') else "3.2.0"
 install_requires = [
     'docassemble==1.1.112',
     "3to2==1.1.1",
@@ -109,7 +107,7 @@ def find_package_data(where='.', package='', exclude=standard_exclude, exclude_d
     "numpy==1.19.4",
     "oauth2client==4.1.3",
     "oauthlib==3.1.0",
-    "openpyxl==" + openpyxl_version,
+    "openpyxl==3.0.5",
     "ordered-set==4.0.2",
     "packaging==20.4",
     "pandas==1.1.4",
@@ -169,7 +167,7 @@ def find_package_data(where='.', package='', exclude=standard_exclude, exclude_d
     "toml==0.10.2",
     "tqdm==4.53.0",
     "twilio==6.48.0",
-    "twine==" + twine_version,
+    "twine==3.2.0",
     "tzlocal==2.1",
     "ua-parser==0.10.0",
     "uritemplate==3.0.1",

diff --git a/docassemble_demo/README.md b/docassemble_demo/README.md
@@ -5,4 +5,4 @@ To get help with using **docassemble**, join the [docassemble Slack
 group].
 
 [docassemble web site]: https://docassemble.org
-[docassemble Slack group]: https://join.slack.com/t/docassemble/shared_invite/enQtMjQ0Njc1NDk0NjU2LTUyOGIxMDcxYzg1NGZhNDY5NDI2ZTVkMDhlOGJlNTgzZTUwYzNhYTJiMTJmMDYzYjQ0YWNmNjFiOTE5NmQzMjc
+[docassemble Slack group]: https://docassemble.org/docs/support.html
diff --git a/docassemble_demo/docassemble/demo/data/static/lumen.min.css b/docassemble_demo/docassemble/demo/data/static/lumen.min.css
diff --git a/docassemble_webapp/README.md b/docassemble_webapp/README.md
@@ -5,4 +5,4 @@ To get help with using **docassemble**, join the [docassemble Slack
 group].
 
 [docassemble web site]: https://docassemble.org
-[docassemble Slack group]: https://join.slack.com/t/docassemble/shared_invite/enQtMjQ0Njc1NDk0NjU2LTUyOGIxMDcxYzg1NGZhNDY5NDI2ZTVkMDhlOGJlNTgzZTUwYzNhYTJiMTJmMDYzYjQ0YWNmNjFiOTE5NmQzMjc
+[docassemble Slack group]: https://docassemble.org/docs/support.html
diff --git a/docassemble_webapp/docassemble/webapp/starthook.py b/docassemble_webapp/docassemble/webapp/starthook.py
@@ -0,0 +1,6 @@
+import sys
+import docassemble.base.config
+
+if __name__ == "__main__":
+    docassemble.base.config.load(arguments=sys.argv)
+    sys.exit(0)
diff --git a/docassemble_webapp/docassemble/webapp/update.py b/docassemble_webapp/docassemble/webapp/update.py
@@ -82,27 +82,10 @@ def check_for_updates(doing_startup=False):
     results = dict()
     sys.stderr.write("check_for_updates: 0.5 after " + str(time.time() - start_time) + " seconds\n")
 
-    num_deleted = Package.query.filter_by(name='psycopg2').delete()
-    if num_deleted > 0:
-        db.session.commit()
-    num_deleted = Package.query.filter_by(name='pdfminer').delete()
-    if num_deleted > 0:
-        db.session.commit()
-    num_deleted = Package.query.filter_by(name='pdfminer3k').delete()
-    if num_deleted > 0:
-        db.session.commit()
-    num_deleted = Package.query.filter_by(name='py-bcrypt').delete()
-    if num_deleted > 0:
-        db.session.commit()
-    num_deleted = Package.query.filter_by(name='pycrypto').delete()
-    if num_deleted > 0:
-        db.session.commit()
-    num_deleted = Package.query.filter_by(name='constraint').delete()
-    if num_deleted > 0:
-        db.session.commit()
-    num_deleted = Package.query.filter_by(name='distutils2').delete()
-    if num_deleted > 0:
-        db.session.commit()
+    for package_name in ('psycopg2', 'pdfminer', 'pdfminer3k', 'py-bcrypt', 'pycrypto', 'constraint', 'distutils2'):
+        num_deleted = Package.query.filter_by(name=package_name).delete()
+        if num_deleted > 0:
+            db.session.commit()
     sys.stderr.write("check_for_updates: 1 after " + str(time.time() - start_time) + " seconds\n")
     installed_packages = get_installed_distributions()
     for package in installed_packages:

diff --git a/docassemble_webapp/setup.py b/docassemble_webapp/setup.py
@@ -5,8 +5,6 @@
 def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
-openpyxl_version = "2.5.14" if sys.version.startswith('3.5') else "3.0.5"
-twine_version = "1.15.0" if sys.version.startswith('3.5') else "3.2.0"
 install_requires = [
     'docassemble==1.1.112',
     'docassemble.base==1.1.112',
@@ -45,11 +43,7 @@ def read(fname):
     "convertapi==1.4.0",
     "cryptography==3.2.1",
     "dnspython==1.16.0",
-    "docassemble==1.1.110",
     "Docassemble-Flask-User==0.6.22",
-    "docassemble.base==1.1.110",
-    "docassemble.demo==1.1.110",
-    "docassemble.webapp==1.1.110",
     "docassemblekvsession==0.2",
     "docopt==0.6.2",
     "docutils==0.16",