Merge branch 'ec2/dev' into dev

Pipfile

@@ -24,7 +24,7 @@ pyjwt = "*"
 requests = "*"
 xlsxwriter = "*"
 webtest = "*"
-spiffworkflow = {editable = true,git = "https://github.com/sartography/SpiffWorkflow.git",ref = "bug/the_horror"}
+spiffworkflow = {editable = true,git = "https://github.com/sartography/SpiffWorkflow.git",ref = "master"}
 alembic = "*"
 coverage = "*"
 sphinx = "*"
@@ -38,4 +38,4 @@ xlrd = "*"
 ldap3 = "*"
 
 [requires]
-python_version = "3.7"
+python_version = "3.6.9"

Pipfile.lock

@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "bd289126c41b0f5f2761f0415d85e1110a584256460374a9ce4cda07c0033ddd"
+            "sha256": "26d23456010d3e5a559386d412cef3beacd92d5a4e474f2afdb0737ea0f20f04"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -783,7 +783,7 @@
         "spiffworkflow": {
             "editable": true,
             "git": "https://github.com/sartography/SpiffWorkflow.git",
-            "ref": "7dc54f1205de7006bdda6d966dc957e558f3c7f3"
+            "ref": "2c9698894f7e526a91bf3ca8c4b9fc9b6b01e807"
         },
         "sqlalchemy": {
             "hashes": [

crconnect.wsgi

@@ -0,0 +1,15 @@
+python_home = '/usr/local/envs/crcpython3'
+
+import os
+import sys
+
+# Calculate path to site-packages directory.
+
+python_version = '.'.join(map(str, sys.version_info[:2]))
+site_packages = python_home + '/lib/python%s/site-packages' % python_version
+
+# Add the site-packages directory.
+
+site.addsitedir(site_packages)
+
+from crc import app as application

deploy/requirements.txt

@@ -0,0 +1,90 @@
+alabaster==0.7.12
+alembic==1.4.2
+amqp==2.5.2
+aniso8601==8.0.0
+attrs==19.3.0
+babel==2.8.0
+bcrypt==3.1.7
+beautifulsoup4==4.9.1
+billiard==3.6.3.0
+blinker==1.4
+celery==4.4.2
+certifi==2020.4.5.1
+cffi==1.14.0
+chardet==3.0.4
+click==7.1.2
+clickclick==1.2.2
+commonmark==0.9.1
+configparser==5.0.0
+connexion==2.7.0
+coverage==5.1
+docutils==0.16
+docxtpl==0.9.2
+et-xmlfile==1.0.1
+flask==1.1.2
+flask-bcrypt==0.7.1
+flask-cors==3.0.8
+flask-marshmallow==0.12.0
+flask-migrate==2.5.3
+flask-restful==0.3.8
+flask-sqlalchemy==2.4.1
+flask-sso==0.4.0
+future==0.18.2
+httpretty==1.0.2
+idna==2.9
+imagesize==1.2.0
+importlib-metadata==1.6.0
+inflection==0.4.0
+itsdangerous==1.1.0
+jdcal==1.4.1
+jinja2==2.11.2
+jsonschema==3.2.0
+kombu==4.6.8
+ldap3==2.7
+lxml==4.5.1
+mako==1.1.2
+markupsafe==1.1.1
+marshmallow==3.6.0
+marshmallow-enum==1.5.1
+marshmallow-sqlalchemy==0.23.0
+numpy==1.18.4
+openapi-spec-validator==0.2.8
+openpyxl==3.0.3
+packaging==20.4
+pandas==1.0.3
+psycopg2-binary==2.8.5
+pyasn1==0.4.8
+pycparser==2.20
+pygments==2.6.1
+pyjwt==1.7.1
+pyparsing==2.4.7
+pyrsistent==0.16.0
+python-dateutil==2.8.1
+python-docx==0.8.10
+python-editor==1.0.4
+pytz==2020.1
+pyyaml==5.3.1
+recommonmark==0.6.0
+requests==2.23.0
+six==1.14.0
+snowballstemmer==2.0.0
+soupsieve==2.0.1
+sphinx==3.0.3
+sphinxcontrib-applehelp==1.0.2
+sphinxcontrib-devhelp==1.0.2
+sphinxcontrib-htmlhelp==1.0.3
+sphinxcontrib-jsmath==1.0.1
+sphinxcontrib-qthelp==1.0.3
+sphinxcontrib-serializinghtml==1.1.4
+spiffworkflow
+sqlalchemy==1.3.17
+swagger-ui-bundle==0.0.6
+urllib3==1.25.9
+vine==1.3.0
+waitress==1.4.3
+webob==1.8.6
+webtest==2.0.35
+werkzeug==1.0.1
+xlrd==1.2.0
+xlsxwriter==1.2.8
+zipp==3.1.0

deploy/update_requirements.sh

@@ -0,0 +1,4 @@
+jq -r '.default
+        | to_entries[]
+        | .key + .value.version' \
+    ../Pipfile.lock > requirements.txt