Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove Girder code from API #251

Merged
merged 1 commit into from
May 12, 2021
Merged

Remove Girder code from API #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
100 changes: 0 additions & 100 deletions dandiapi/api/girder.py
View file
Open in desktop

This file was deleted.

77 changes: 0 additions & 77 deletions dandiapi/api/tests/girder.py
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions dandiapi/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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):
Expand Down
2 changes: 0 additions & 2 deletions dev/.env.docker-compose
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 0 additions & 2 deletions dev/.env.docker-compose-native
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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