Merge branch 'master' into segmentation-data-loading-fix

.github/workflows/download_upload_cycle.yml

@@ -9,6 +9,8 @@ jobs:
       DJANGO_SUPERUSER_PASSWORD: django-password
       DJANGO_SUPERUSER_USERNAME: admin
       DJANGO_SUPERUSER_EMAIL: [email protected]
+      CICD_PUBLIC_USER: ${{ secrets.CICD_PUBLIC_USER }}
+      CICD_PUBLIC_PASSWORD: ${{ secrets.CICD_PUBLIC_PASSWORD }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

dev/prod.celery.env.json

@@ -7,7 +7,7 @@
     "DJANGO_CORS_ORIGIN_REGEX_WHITELIST": "",
     "DJANGO_CORS_ORIGIN_WHITELIST": "https://www.shapeworks-cloud.org",
     "DJANGO_HOMEPAGE_REDIRECT_URL": "https://www.shapeworks-cloud.org",
-    "DJANGO_DEFAULT_FROM_EMAIL": "admin@app.shapeworks-cloud.org",
+    "DJANGO_DEFAULT_FROM_EMAIL": "[email protected]",
     "DJANGO_STORAGE_BUCKET_NAME": "shapeworks-cloud-storage",
     "SSL_CERT_DIR": "/etc/ssl/certs"
 }

shapeworks_cloud/settings.py

@@ -63,5 +63,5 @@ class ProductionConfiguration(ShapeworksCloudMixin, ProductionBaseConfiguration)
 
 
 class HerokuProductionConfiguration(ShapeworksCloudMixin, HerokuProductionBaseConfiguration):
-    ALLOWED_HOSTS = ['shapeworks-cloud.herokuapp.com', 'app.shapeworks-cloud.org']
+    ALLOWED_HOSTS = ['shapeworks-cloud.herokuapp.com', 'herokuapp.com', 'app.shapeworks-cloud.org']
     LOGIN_REDIRECT_URL = 'https://www.shapeworks-cloud.org'

swcc/tests/test_download_upload.py

@@ -49,18 +49,11 @@ def is_same(dir1, dir2):
 
 def public_server_download(download_dir):
     with swcc_session() as public_server_session:
-        public_server_session.login('[email protected]', 'cicdtest')
+        username = os.getenv('CICD_PUBLIC_USER')
+        password = os.getenv('CICD_PUBLIC_PASSWORD')
+        public_server_session.login(username, password)
         all_datasets = list(models.Dataset.list())
-        dataset_subset = [
-            d
-            for d in all_datasets
-            if d.name
-            in [
-                'deep_ssm_femur_tiny_test',
-                'ellipsoid_multiple_domain_tiny_test',
-                'left_atrium_tiny_test',
-            ]
-        ]
+        dataset_subset = [d for d in all_datasets if 'CI/CD' in d.keywords]
         project_subset = [next(d.projects, None) for d in dataset_subset]
         for project in project_subset:
             if project is not None:

swcc/tox.ini

@@ -60,6 +60,8 @@ passenv =
     DJANGO_BASE_URL
     DJANGO_SUPERUSER_EMAIL
     DJANGO_SUPERUSER_PASSWORD
+    CICD_PUBLIC_USER
+    CICD_PUBLIC_PASSWORD
 deps =
     pytest
     click