Skip to content

Commit 5917b33

Browse files
jhpylejhpyle
committed
changelog; startup hook
1 parent 0b8f534 commit 5917b33

File tree

12 files changed

+34
-46
lines changed

12 files changed

+34
-46
lines changed

‎CHANGELOG.md

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
# Change Log
22

3-
## [1.2.0] - 2020-11-27
3+
## [1.2.0] - 2020-11-28
44
### Changed
5-
- Upgraded Python to 3.8 and updated dependencies. These changes
6-
require a system upgrade. See
5+
- Upgraded Python to version 3.8 and upgraded dependencies. These
6+
changes require a system upgrade. See
77
https://docassemble.org/docs/docker.html#upgrading for instructions
88
on how to perform a system upgrade. Because Python changed between
99
version 3.6 and and 3.8, you should test your code carefully to make
1010
sure it still works in Python 3.8.
11+
- Among other upgrades, Bootstrap has been upgraded to version 4.5.3.
12+
If you are using Bootstrap themes, you may wish to upgrade your
13+
Bootstrap theme.
1114
### Fixed
1215
- Issue with user privileges.
1316

‎Docker/initialize.sh

+4
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,10 @@ echo "16" >&2
429429
source /dev/stdin < <(su -c "source \"${DA_ACTIVATE}\" && python -m docassemble.base.read_config \"${DA_CONFIG_FILE}\"" www-data)
430430
export LOGDIRECTORY="${LOGDIRECTORY:-${DA_ROOT}/log}"
431431

432+
echo "16.1" >&2
433+
434+
python -m docassemble.webapp.starthook "${DA_CONFIG_FILE}"
435+
432436
echo "16.5" >&2
433437

434438
if [ "${DAWEBSERVER:-nginx}" = "nginx" ]; then

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ To get help with using **docassemble**, join the [docassemble Slack
55
group].
66

77
[docassemble web site]: https://docassemble.org
8-
[docassemble Slack group]: https://join.slack.com/t/docassemble/shared_invite/enQtMjQ0Njc1NDk0NjU2LTUyOGIxMDcxYzg1NGZhNDY5NDI2ZTVkMDhlOGJlNTgzZTUwYzNhYTJiMTJmMDYzYjQ0YWNmNjFiOTE5NmQzMjc
8+
[docassemble Slack group]: https://docassemble.org/docs/support.html

‎docassemble/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ To get help with using **docassemble**, join the [docassemble Slack
55
group].
66

77
[docassemble web site]: https://docassemble.org
8-
[docassemble Slack group]: https://join.slack.com/t/docassemble/shared_invite/enQtMjQ0Njc1NDk0NjU2LTUyOGIxMDcxYzg1NGZhNDY5NDI2ZTVkMDhlOGJlNTgzZTUwYzNhYTJiMTJmMDYzYjQ0YWNmNjFiOTE5NmQzMjc
8+
[docassemble Slack group]: https://docassemble.org/docs/support.html

‎docassemble_base/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ To get help with using **docassemble**, join the [docassemble Slack
55
group].
66

77
[docassemble web site]: https://docassemble.org
8-
[docassemble Slack group]: https://join.slack.com/t/docassemble/shared_invite/enQtMjQ0Njc1NDk0NjU2LTUyOGIxMDcxYzg1NGZhNDY5NDI2ZTVkMDhlOGJlNTgzZTUwYzNhYTJiMTJmMDYzYjQ0YWNmNjFiOTE5NmQzMjc
8+
[docassemble Slack group]: https://docassemble.org/docs/support.html

‎docassemble_base/setup.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ def find_package_data(where='.', package='', exclude=standard_exclude, exclude_d
4545
out.setdefault(package, []).append(prefix+name)
4646
return out
4747

48-
openpyxl_version = "2.5.14" if sys.version.startswith('3.5') else "3.0.5"
49-
twine_version = "1.15.0" if sys.version.startswith('3.5') else "3.2.0"
5048
install_requires = [
5149
'docassemble==1.1.112',
5250
"3to2==1.1.1",
@@ -109,7 +107,7 @@ def find_package_data(where='.', package='', exclude=standard_exclude, exclude_d
109107
"numpy==1.19.4",
110108
"oauth2client==4.1.3",
111109
"oauthlib==3.1.0",
112-
"openpyxl==" + openpyxl_version,
110+
"openpyxl==3.0.5",
113111
"ordered-set==4.0.2",
114112
"packaging==20.4",
115113
"pandas==1.1.4",
@@ -169,7 +167,7 @@ def find_package_data(where='.', package='', exclude=standard_exclude, exclude_d
169167
"toml==0.10.2",
170168
"tqdm==4.53.0",
171169
"twilio==6.48.0",
172-
"twine==" + twine_version,
170+
"twine==3.2.0",
173171
"tzlocal==2.1",
174172
"ua-parser==0.10.0",
175173
"uritemplate==3.0.1",

‎docassemble_demo/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ To get help with using **docassemble**, join the [docassemble Slack
55
group].
66

77
[docassemble web site]: https://docassemble.org
8-
[docassemble Slack group]: https://join.slack.com/t/docassemble/shared_invite/enQtMjQ0Njc1NDk0NjU2LTUyOGIxMDcxYzg1NGZhNDY5NDI2ZTVkMDhlOGJlNTgzZTUwYzNhYTJiMTJmMDYzYjQ0YWNmNjFiOTE5NmQzMjc
8+
[docassemble Slack group]: https://docassemble.org/docs/support.html

‎docassemble_demo/docassemble/demo/data/static/lumen.min.css

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docassemble_webapp/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ To get help with using **docassemble**, join the [docassemble Slack
55
group].
66

77
[docassemble web site]: https://docassemble.org
8-
[docassemble Slack group]: https://join.slack.com/t/docassemble/shared_invite/enQtMjQ0Njc1NDk0NjU2LTUyOGIxMDcxYzg1NGZhNDY5NDI2ZTVkMDhlOGJlNTgzZTUwYzNhYTJiMTJmMDYzYjQ0YWNmNjFiOTE5NmQzMjc
8+
[docassemble Slack group]: https://docassemble.org/docs/support.html

‎docassemble_webapp/docassemble/webapp/starthook.py

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import sys
2+
import docassemble.base.config
3+
4+
if __name__ == "__main__":
5+
docassemble.base.config.load(arguments=sys.argv)
6+
sys.exit(0)

‎docassemble_webapp/docassemble/webapp/update.py

+4-21
Original file line numberDiff line numberDiff line change
@@ -82,27 +82,10 @@ def check_for_updates(doing_startup=False):
8282
results = dict()
8383
sys.stderr.write("check_for_updates: 0.5 after " + str(time.time() - start_time) + " seconds\n")
8484

85-
num_deleted = Package.query.filter_by(name='psycopg2').delete()
86-
if num_deleted > 0:
87-
db.session.commit()
88-
num_deleted = Package.query.filter_by(name='pdfminer').delete()
89-
if num_deleted > 0:
90-
db.session.commit()
91-
num_deleted = Package.query.filter_by(name='pdfminer3k').delete()
92-
if num_deleted > 0:
93-
db.session.commit()
94-
num_deleted = Package.query.filter_by(name='py-bcrypt').delete()
95-
if num_deleted > 0:
96-
db.session.commit()
97-
num_deleted = Package.query.filter_by(name='pycrypto').delete()
98-
if num_deleted > 0:
99-
db.session.commit()
100-
num_deleted = Package.query.filter_by(name='constraint').delete()
101-
if num_deleted > 0:
102-
db.session.commit()
103-
num_deleted = Package.query.filter_by(name='distutils2').delete()
104-
if num_deleted > 0:
105-
db.session.commit()
85+
for package_name in ('psycopg2', 'pdfminer', 'pdfminer3k', 'py-bcrypt', 'pycrypto', 'constraint', 'distutils2'):
86+
num_deleted = Package.query.filter_by(name=package_name).delete()
87+
if num_deleted > 0:
88+
db.session.commit()
10689
sys.stderr.write("check_for_updates: 1 after " + str(time.time() - start_time) + " seconds\n")
10790
installed_packages = get_installed_distributions()
10891
for package in installed_packages:

‎docassemble_webapp/setup.py

-6
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
def read(fname):
66
return open(os.path.join(os.path.dirname(__file__), fname)).read()
77

8-
openpyxl_version = "2.5.14" if sys.version.startswith('3.5') else "3.0.5"
9-
twine_version = "1.15.0" if sys.version.startswith('3.5') else "3.2.0"
108
install_requires = [
119
'docassemble==1.1.112',
1210
'docassemble.base==1.1.112',
@@ -45,11 +43,7 @@ def read(fname):
4543
"convertapi==1.4.0",
4644
"cryptography==3.2.1",
4745
"dnspython==1.16.0",
48-
"docassemble==1.1.110",
4946
"Docassemble-Flask-User==0.6.22",
50-
"docassemble.base==1.1.110",
51-
"docassemble.demo==1.1.110",
52-
"docassemble.webapp==1.1.110",
5347
"docassemblekvsession==0.2",
5448
"docopt==0.6.2",
5549
"docutils==0.16",

0 commit comments

Comments
 (0)