add sws dev config

uw-it-aca · Apr 22, 2024 · a0062d1 · a0062d1
1 parent bbcb130
commit a0062d1
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 16 deletions.
diff --git a/docker/settings.py b/docker/settings.py
@@ -81,6 +81,18 @@
     }
     CSRF_TRUSTED_ORIGINS = ['https://' + os.getenv('CLUSTER_CNAME')]
 
+if os.getenv('SWS_ENV') == 'DEV':
+    RESTCLIENTS_SWS_DAO_CLASS = 'Live'
+    RESTCLIENTS_SWS_CONNECT_TIMEOUT = os.getenv(
+        'SWS_CONNECT_TIMEOUT', RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT)
+    RESTCLIENTS_SWS_TIMEOUT = os.getenv(
+        'SWS_TIMEOUT', RESTCLIENTS_DEFAULT_TIMEOUT)
+    RESTCLIENTS_SWS_POOL_SIZE = os.getenv(
+        'SWS_POOL_SIZE', RESTCLIENTS_DEFAULT_POOL_SIZE)
+    RESTCLIENTS_SWS_CERT_FILE = APPLICATION_CERT_PATH
+    RESTCLIENTS_SWS_KEY_FILE = APPLICATION_KEY_PATH
+    RESTCLIENTS_SWS_HOST = 'https://dev-ws.api.uw.edu:443'
+
 ALLOW_GRADE_SUBMISSION_OVERRIDE = (os.getenv('ENV', 'localdev') != 'prod')
 USERSERVICE_VALIDATION_MODULE = 'course_grader.dao.person.is_netid'
 USERSERVICE_OVERRIDE_AUTH_MODULE = 'course_grader.views.support.can_override_user'

diff --git a/docker/test-values.yml b/docker/test-values.yml
@@ -74,7 +74,7 @@ environmentVariables:
     value: EVAL
 
   - name: SWS_ENV
-    value: EVAL
+    value: DEV
   - name: SWS_TIMEOUT
     value: "10"
 

diff --git a/setup.py b/setup.py
@@ -21,32 +21,33 @@
     packages=['course_grader'],
     include_package_data=True,
     install_requires = [
-        'Django~=4.2',
+        'django~=4.2',
         'django-compressor',
         'django-user-agents',
         'django-userservice~=3.2',
         'django-storages[google]',
         'uw-memcached-clients~=1.0',
-        'UW-RestClients-Core~=1.4',
-        'UW-RestClients-SWS~=2.3',
-        'UW-RestClients-PWS~=2.1',
-        'UW-RestClients-Canvas~=1.2',
-        'UW-RestClients-Graderoster~=1.1',
-        'UW-RestClients-Django-Utils~=2.3',
-        'UW-Grade-Conversion-Calculator~=1.4',
-        'Django-Safe-EmailBackend~=1.2',
-        'Django-SupportTools~=3.6',
-        'Django-Persistent-Message~=1.3',
-        'UW-Django-SAML2~=1.8',
+        'uw-restclients-core~=1.4',
+        'uw-restclients-sws~=2.3',
+        'uw-restclients-pws~=2.1',
+        'uw-restclients-canvas~=1.2',
+        'uw-restclients-graderoster~=1.1',
+        'uw-restclients-django-utils~=2.3',
+        'uw-grade-conversion-calculator~=1.4',
+        'django-safe-emailbackend~=1.2',
+        'django-supporttools~=3.6',
+        'django-persistent-message~=1.3',
+        'uw-django-saml2~=1.8',
         'chardet~=4.0',
-        'lxml<5',
+        'lxml==4.9.4',
+        'xmlsec==1.3.13'
     ],
     license='Apache License, Version 2.0',
     description='UW application that supports online grade submission',
     long_description=README,
     url='https://github.com/uw-it-aca/gradepage',
-    author = "UW-IT AXDD",
-    author_email = "aca-it@uw.edu",
+    author="UW-IT T&LS",
+    author_email="aca-it@uw.edu",
     classifiers=[
         'Environment :: Web Environment',
         'Framework :: Django',