From 3cac647594a0c3b0acce9e99c3668286d1b769e5 Mon Sep 17 00:00:00 2001 From: "John T. Wodder II" Date: Thu, 30 Sep 2021 15:40:07 -0400 Subject: [PATCH] Remove Girder envvars from Docker Compose setup --- dandi/tests/data/dandiarchive-docker/docker-compose.yml | 4 ---- dandi/tests/fixtures.py | 8 +------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/dandi/tests/data/dandiarchive-docker/docker-compose.yml b/dandi/tests/data/dandiarchive-docker/docker-compose.yml index 96b0cb82f..81b0543fd 100644 --- a/dandi/tests/data/dandiarchive-docker/docker-compose.yml +++ b/dandi/tests/data/dandiarchive-docker/docker-compose.yml @@ -34,8 +34,6 @@ services: DJANGO_CELERY_BROKER_URL: amqp://rabbitmq:5672/ DJANGO_CONFIGURATION: DevelopmentConfiguration DJANGO_DANDI_DANDISETS_BUCKET_NAME: dandi-dandisets - DJANGO_DANDI_GIRDER_API_URL: - DJANGO_DANDI_GIRDER_API_KEY: DJANGO_DATABASE_URL: postgres://postgres:postgres@postgres:5432/django DJANGO_MINIO_STORAGE_ACCESS_KEY: minioAccessKey DJANGO_MINIO_STORAGE_ENDPOINT: minio:9000 @@ -69,8 +67,6 @@ services: DJANGO_CELERY_BROKER_URL: amqp://rabbitmq:5672/ DJANGO_CONFIGURATION: DevelopmentConfiguration DJANGO_DANDI_DANDISETS_BUCKET_NAME: dandi-dandisets - DJANGO_DANDI_GIRDER_API_URL: - DJANGO_DANDI_GIRDER_API_KEY: DJANGO_DATABASE_URL: postgres://postgres:postgres@postgres:5432/django DJANGO_MINIO_STORAGE_ACCESS_KEY: minioAccessKey DJANGO_MINIO_STORAGE_ENDPOINT: minio:9000 diff --git a/dandi/tests/fixtures.py b/dandi/tests/fixtures.py index cde12a46c..41dfd05a0 100644 --- a/dandi/tests/fixtures.py +++ b/dandi/tests/fixtures.py @@ -177,13 +177,7 @@ def docker_compose_setup(): != 0 ) - # TODO: Delete this after is - # merged: - env = dict(os.environ) - env["DJANGO_DANDI_GIRDER_API_URL"] = "http://localhost:8080/api/v1" - env["DJANGO_DANDI_GIRDER_API_KEY"] = "abc123" - env["DJANGO_DANDI_SCHEMA_VERSION"] = DANDI_SCHEMA_VERSION - + env = {**os.environ, "DJANGO_DANDI_SCHEMA_VERSION": DANDI_SCHEMA_VERSION} try: if create: run(