ref: change names

dandi/publish/admin.py → dandiapi/api/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from dandi.publish.models import Asset, Dandiset, DraftVersion, Version
+from dandiapi.api.models import Asset, Dandiset, DraftVersion, Version
 
 
 @admin.register(Dandiset)

dandi/publish/apps.py → dandiapi/api/apps.py

@@ -2,5 +2,5 @@
 
 
 class PublishConfig(AppConfig):
-    name = 'dandi.publish'
+    name = 'dandiapi.api'
     verbose_name = 'DANDI: Publish'

dandi/publish/migrations/0001_initial.py → dandiapi/api/migrations/0001_initial.py

@@ -7,8 +7,8 @@
 from django.db import migrations, models
 import django.db.models.deletion
 
-import dandi.publish.models
-import dandi.publish.storage
+import dandiapi.api.models
+import dandiapi.api.storage
 
 
 class Migration(migrations.Migration):
@@ -51,7 +51,7 @@ class Migration(migrations.Migration):
                 (
                     'version',
                     models.CharField(
-                        default=dandi.publish.models.version._get_default_version,
+                        default=dandiapi.api.models.version._get_default_version,
                         max_length=13,
                         validators=[django.core.validators.RegexValidator('^0\\.\\d{6}\\.\\d{4}$')],
                     ),
@@ -67,7 +67,7 @@ class Migration(migrations.Migration):
                     models.ForeignKey(
                         on_delete=django.db.models.deletion.CASCADE,
                         related_name='versions',
-                        to='publish.Dandiset',
+                        to='api.Dandiset',
                     ),
                 ),
             ],
@@ -100,10 +100,10 @@ class Migration(migrations.Migration):
                     'blob',
                     models.FileField(
                         blank=True,
-                        storage=dandi.publish.storage.create_s3_storage(
+                        storage=dandiapi.api.storage.create_s3_storage(
                             settings.DANDI_DANDISETS_BUCKET_NAME
                         ),
-                        upload_to=dandi.publish.models.asset._get_asset_blob_prefix,
+                        upload_to=dandiapi.api.models.asset._get_asset_blob_prefix,
                     ),
                 ),
                 ('created', models.DateTimeField(auto_now_add=True)),
@@ -113,7 +113,7 @@ class Migration(migrations.Migration):
                     models.ForeignKey(
                         on_delete=django.db.models.deletion.CASCADE,
                         related_name='assets',
-                        to='publish.Version',
+                        to='api.Version',
                     ),
                 ),
             ],

dandi/publish/migrations/0002_alter_version_meta.py → dandiapi/api/migrations/0002_alter_version_meta.py

@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('publish', '0001_initial'),
+        ('api', '0001_initial'),
     ]
 
     operations = [

dandi/publish/migrations/0003_asset_ordering.py → dandiapi/api/migrations/0003_asset_ordering.py

@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('publish', '0002_alter_version_meta'),
+        ('api', '0002_alter_version_meta'),
     ]
 
     operations = [

dandi/publish/migrations/0004_auto_20200722_1718.py → dandiapi/api/migrations/0004_auto_20200722_1718.py

@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('publish', '0003_asset_ordering'),
+        ('api', '0003_asset_ordering'),
     ]
 
     operations = [

dandi/publish/migrations/0005_add_drafts_model.py → dandiapi/api/migrations/0005_add_drafts_model.py

@@ -7,7 +7,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('publish', '0004_auto_20200722_1718'),
+        ('api', '0004_auto_20200722_1718'),
     ]
 
     operations = [
@@ -20,7 +20,7 @@ class Migration(migrations.Migration):
                         on_delete=django.db.models.deletion.CASCADE,
                         primary_key=True,
                         serialize=False,
-                        to='publish.Dandiset',
+                        to='api.Dandiset',
                     ),
                 ),
                 ('name', models.CharField(max_length=150)),

dandi/publish/migrations/0006_populate_drafts_from_versions.py → dandiapi/api/migrations/0006_populate_drafts_from_versions.py

@@ -4,8 +4,8 @@
 
 
 def populate_drafts(apps, schema_editor):
-    Dandiset = apps.get_model('publish', 'Dandiset')  # noqa: N806
-    DraftVersion = apps.get_model('publish', 'DraftVersion')  # noqa: N806
+    Dandiset = apps.get_model('api', 'Dandiset')  # noqa: N806
+    DraftVersion = apps.get_model('api', 'DraftVersion')  # noqa: N806
 
     for dandiset in Dandiset.objects.all():
         try:
@@ -24,7 +24,7 @@ def populate_drafts(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('publish', '0005_add_drafts_model'),
+        ('api', '0005_add_drafts_model'),
     ]
 
     operations = [

dandiapi/api/migrations/0007_deconstructable_file_field.py

@@ -0,0 +1,23 @@
+from django.db import migrations
+
+import dandiapi.api.models.asset
+import dandiapi.api.storage
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0006_populate_drafts_from_versions'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='asset',
+            name='blob',
+            field=dandiapi.api.storage.DeconstructableFileField(
+                blank=True,
+                storage=dandiapi.api.models.asset._get_asset_blob_storage,
+                upload_to=dandiapi.api.models.asset._get_asset_blob_prefix,
+            ),
+        ),
+    ]

dandi/publish/migrations/0008_draft_version_related_name.py → dandiapi/api/migrations/0008_draft_version_related_name.py

@@ -7,7 +7,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('publish', '0007_deconstructable_file_field'),
+        ('api', '0007_deconstructable_file_field'),
     ]
 
     operations = [
@@ -19,7 +19,7 @@ class Migration(migrations.Migration):
                 primary_key=True,
                 related_name='draft_version',
                 serialize=False,
-                to='publish.Dandiset',
+                to='api.Dandiset',
             ),
         ),
     ]

dandi/publish/migrations/0009_remove_description.py → dandiapi/api/migrations/0009_remove_description.py

@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('publish', '0008_draft_version_related_name'),
+        ('api', '0008_draft_version_related_name'),
     ]
 
     operations = [

dandi/publish/migrations/0009_rename_modified.py → dandiapi/api/migrations/0009_rename_modified.py

@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('publish', '0008_draft_version_related_name'),
+        ('api', '0008_draft_version_related_name'),
     ]
 
     operations = [

dandi/publish/migrations/0010_timestampedmodel.py → dandiapi/api/migrations/0010_timestampedmodel.py

@@ -7,7 +7,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('publish', '0009_rename_modified'),
+        ('api', '0009_rename_modified'),
     ]
 
     operations = [

dandi/publish/migrations/0011_merge.py → dandiapi/api/migrations/0011_merge.py

@@ -6,8 +6,8 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('publish', '0010_timestampedmodel'),
-        ('publish', '0009_remove_description'),
+        ('api', '0010_timestampedmodel'),
+        ('api', '0009_remove_description'),
     ]
 
     operations = []

dandi/publish/models/asset.py → dandiapi/api/models/asset.py

@@ -15,8 +15,8 @@
 from django.db.models import Sum
 from django_extensions.db.models import TimeStampedModel
 
-from dandi.publish.girder import GirderClient, GirderFile
-from dandi.publish.storage import DeconstructableFileField, create_s3_storage
+from dandiapi.api.girder import GirderClient, GirderFile
+from dandiapi.api.storage import DeconstructableFileField, create_s3_storage
 
 from .version import Version
 

dandi/publish/models/dandiset.py → dandiapi/api/models/dandiset.py

@@ -8,7 +8,7 @@
 from django.db import models
 from django_extensions.db.models import TimeStampedModel
 
-from dandi.publish.girder import GirderClient, GirderError
+from dandiapi.api.girder import GirderClient, GirderError
 
 logger = logging.getLogger(__name__)
 

dandi/publish/models/version.py → dandiapi/api/models/version.py

@@ -10,7 +10,7 @@
 from django.db import models
 from django_extensions.db.models import TimeStampedModel
 
-from dandi.publish.girder import GirderClient
+from dandiapi.api.girder import GirderClient
 
 from .common import SelectRelatedManager
 from .dandiset import Dandiset

dandi/publish/tasks.py → dandiapi/api/tasks.py

@@ -2,8 +2,8 @@
 from celery.utils.log import get_task_logger
 from django.db.transaction import atomic
 
-from dandi.publish.girder import GirderClient
-from dandi.publish.models import Asset, Dandiset, Version
+from dandiapi.api.girder import GirderClient
+from dandiapi.api.models import Asset, Dandiset, Version
 
 logger = get_task_logger(__name__)
 

dandi/publish/tests/factories.py → dandiapi/api/tests/factories.py

@@ -1,7 +1,7 @@
 from django.contrib.auth.models import User
 import factory.django
 
-from dandi.publish.models import Asset, Dandiset, DraftVersion, Version
+from dandiapi.api.models import Asset, Dandiset, DraftVersion, Version
 
 
 class UserFactory(factory.django.DjangoModelFactory):
@@ -24,7 +24,7 @@ class Meta:
     # DandisetFactory. This will call DraftVersionFactory(dandiset=our_new_dandiset), thus skipping
     # the SubFactory.
     draft_version = factory.RelatedFactory(
-        'dandi.publish.tests.factories.DraftVersionFactory', factory_related_name='dandiset'
+        'dandiapi.api.tests.factories.DraftVersionFactory', factory_related_name='dandiset'
     )
 
 

dandi/publish/tests/girder.py → dandiapi/api/tests/girder.py

@@ -3,7 +3,7 @@
 
 import factory
 
-from dandi.publish.girder import GirderClient, GirderFile
+from dandiapi.api.girder import GirderClient, GirderFile
 
 
 class _GirderClientFolderFactory(factory.DictFactory):

dandi/publish/tests/test_asset.py → dandiapi/api/tests/test_asset.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from dandi.publish.models import Asset
+from dandiapi.api.models import Asset
 
 from .fuzzy import TIMESTAMP_RE
 

dandi/publish/tests/test_dandiset.py → dandiapi/api/tests/test_dandiset.py

@@ -1,6 +1,6 @@
 import pytest
 
-from dandi.publish.models import Dandiset
+from dandiapi.api.models import Dandiset
 
 from .fuzzy import TIMESTAMP_RE
 

dandi/publish/tests/test_version.py → dandiapi/api/tests/test_version.py

@@ -1,7 +1,7 @@
 from django.core.exceptions import ValidationError
 import pytest
 
-from dandi.publish.models import Version
+from dandiapi.api.models import Version
 
 from .fuzzy import TIMESTAMP_RE
 

dandi/publish/views/asset.py → dandiapi/api/views/asset.py

@@ -7,9 +7,9 @@
 from rest_framework.viewsets import ReadOnlyModelViewSet
 from rest_framework_extensions.mixins import NestedViewSetMixin
 
-from dandi.publish.models import Asset
-from dandi.publish.views.common import DandiPagination
-from dandi.publish.views.version import VersionSerializer
+from dandiapi.api.models import Asset
+from dandiapi.api.views.common import DandiPagination
+from dandiapi.api.views.version import VersionSerializer
 
 
 class AssetSerializer(serializers.ModelSerializer):

dandi/publish/views/dandiset.py → dandiapi/api/views/dandiset.py

@@ -6,9 +6,9 @@
 from rest_framework.response import Response
 from rest_framework.viewsets import ReadOnlyModelViewSet
 
-from dandi.publish.girder import GirderClient
-from dandi.publish.models import Dandiset
-from dandi.publish.views.common import DandiPagination
+from dandiapi.api.girder import GirderClient
+from dandiapi.api.models import Dandiset
+from dandiapi.api.views.common import DandiPagination
 
 
 class DandisetSerializer(serializers.ModelSerializer):

dandi/publish/views/stats.py → dandiapi/api/views/stats.py

@@ -2,7 +2,7 @@
 from rest_framework.decorators import api_view
 from rest_framework.response import Response
 
-from dandi.publish.models import Asset, Dandiset
+from dandiapi.api.models import Asset, Dandiset
 
 
 @api_view()

dandi/publish/views/version.py → dandiapi/api/views/version.py

@@ -6,10 +6,10 @@
 from rest_framework.viewsets import ReadOnlyModelViewSet
 from rest_framework_extensions.mixins import DetailSerializerMixin, NestedViewSetMixin
 
-from dandi.publish.models import Dandiset, Version
-from dandi.publish.tasks import publish_version
-from dandi.publish.views.common import DandiPagination
-from dandi.publish.views.dandiset import DandisetSerializer
+from dandiapi.api.models import Dandiset, Version
+from dandiapi.api.tasks import publish_version
+from dandiapi.api.views.common import DandiPagination
+from dandiapi.api.views.dandiset import DandisetSerializer
 
 
 class VersionSerializer(serializers.ModelSerializer):

dandi/asgi.py → dandiapi/asgi.py

@@ -3,7 +3,7 @@
 import configurations.importer
 from django.core.asgi import get_asgi_application
 
-os.environ['DJANGO_SETTINGS_MODULE'] = 'dandi.settings'
+os.environ['DJANGO_SETTINGS_MODULE'] = 'dandiapi.settings'
 if not os.environ.get('DJANGO_CONFIGURATION'):
     raise ValueError('The environment variable "DJANGO_CONFIGURATION" must be set.')
 configurations.importer.install()

dandi/celery.py → dandiapi/celery.py

@@ -3,7 +3,7 @@
 from celery import Celery
 import configurations.importer
 
-os.environ['DJANGO_SETTINGS_MODULE'] = 'dandi.settings'
+os.environ['DJANGO_SETTINGS_MODULE'] = 'dandiapi.settings'
 if not os.environ.get('DJANGO_CONFIGURATION'):
     raise ValueError('The environment variable "DJANGO_CONFIGURATION" must be set.')
 configurations.importer.install()