Merge pull request #890 from johncrossman/COL-2126_config

COL-2126, add canvasPollerDeactivationThreshold to /api/config; minor py dep bumps

requirements.txt

@@ -10,10 +10,10 @@ Flask==2.2.2
 gunicorn==20.1.0
 lti==0.9.5
 oauthlib==3.1.1
-psycopg2-binary==2.9.4
+psycopg2-binary==2.9.5
 python-dateutil==2.8.2
 python-magic==0.4.27
-pytz==2022.5
+pytz==2022.6
 requests==2.28.1
 simplejson==3.17.6
 smart-open==4.2.0

squiggy/api/config_controller.py

@@ -40,9 +40,10 @@ def app_config():
         'assetTypes': assets_type_enums(),
         'baseUrl': app.config['VUE_LOCALHOST_BASE_URL'] or request.url_root,
         'browserKbUrl': app.config['BROWSER_KB_URL'],
+        'canvasPollerDeactivationThreshold': app.config['CANVAS_POLLER_DEACTIVATION_THRESHOLD'],
+        'developerAuthEnabled': app.config['DEVELOPER_AUTH_ENABLED'],
         'ebEnvironment': app.config.get('EB_ENVIRONMENT'),
         'emailAddressSupport': app.config['EMAIL_ADDRESS_SUPPORT'],
-        'developerAuthEnabled': app.config['DEVELOPER_AUTH_ENABLED'],
         'orderByOptions': assets_sort_by_options,
         'previewsUnsupportedMimeTypes': app.config['PREVIEWS_UNSUPPORTED_MIME_TYPES'],
         's3PreviewUrlPattern': S3_PREVIEW_URL_PATTERN,

tox.ini

@@ -30,16 +30,16 @@ commands = pytest {posargs: -p no:warnings tests}
 # Bottom of file has Flake8 settings
 commands = flake8 {posargs:application.py config consoler.py scripts squiggy tests}
 deps =
-    flake8==4.0.1
+    flake8==5.0.4
     flake8-builtins>=1.5.3
     flake8-colors>=0.1.9
     flake8-commas>=2.1.0
     flake8-docstrings>=1.6.0
     flake8-import-order>=0.18.1
-    flake8-pytest>=1.3
+    flake8-pytest>=1.4
     flake8-quotes>=3.3.1
     flake8-tidy-imports>=4.8.0
-    pep8-naming>=0.13.0
+    pep8-naming>=0.13.2
     pydocstyle>=6.1.1
 
 [flake8]