Merge branch 'feature/approval_request_script' into dev

This commit is contained in:
Aaron Louie 2020-05-29 12:13:01 -04:00
commit f88832da52
2 changed files with 3 additions and 3 deletions

View File

@ -25,7 +25,7 @@ pyjwt = "*"
requests = "*" requests = "*"
xlsxwriter = "*" xlsxwriter = "*"
webtest = "*" webtest = "*"
spiffworkflow = {editable = true,git = "https://github.com/sartography/SpiffWorkflow.git",ref = "master"} spiffworkflow = {editable = true,git = "https://github.com/sartography/SpiffWorkflow.git",ref = "deploy"}
alembic = "*" alembic = "*"
coverage = "*" coverage = "*"
sphinx = "*" sphinx = "*"

4
Pipfile.lock generated
View File

@ -1,7 +1,7 @@
{ {
"_meta": { "_meta": {
"hash": { "hash": {
"sha256": "fad2f86b02a85b074e8ff9d8f3822784444d0925b0bf4227d4b26bbff1c45c2f" "sha256": "979f996148ee181e3e0af2a3777aa1d00d0fd5d943d49df65963e694b8a88871"
}, },
"pipfile-spec": 6, "pipfile-spec": 6,
"requires": { "requires": {
@ -778,7 +778,7 @@
"spiffworkflow": { "spiffworkflow": {
"editable": true, "editable": true,
"git": "https://github.com/sartography/SpiffWorkflow.git", "git": "https://github.com/sartography/SpiffWorkflow.git",
"ref": "af021f89a8e5b2e1b15785039bad7284033b266e" "ref": "c8d87826d496af825a184bdc3f0a751e603cfe44"
}, },
"sqlalchemy": { "sqlalchemy": {
"hashes": [ "hashes": [