-
Notifications
You must be signed in to change notification settings - Fork 6
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Job output transform #548
base: master
Are you sure you want to change the base?
Job output transform #548
Changes from 8 commits
07a27e7
3c1ef15
6d23b4c
d85aa30
b02bb01
d7c727f
b3b4f52
dcde84e
d6b8c6c
b3048bb
a23519e
ee9c208
a8d4473
574314c
0304b3a
4cf0e80
81721dd
e66c582
34cd699
fe71427
71f6f96
34ddd87
5fe2af0
9fedeb7
13d3d17
bc14eac
a837ff0
037a8a4
a658579
38314b6
472ac6b
4ee2247
a71187d
e6143b5
6bfb158
7591617
41147b0
3448038
ce4bbb3
9d823e8
969f76b
42c772d
e4c3194
c3b0db7
7544834
a7fb477
bf1118d
3c24142
7c1ff74
e70233e
32bdb81
a7f8216
c017929
2ce3667
f9aee2f
0bc4822
a2e8eee
216b7ea
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -228,10 +228,10 @@ conda-env-export: ## export the conda environment | |
install: install-all ## alias for 'install-all' target | ||
|
||
.PHONY: install-run | ||
install-run: conda-install install-sys install-pkg install-raw ## install requirements and application to run locally | ||
install-run: conda-install install-sys install-pkg install-raw install-transform ## install requirements and application to run locally | ||
|
||
.PHONY: install-all | ||
install-all: conda-install install-sys install-pkg install-pip install-dev ## install application with all dependencies | ||
install-all: conda-install install-sys install-pkg install-pip install-transform ## install application with all dependencies | ||
|
||
.PHONY: install-doc | ||
install-doc: install-pip ## install documentation dependencies | ||
|
@@ -298,6 +298,28 @@ install-npm-remarklint: install-npm ## install remark-lint dependency for 'ch | |
remark-preset-lint-markdown-style-guide \ | ||
) | ||
|
||
y.PHONY: install-transform | ||
Nazim-crim marked this conversation as resolved.
Show resolved
Hide resolved
|
||
install-transform: install-cairo-dependencies # install-trfm-dependencies install-gdal | ||
|
||
|
||
#.PHONY: install-gdal | ||
#install-gdal: ## install GDAL | ||
# @echo "Installing conda packages for GDAL" | ||
# @bash -c '$(CONDA_CMD) conda install -c conda-forge gdal' | ||
# @echo "Install GDAL complete." | ||
# | ||
#.PHONY: install-trfm-dependencies | ||
#install-trfm-dependencies: ## install required dependencies for Transformer | ||
# @echo "Install required dependencies for Transformer" | ||
# @bash -c '$(CONDA_CMD) pip install --upgrade -r "$(APP_ROOT)/requirements-trfm.txt"' | ||
# @echo "Install with pip complete." | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Leftover code to remove if not needed anymore. |
||
|
||
.PHONY: install-cairo-dependencies | ||
install-cairo-dependencies: ## install required dependencies for Transformer | ||
@[ -f "$(shell which cairo)" ] || ( \ | ||
echo "Binary package manager cairo not found. Attempting to install it."; \ | ||
apt-get install libpangocairo-1.0-0 \ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is this absolutely necessary? Installing the I expect the Docker image will break otherwise, since this won't be installed. |
||
) | ||
## -- Cleanup targets ----------------------------------------------------------------------------------------------- ## | ||
|
||
.PHONY: clean | ||
|
@@ -532,6 +554,7 @@ check-security-deps-only: mkdir-reports ## run security checks on package depen | |
-r "$(APP_ROOT)/requirements-dev.txt" \ | ||
-r "$(APP_ROOT)/requirements-doc.txt" \ | ||
-r "$(APP_ROOT)/requirements-sys.txt" \ | ||
-r "$(APP_ROOT)/requirements-trfm.txt" \ | ||
$(SAFETY_IGNORE) \ | ||
1> >(tee "$(REPORTS_DIR)/check-security-deps.txt")' | ||
|
||
|
@@ -834,6 +857,14 @@ docker-clean: ## remove all built docker images (only matching current/latest v | |
docker rmi -f "$(APP_NAME):latest" || true | ||
docker rmi -f "$(APP_NAME):base" || true | ||
|
||
.PHONY: transformer | ||
fix-fstring-only: mkdir-reports | ||
@echo "Fixing code string formats substitutions to f-string definitions..." | ||
@-rm -f "$(REPORTS_DIR)/fixed-fstring.txt" | ||
@bash -c '$(CONDA_CMD) \ | ||
flynt $(FLYNT_FLAGS) "$(APP_ROOT)" \ | ||
1> >(tee "$(REPORTS_DIR)/fixed-fstring.txt")' | ||
|
||
## -- Launchers targets --------------------------------------------------------------------------------------------- ## | ||
|
||
.PHONY: start | ||
|
@@ -848,3 +879,5 @@ stop: ## kill application instance(s) started with gunicorn (pserve) | |
.PHONY: stat | ||
stat: ## display processes with PID(s) of gunicorn (pserve) instance(s) running the application | ||
@lsof -i :4001 || echo "No instance running" | ||
|
||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. undo changes for local use |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -33,3 +33,13 @@ typing_extensions | |
WebTest | ||
wsgiproxy | ||
WSGIProxy2 | ||
|
||
# transformer | ||
fpdf | ||
Pillow | ||
pandas | ||
cairosvg | ||
multipagetiff | ||
# gdal | ||
rasterio | ||
python-magic | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The Makefile refers to a |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -53,6 +53,7 @@ json2xml<3.19.0; python_version <= "3.6" # pyup: ignore | |
# reduced dependencies contrains to let packages update to latest (https://github.com/vinitkumar/json2xml/issues/157) | ||
json2xml>=3.20.0; python_version >= "3.7" | ||
jsonschema>=3.0.1 | ||
|
||
# FIXME: kombu for pymongo>=4 not yet released as 5.3.0 (only pre-releases available) | ||
# - https://github.com/crim-ca/weaver/issues/386 | ||
# - https://github.com/celery/kombu/pull/1536 | ||
|
@@ -101,3 +102,13 @@ urlmatch | |
xmltodict | ||
webob | ||
werkzeug>2 | ||
|
||
# transformer | ||
fpdf | ||
Pillow | ||
pandas | ||
cairosvg | ||
multipagetiff | ||
# gdal | ||
rasterio | ||
python-magic | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Reuse |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
install-dev
should remain here