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

Update django-composed-configuration #1731

Merged
merged 2 commits into from
Oct 27, 2023
Merged

Update django-composed-configuration #1731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7e3f9e
Update `django-composed-configuration`
mvandenburgh Oct 26, 2023
4835a7d
Unpin `allauth` and remove setting
mvandenburgh Oct 26, 2023
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
7 changes: 0 additions & 7 deletions dandiapi/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,6 @@ def mutate_configuration(configuration: type[ComposedConfiguration]):
'dandiapi.zarr.apps.ZarrConfig',
] + configuration.INSTALLED_APPS

# TODO: remove this when the upstream fix is merged
# (https://github.com/girder/django-composed-configuration/pull/189)
if 'allauth.account.middleware.AccountMiddleware' not in configuration.MIDDLEWARE:
configuration.MIDDLEWARE += [
'allauth.account.middleware.AccountMiddleware',
]

# Install guardian
configuration.INSTALLED_APPS += ['guardian']

Expand Down
8 changes: 3 additions & 5 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,7 @@
'dandischema~=0.8.4',
'django~=4.1.0',
'django-admin-display',
# TODO: unpin allauth when https://github.com/girder/django-composed-configuration/pull/189
# is merged and released
'django-allauth>=0.56.1',
'django-allauth',
'django-click',
'django-configurations[database,email]',
'django-extensions',
Expand All @@ -63,7 +61,7 @@
's3-log-parse',
'zarr-checksum>=0.2.8',
# Production-only
'django-composed-configuration[prod]>=0.22.0',
'django-composed-configuration[prod]>=0.23.0',
# pin directly to a version since we're extending the private multipart interface
'django-s3-file-field[boto3]==0.3.2',
'django-storages[s3]>=1.14.2',
Expand All @@ -79,7 +77,7 @@
],
extras_require={
'dev': [
'django-composed-configuration[dev]>=0.22.0',
'django-composed-configuration[dev]>=0.23.0',
'django-debug-toolbar',
'django-s3-file-field[minio]',
'ipython',
Expand Down