Merge pull request #251 from dandi/rm-girder

Remove Girder code from API
dandi · May 12, 2021 · e647674 · e647674
2 parents 68d3ba6 + 9e82453
commit e647674
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 197 deletions.
diff --git a/README.md b/README.md
@@ -89,18 +89,6 @@ Useful sub-commands include:
 To automatically reformat all code to comply with
 some (but not all) of the style checks, run `tox -e format`.
 
-## Connecting to `dandiarchive`
-`dandiarchive` is another application and will need to be setup and run separately.
-1. Login to the `dandiarchive` Girder client using the `publish` admin account. If
-you followed the README it will be located at `http://localhost:8080/`.
-   * **NOTE**: the username of the Girder admin account used here must be `publish` for publishing to work properly. If an admin account with that username doesn't exist, it must be created.
-2. Navigate to account settings, click on the 'API keys' tab, and generate an API key.
-3. Save this API key and the Girder client URL in environment variables named `DJANGO_DANDI_GIRDER_API_KEY`
-   and `DJANGO_DANDI_GIRDER_API_URL`.
-4. Run `dandi-publish` as described above.
-
-**NOTE**: `dandiarchive` also needs to be configured to connect to `dandi-publish`. See its README for instructions.
-
 ## API Authentication
 Read-only API endpoints (i.e. `GET`, `HEAD`) do not require any
 authentication. All other endpoints require token authentication

diff --git a/dandiapi/api/girder.py b/dandiapi/api/girder.py
diff --git a/dandiapi/api/tests/girder.py b/dandiapi/api/tests/girder.py
diff --git a/dandiapi/settings.py b/dandiapi/settings.py
@@ -47,8 +47,6 @@ def before_binding(configuration: Type[ComposedConfiguration]):
 
     DANDI_DANDISETS_BUCKET_NAME = values.Value(environ_required=True)
     DANDI_DANDISETS_BUCKET_PREFIX = values.Value(default='', environ=True)
-    DANDI_GIRDER_API_URL = values.URLValue(environ_required=True)
-    DANDI_GIRDER_API_KEY = values.Value(environ_required=True)
     DANDI_SCHEMA_VERSION = values.Value(environ_required=True)
 
     DANDI_DOI_API_URL = values.URLValue(environ=True)
@@ -70,8 +68,6 @@ class TestingConfiguration(DandiMixin, TestingBaseConfiguration):
 
     DANDI_DANDISETS_BUCKET_NAME = 'test-dandiapi-dandisets'
     DANDI_DANDISETS_BUCKET_PREFIX = 'test-prefix/'
-    DANDI_GIRDER_API_KEY = 'testkey'
-    DANDI_GIRDER_API_URL = 'http://girder.test/api/v1'
 
 
 class ProductionConfiguration(DandiMixin, ProductionBaseConfiguration):

diff --git a/dev/.env.docker-compose b/dev/.env.docker-compose
@@ -7,6 +7,4 @@ DJANGO_MINIO_STORAGE_SECRET_KEY=minioSecretKey
 DJANGO_STORAGE_BUCKET_NAME=django-storage
 DJANGO_MINIO_STORAGE_MEDIA_URL=http://localhost:9000/django-storage
 DJANGO_DANDI_DANDISETS_BUCKET_NAME=dandi-dandisets
-DJANGO_DANDI_GIRDER_API_URL=https://girder.dandiarchive.org/api/v1
-DJANGO_DANDI_GIRDER_API_KEY=girderkey
 DJANGO_DANDI_SCHEMA_VERSION=0.3.0
diff --git a/dev/.env.docker-compose-native b/dev/.env.docker-compose-native
@@ -6,6 +6,4 @@ DJANGO_MINIO_STORAGE_ACCESS_KEY=minioAccessKey
 DJANGO_MINIO_STORAGE_SECRET_KEY=minioSecretKey
 DJANGO_STORAGE_BUCKET_NAME=django-storage
 DJANGO_DANDI_DANDISETS_BUCKET_NAME=dandi-dandisets
-DJANGO_DANDI_GIRDER_API_URL=https://girder.dandiarchive.org/api/v1
-DJANGO_DANDI_GIRDER_API_KEY=girderkey
 DJANGO_DANDI_SCHEMA_VERSION=0.3.0