src layout; dev container; fix tests

roundware · Nov 12, 2024 · d6c2e7c · d6c2e7c
1 parent a80dbb0
commit d6c2e7c
Show file tree

Hide file tree

Showing 214 changed files with 10 additions and 7 deletions.
diff --git a/docker/base.dockerfile b/docker/base.dockerfile
@@ -20,7 +20,7 @@ RUN python3 -m pip install pip setuptools --upgrade &&  \
 
 ADD pyproject.toml .
 ADD scripts/ ./scripts
-ADD roundware ./roundware
+ADD src ./src
 
 RUN python3 -m pip install .
 RUN python3 -m roundware.manage collectstatic

diff --git a/docker/dev.dockerfile b/docker/dev.dockerfile
@@ -0,0 +1,3 @@
+FROM roundware:latest
+
+RUN python3 -m pip install .[test,dev]
diff --git a/pyproject.toml b/pyproject.toml
@@ -74,7 +74,6 @@ dependencies = [
     # https://github.com/roundware/django-admin-bootstrapped/zipball/3.0.0
     # audio conversions
     "ffmpeg-python==0.2.0"
-
 ]
 
 [project.optional-dependencies]
@@ -93,4 +92,4 @@ test = [
 version = { attr = "roundware.__version__"}
 
 [tool.setuptools.packages.find]
-where = ["."]
+where = ["src"]
diff --git a/roundware/rw/tests/__init__.py b/roundware/rw/tests/__init__.py
diff --git a/src/roundware/__init__.py b/src/roundware/__init__.py
@@ -0,0 +1 @@
+__version__ = '0.4.0'
diff --git a/roundware/__init__.py → src/roundware/api1/__init__.py b/roundware/__init__.py → src/roundware/api1/__init__.py
diff --git a/roundware/api1/commands.py → src/roundware/api1/commands.py b/roundware/api1/commands.py → src/roundware/api1/commands.py
diff --git a/roundware/api1/serializers.py → src/roundware/api1/serializers.py b/roundware/api1/serializers.py → src/roundware/api1/serializers.py
diff --git a/roundware/api1/urls.py → src/roundware/api1/urls.py b/roundware/api1/urls.py → src/roundware/api1/urls.py
diff --git a/roundware/api1/views.py → src/roundware/api1/views.py b/roundware/api1/views.py → src/roundware/api1/views.py
diff --git a/roundware/api2/__init__.py → src/roundware/api2/__init__.py b/roundware/api2/__init__.py → src/roundware/api2/__init__.py
diff --git a/roundware/api2/apps.py → src/roundware/api2/apps.py b/roundware/api2/apps.py → src/roundware/api2/apps.py
diff --git a/roundware/api2/filters.py → src/roundware/api2/filters.py b/roundware/api2/filters.py → src/roundware/api2/filters.py
diff --git a/roundware/api2/permissions.py → src/roundware/api2/permissions.py b/roundware/api2/permissions.py → src/roundware/api2/permissions.py
diff --git a/roundware/api2/serializers.py → src/roundware/api2/serializers.py b/roundware/api2/serializers.py → src/roundware/api2/serializers.py
diff --git a/roundware/api2/signals.py → src/roundware/api2/signals.py b/roundware/api2/signals.py → src/roundware/api2/signals.py
diff --git a/roundware/api2/tests.py → src/roundware/api2/tests.py b/roundware/api2/tests.py → src/roundware/api2/tests.py
diff --git a/roundware/api2/urls.py → src/roundware/api2/urls.py b/roundware/api2/urls.py → src/roundware/api2/urls.py
diff --git a/roundware/api2/views.py → src/roundware/api2/views.py b/roundware/api2/views.py → src/roundware/api2/views.py
diff --git a/roundware/api1/__init__.py → src/roundware/lib/__init__.py b/roundware/api1/__init__.py → src/roundware/lib/__init__.py
diff --git a/roundware/lib/api.py → src/roundware/lib/api.py b/roundware/lib/api.py → src/roundware/lib/api.py
diff --git a/roundware/lib/convertaudio.py → src/roundware/lib/convertaudio.py b/roundware/lib/convertaudio.py → src/roundware/lib/convertaudio.py
diff --git a/roundware/lib/discover_audiolength.py → src/roundware/lib/discover_audiolength.py b/roundware/lib/discover_audiolength.py → src/roundware/lib/discover_audiolength.py
diff --git a/roundware/lib/exception.py → src/roundware/lib/exception.py b/roundware/lib/exception.py → src/roundware/lib/exception.py
diff --git a/roundware/manage.py → src/roundware/manage.py b/roundware/manage.py → src/roundware/manage.py
diff --git a/roundware/notifications/__init__.py → src/roundware/notifications/__init__.py b/roundware/notifications/__init__.py → src/roundware/notifications/__init__.py
diff --git a/roundware/notifications/admin.py → src/roundware/notifications/admin.py b/roundware/notifications/admin.py → src/roundware/notifications/admin.py
diff --git a/.../notifications/migrations/0001_initial.py → .../notifications/migrations/0001_initial.py b/.../notifications/migrations/0001_initial.py → .../notifications/migrations/0001_initial.py
diff --git a/...ns/migrations/0002_remove_time_default.py → ...ns/migrations/0002_remove_time_default.py b/...ns/migrations/0002_remove_time_default.py → ...ns/migrations/0002_remove_time_default.py
diff --git a/roundware/lib/__init__.py → ...ware/notifications/migrations/__init__.py b/roundware/lib/__init__.py → ...ware/notifications/migrations/__init__.py
diff --git a/roundware/notifications/models.py → src/roundware/notifications/models.py b/roundware/notifications/models.py → src/roundware/notifications/models.py
diff --git a/...ware/notifications/migrations/__init__.py → src/roundware/rw/__init__.py b/...ware/notifications/migrations/__init__.py → src/roundware/rw/__init__.py
diff --git a/roundware/rw/admin.py → src/roundware/rw/admin.py b/roundware/rw/admin.py → src/roundware/rw/admin.py
diff --git a/roundware/rw/admin_helper.py → src/roundware/rw/admin_helper.py b/roundware/rw/admin_helper.py → src/roundware/rw/admin_helper.py
diff --git a/roundware/rw/apps.py → src/roundware/rw/apps.py b/roundware/rw/apps.py → src/roundware/rw/apps.py
diff --git a/roundware/rw/baker_recipes.py → src/roundware/rw/baker_recipes.py b/roundware/rw/baker_recipes.py → src/roundware/rw/baker_recipes.py
diff --git a/roundware/rw/fields.py → src/roundware/rw/fields.py b/roundware/rw/fields.py → src/roundware/rw/fields.py
diff --git a/roundware/rw/filters.py → src/roundware/rw/filters.py b/roundware/rw/filters.py → src/roundware/rw/filters.py
diff --git a/roundware/rw/fixtures/default_auth.json → src/roundware/rw/fixtures/default_auth.json b/roundware/rw/fixtures/default_auth.json → src/roundware/rw/fixtures/default_auth.json
diff --git a/roundware/rw/fixtures/sample_project.json → ...roundware/rw/fixtures/sample_project.json b/roundware/rw/fixtures/sample_project.json → ...roundware/rw/fixtures/sample_project.json
diff --git a/roundware/rw/fixtures/speakers.json → src/roundware/rw/fixtures/speakers.json b/roundware/rw/fixtures/speakers.json → src/roundware/rw/fixtures/speakers.json
diff --git a/roundware/rw/forms.py → src/roundware/rw/forms.py b/roundware/rw/forms.py → src/roundware/rw/forms.py
diff --git a/roundware/rw/__init__.py → src/roundware/rw/management/__init__.py b/roundware/rw/__init__.py → src/roundware/rw/management/__init__.py
diff --git a/roundware/rw/management/commands/__init__.py → ...ndware/rw/management/commands/__init__.py b/roundware/rw/management/commands/__init__.py → ...ndware/rw/management/commands/__init__.py
diff --git a/...re/rw/management/commands/check_assets.py → ...re/rw/management/commands/check_assets.py b/...re/rw/management/commands/check_assets.py → ...re/rw/management/commands/check_assets.py
diff --git a/...are/rw/management/commands/check_media.py → ...are/rw/management/commands/check_media.py b/...are/rw/management/commands/check_media.py → ...are/rw/management/commands/check_media.py
diff --git a/...are/rw/management/commands/clean_media.py → ...are/rw/management/commands/clean_media.py b/...are/rw/management/commands/clean_media.py → ...are/rw/management/commands/clean_media.py
diff --git a/roundware/rw/migrations/0001_initial.py → src/roundware/rw/migrations/0001_initial.py b/roundware/rw/migrations/0001_initial.py → src/roundware/rw/migrations/0001_initial.py
diff --git a/...igrations/0002_select_method_to_choice.py → ...igrations/0002_select_method_to_choice.py b/...igrations/0002_select_method_to_choice.py → ...igrations/0002_select_method_to_choice.py
diff --git a/...re/rw/migrations/0003_uimode_to_choice.py → ...re/rw/migrations/0003_uimode_to_choice.py b/...re/rw/migrations/0003_uimode_to_choice.py → ...re/rw/migrations/0003_uimode_to_choice.py
diff --git a/.../migrations/0004_repeat_mode_to_choice.py → .../migrations/0004_repeat_mode_to_choice.py b/.../migrations/0004_repeat_mode_to_choice.py → .../migrations/0004_repeat_mode_to_choice.py
diff --git a/roundware/rw/migrations/0005_timedassets.py → ...undware/rw/migrations/0005_timedassets.py b/roundware/rw/migrations/0005_timedassets.py → ...undware/rw/migrations/0005_timedassets.py
diff --git a/...e/rw/migrations/0006_tag_filter_browse.py → ...e/rw/migrations/0006_tag_filter_browse.py b/...e/rw/migrations/0006_tag_filter_browse.py → ...e/rw/migrations/0006_tag_filter_browse.py
diff --git a/roundware/rw/migrations/0007_repeat_mode.py → ...undware/rw/migrations/0007_repeat_mode.py b/roundware/rw/migrations/0007_repeat_mode.py → ...undware/rw/migrations/0007_repeat_mode.py
diff --git a/...ions/0008_project_timed_asset_priority.py → ...ions/0008_project_timed_asset_priority.py b/...ions/0008_project_timed_asset_priority.py → ...ions/0008_project_timed_asset_priority.py
diff --git a/roundware/rw/migrations/0009_userprofile.py → ...undware/rw/migrations/0009_userprofile.py b/roundware/rw/migrations/0009_userprofile.py → ...undware/rw/migrations/0009_userprofile.py
diff --git a/...re/rw/migrations/0010_session_timezone.py → ...re/rw/migrations/0010_session_timezone.py b/...re/rw/migrations/0010_session_timezone.py → ...re/rw/migrations/0010_session_timezone.py
diff --git a/.../rw/migrations/0011_add_rate_vote_type.py → .../rw/migrations/0011_add_rate_vote_type.py b/.../rw/migrations/0011_add_rate_vote_type.py → .../rw/migrations/0011_add_rate_vote_type.py
diff --git a/...ware/rw/migrations/0012_asset_ordering.py → ...ware/rw/migrations/0012_asset_ordering.py b/...ware/rw/migrations/0012_asset_ordering.py → ...ware/rw/migrations/0012_asset_ordering.py
diff --git a/...re/rw/migrations/0013_speaker_geometry.py → ...re/rw/migrations/0013_speaker_geometry.py b/...re/rw/migrations/0013_speaker_geometry.py → ...re/rw/migrations/0013_speaker_geometry.py
diff --git a/...ons/0014__data__speaker_shape_creation.py → ...ons/0014__data__speaker_shape_creation.py b/...ons/0014__data__speaker_shape_creation.py → ...ons/0014__data__speaker_shape_creation.py
diff --git a/...w/migrations/0015_remove_null_from_mtm.py → ...w/migrations/0015_remove_null_from_mtm.py b/...w/migrations/0015_remove_null_from_mtm.py → ...w/migrations/0015_remove_null_from_mtm.py
diff --git a/.../rw/migrations/0016_tags_uigroups_api2.py → .../rw/migrations/0016_tags_uigroups_api2.py b/.../rw/migrations/0016_tags_uigroups_api2.py → .../rw/migrations/0016_tags_uigroups_api2.py
diff --git a/...rw/migrations/0017_uiitem_blank_parent.py → ...rw/migrations/0017_uiitem_blank_parent.py b/...rw/migrations/0017_uiitem_blank_parent.py → ...rw/migrations/0017_uiitem_blank_parent.py
diff --git a/...ware/rw/migrations/0018_proj_languages.py → ...ware/rw/migrations/0018_proj_languages.py b/...ware/rw/migrations/0018_proj_languages.py → ...ware/rw/migrations/0018_proj_languages.py
diff --git a/.../migrations/0019_remove_speaker_fields.py → .../migrations/0019_remove_speaker_fields.py b/.../migrations/0019_remove_speaker_fields.py → .../migrations/0019_remove_speaker_fields.py
diff --git a/...ware/rw/migrations/0020_add_vote_block.py → ...ware/rw/migrations/0020_add_vote_block.py b/...ware/rw/migrations/0020_add_vote_block.py → ...ware/rw/migrations/0020_add_vote_block.py
diff --git a/...ations/0021_session_geo_listen_enabled.py → ...ations/0021_session_geo_listen_enabled.py b/...ations/0021_session_geo_listen_enabled.py → ...ations/0021_session_geo_listen_enabled.py
diff --git a/...rw/migrations/0022_update_meta_options.py → ...rw/migrations/0022_update_meta_options.py b/...rw/migrations/0022_update_meta_options.py → ...rw/migrations/0022_update_meta_options.py
diff --git a/roundware/rw/migrations/0023_asset_shape.py → ...undware/rw/migrations/0023_asset_shape.py b/roundware/rw/migrations/0023_asset_shape.py → ...undware/rw/migrations/0023_asset_shape.py
diff --git a/...e/rw/migrations/0024_speaker_backupuri.py → ...e/rw/migrations/0024_speaker_backupuri.py b/...e/rw/migrations/0024_speaker_backupuri.py → ...e/rw/migrations/0024_speaker_backupuri.py
diff --git a/...e/rw/migrations/0025_ui_model_ordering.py → ...e/rw/migrations/0025_ui_model_ordering.py b/...e/rw/migrations/0025_ui_model_ordering.py → ...e/rw/migrations/0025_ui_model_ordering.py
diff --git a/...re/rw/migrations/0026_add_projectgroup.py → ...re/rw/migrations/0026_add_projectgroup.py b/...re/rw/migrations/0026_add_projectgroup.py → ...re/rw/migrations/0026_add_projectgroup.py
diff --git a/...rations/0027_add_owner_desc_to_project.py → ...rations/0027_add_owner_desc_to_project.py b/...rations/0027_add_owner_desc_to_project.py → ...rations/0027_add_owner_desc_to_project.py
diff --git a/...w/migrations/0028_add_uielement_models.py → ...w/migrations/0028_add_uielement_models.py b/...w/migrations/0028_add_uielement_models.py → ...w/migrations/0028_add_uielement_models.py
diff --git a/.../migrations/0029_envelope_related_name.py → .../migrations/0029_envelope_related_name.py b/.../migrations/0029_envelope_related_name.py → .../migrations/0029_envelope_related_name.py
diff --git a/...ations/0030_add_audiotrack_tag_filters.py → ...ations/0030_add_audiotrack_tag_filters.py b/...ations/0030_add_audiotrack_tag_filters.py → ...ations/0030_add_audiotrack_tag_filters.py
diff --git a/...31_add_audiotrack_client_mixing_fields.py → ...31_add_audiotrack_client_mixing_fields.py b/...31_add_audiotrack_client_mixing_fields.py → ...31_add_audiotrack_client_mixing_fields.py
diff --git a/.../migrations/0032_add_asset_crop_fields.py → .../migrations/0032_add_asset_crop_fields.py b/.../migrations/0032_add_asset_crop_fields.py → .../migrations/0032_add_asset_crop_fields.py
diff --git a/...ations/0033_add_audiotrack_geo_fadeout.py → ...ations/0033_add_audiotrack_geo_fadeout.py b/...ations/0033_add_audiotrack_geo_fadeout.py → ...ations/0033_add_audiotrack_geo_fadeout.py
diff --git a/...ware/rw/migrations/0034_add_asset_user.py → ...ware/rw/migrations/0034_add_asset_user.py b/...ware/rw/migrations/0034_add_asset_user.py → ...ware/rw/migrations/0034_add_asset_user.py
diff --git a/...35_add_audiotrack_timed_asset_priority.py → ...35_add_audiotrack_timed_asset_priority.py b/...35_add_audiotrack_timed_asset_priority.py → ...35_add_audiotrack_timed_asset_priority.py
diff --git a/...e/rw/migrations/0036_add_asset_updated.py → ...e/rw/migrations/0036_add_asset_updated.py b/...e/rw/migrations/0036_add_asset_updated.py → ...e/rw/migrations/0036_add_asset_updated.py
diff --git a/...ations/0037_asset_file_and_loc_caption.py → ...ations/0037_asset_file_and_loc_caption.py b/...ations/0037_asset_file_and_loc_caption.py → ...ations/0037_asset_file_and_loc_caption.py
diff --git a/...dd_uigroup_selection_method_asset_desc.py → ...dd_uigroup_selection_method_asset_desc.py b/...dd_uigroup_selection_method_asset_desc.py → ...dd_uigroup_selection_method_asset_desc.py
diff --git a/...s/0039_uiitem_filter_remove_validation.py → ...s/0039_uiitem_filter_remove_validation.py b/...s/0039_uiitem_filter_remove_validation.py → ...s/0039_uiitem_filter_remove_validation.py
diff --git a/roundware/rw/management/__init__.py → src/roundware/rw/migrations/__init__.py b/roundware/rw/management/__init__.py → src/roundware/rw/migrations/__init__.py
diff --git a/roundware/rw/models.py → src/roundware/rw/models.py b/roundware/rw/models.py → src/roundware/rw/models.py
@@ -12,7 +12,7 @@
 from django.utils.safestring import mark_safe
 from django.db import transaction
 from django.contrib.gis.db import models
-from rw.fields import ValidatedFileField
+from roundware.rw.fields import ValidatedFileField
 from django.conf import settings
 from datetime import datetime
 from django.db.models.signals import post_save

diff --git a/roundware/rw/static/dashboard/blank.html → src/roundware/rw/static/dashboard/blank.html b/roundware/rw/static/dashboard/blank.html → src/roundware/rw/static/dashboard/blank.html
diff --git a/roundware/rw/static/dashboard/buttons.html → ...oundware/rw/static/dashboard/buttons.html b/roundware/rw/static/dashboard/buttons.html → ...oundware/rw/static/dashboard/buttons.html
diff --git a/...are/rw/static/dashboard/css/bootstrap.css → ...are/rw/static/dashboard/css/bootstrap.css b/...are/rw/static/dashboard/css/bootstrap.css → ...are/rw/static/dashboard/css/bootstrap.css
diff --git a/...rw/static/dashboard/css/bootstrap.min.css → ...rw/static/dashboard/css/bootstrap.min.css b/...rw/static/dashboard/css/bootstrap.min.css → ...rw/static/dashboard/css/bootstrap.min.css
diff --git a/...ugins/dataTables/dataTables.bootstrap.css → ...ugins/dataTables/dataTables.bootstrap.css b/...ugins/dataTables/dataTables.bootstrap.css → ...ugins/dataTables/dataTables.bootstrap.css
diff --git a/...d/css/plugins/morris/morris-0.4.3.min.css → ...d/css/plugins/morris/morris-0.4.3.min.css b/...d/css/plugins/morris/morris-0.4.3.min.css → ...d/css/plugins/morris/morris-0.4.3.min.css
diff --git a/...plugins/social-buttons/social-buttons.css → ...plugins/social-buttons/social-buttons.css b/...plugins/social-buttons/social-buttons.css → ...plugins/social-buttons/social-buttons.css
diff --git a/...shboard/css/plugins/timeline/timeline.css → ...shboard/css/plugins/timeline/timeline.css b/...shboard/css/plugins/timeline/timeline.css → ...shboard/css/plugins/timeline/timeline.css
diff --git a/roundware/rw/static/dashboard/css/rw.css → src/roundware/rw/static/dashboard/css/rw.css b/roundware/rw/static/dashboard/css/rw.css → src/roundware/rw/static/dashboard/css/rw.css
diff --git a/...ware/rw/static/dashboard/css/sb-admin.css → ...ware/rw/static/dashboard/css/sb-admin.css b/...ware/rw/static/dashboard/css/sb-admin.css → ...ware/rw/static/dashboard/css/sb-admin.css
diff --git a/roundware/rw/static/dashboard/flot.html → src/roundware/rw/static/dashboard/flot.html b/roundware/rw/static/dashboard/flot.html → src/roundware/rw/static/dashboard/flot.html
diff --git a/...shboard/font-awesome/css/font-awesome.css → ...shboard/font-awesome/css/font-awesome.css b/...shboard/font-awesome/css/font-awesome.css → ...shboard/font-awesome/css/font-awesome.css
diff --git a/...ard/font-awesome/css/font-awesome.min.css → ...ard/font-awesome/css/font-awesome.min.css b/...ard/font-awesome/css/font-awesome.min.css → ...ard/font-awesome/css/font-awesome.min.css
diff --git a/...hboard/font-awesome/fonts/FontAwesome.otf → ...hboard/font-awesome/fonts/FontAwesome.otf b/...hboard/font-awesome/fonts/FontAwesome.otf → ...hboard/font-awesome/fonts/FontAwesome.otf
diff --git a/...ont-awesome/fonts/fontawesome-webfont.eot → ...ont-awesome/fonts/fontawesome-webfont.eot b/...ont-awesome/fonts/fontawesome-webfont.eot → ...ont-awesome/fonts/fontawesome-webfont.eot
diff --git a/...ont-awesome/fonts/fontawesome-webfont.svg → ...ont-awesome/fonts/fontawesome-webfont.svg b/...ont-awesome/fonts/fontawesome-webfont.svg → ...ont-awesome/fonts/fontawesome-webfont.svg
diff --git a/...ont-awesome/fonts/fontawesome-webfont.ttf → ...ont-awesome/fonts/fontawesome-webfont.ttf b/...ont-awesome/fonts/fontawesome-webfont.ttf → ...ont-awesome/fonts/fontawesome-webfont.ttf
diff --git a/...nt-awesome/fonts/fontawesome-webfont.woff → ...nt-awesome/fonts/fontawesome-webfont.woff b/...nt-awesome/fonts/fontawesome-webfont.woff → ...nt-awesome/fonts/fontawesome-webfont.woff
diff --git a/...rd/font-awesome/less/bordered-pulled.less → ...rd/font-awesome/less/bordered-pulled.less b/...rd/font-awesome/less/bordered-pulled.less → ...rd/font-awesome/less/bordered-pulled.less
diff --git a/...tic/dashboard/font-awesome/less/core.less → ...tic/dashboard/font-awesome/less/core.less b/...tic/dashboard/font-awesome/less/core.less → ...tic/dashboard/font-awesome/less/core.less
diff --git a/...hboard/font-awesome/less/fixed-width.less → ...hboard/font-awesome/less/fixed-width.less b/...hboard/font-awesome/less/fixed-width.less → ...hboard/font-awesome/less/fixed-width.less
diff --git a/...board/font-awesome/less/font-awesome.less → ...board/font-awesome/less/font-awesome.less b/...board/font-awesome/less/font-awesome.less → ...board/font-awesome/less/font-awesome.less
diff --git a/...ic/dashboard/font-awesome/less/icons.less → ...ic/dashboard/font-awesome/less/icons.less b/...ic/dashboard/font-awesome/less/icons.less → ...ic/dashboard/font-awesome/less/icons.less
diff --git a/...c/dashboard/font-awesome/less/larger.less → ...c/dashboard/font-awesome/less/larger.less b/...c/dashboard/font-awesome/less/larger.less → ...c/dashboard/font-awesome/less/larger.less
diff --git a/...tic/dashboard/font-awesome/less/list.less → ...tic/dashboard/font-awesome/less/list.less b/...tic/dashboard/font-awesome/less/list.less → ...tic/dashboard/font-awesome/less/list.less
diff --git a/...c/dashboard/font-awesome/less/mixins.less → ...c/dashboard/font-awesome/less/mixins.less b/...c/dashboard/font-awesome/less/mixins.less → ...c/dashboard/font-awesome/less/mixins.less
diff --git a/...tic/dashboard/font-awesome/less/path.less → ...tic/dashboard/font-awesome/less/path.less b/...tic/dashboard/font-awesome/less/path.less → ...tic/dashboard/font-awesome/less/path.less
diff --git a/...rd/font-awesome/less/rotated-flipped.less → ...rd/font-awesome/less/rotated-flipped.less b/...rd/font-awesome/less/rotated-flipped.less → ...rd/font-awesome/less/rotated-flipped.less
diff --git a/...dashboard/font-awesome/less/spinning.less → ...dashboard/font-awesome/less/spinning.less b/...dashboard/font-awesome/less/spinning.less → ...dashboard/font-awesome/less/spinning.less
diff --git a/.../dashboard/font-awesome/less/stacked.less → .../dashboard/font-awesome/less/stacked.less b/.../dashboard/font-awesome/less/stacked.less → .../dashboard/font-awesome/less/stacked.less
diff --git a/...ashboard/font-awesome/less/variables.less → ...ashboard/font-awesome/less/variables.less b/...ashboard/font-awesome/less/variables.less → ...ashboard/font-awesome/less/variables.less
diff --git a/...d/font-awesome/scss/_bordered-pulled.scss → ...d/font-awesome/scss/_bordered-pulled.scss b/...d/font-awesome/scss/_bordered-pulled.scss → ...d/font-awesome/scss/_bordered-pulled.scss
diff --git a/...ic/dashboard/font-awesome/scss/_core.scss → ...ic/dashboard/font-awesome/scss/_core.scss b/...ic/dashboard/font-awesome/scss/_core.scss → ...ic/dashboard/font-awesome/scss/_core.scss
diff --git a/...board/font-awesome/scss/_fixed-width.scss → ...board/font-awesome/scss/_fixed-width.scss b/...board/font-awesome/scss/_fixed-width.scss → ...board/font-awesome/scss/_fixed-width.scss
diff --git a/...c/dashboard/font-awesome/scss/_icons.scss → ...c/dashboard/font-awesome/scss/_icons.scss b/...c/dashboard/font-awesome/scss/_icons.scss → ...c/dashboard/font-awesome/scss/_icons.scss
diff --git a/.../dashboard/font-awesome/scss/_larger.scss → .../dashboard/font-awesome/scss/_larger.scss b/.../dashboard/font-awesome/scss/_larger.scss → .../dashboard/font-awesome/scss/_larger.scss
diff --git a/...ic/dashboard/font-awesome/scss/_list.scss → ...ic/dashboard/font-awesome/scss/_list.scss b/...ic/dashboard/font-awesome/scss/_list.scss → ...ic/dashboard/font-awesome/scss/_list.scss
diff --git a/.../dashboard/font-awesome/scss/_mixins.scss → .../dashboard/font-awesome/scss/_mixins.scss b/.../dashboard/font-awesome/scss/_mixins.scss → .../dashboard/font-awesome/scss/_mixins.scss
diff --git a/...ic/dashboard/font-awesome/scss/_path.scss → ...ic/dashboard/font-awesome/scss/_path.scss b/...ic/dashboard/font-awesome/scss/_path.scss → ...ic/dashboard/font-awesome/scss/_path.scss
diff --git a/...d/font-awesome/scss/_rotated-flipped.scss → ...d/font-awesome/scss/_rotated-flipped.scss b/...d/font-awesome/scss/_rotated-flipped.scss → ...d/font-awesome/scss/_rotated-flipped.scss
diff --git a/...ashboard/font-awesome/scss/_spinning.scss → ...ashboard/font-awesome/scss/_spinning.scss b/...ashboard/font-awesome/scss/_spinning.scss → ...ashboard/font-awesome/scss/_spinning.scss
diff --git a/...dashboard/font-awesome/scss/_stacked.scss → ...dashboard/font-awesome/scss/_stacked.scss b/...dashboard/font-awesome/scss/_stacked.scss → ...dashboard/font-awesome/scss/_stacked.scss
diff --git a/...shboard/font-awesome/scss/_variables.scss → ...shboard/font-awesome/scss/_variables.scss b/...shboard/font-awesome/scss/_variables.scss → ...shboard/font-awesome/scss/_variables.scss
diff --git a/...board/font-awesome/scss/font-awesome.scss → ...board/font-awesome/scss/font-awesome.scss b/...board/font-awesome/scss/font-awesome.scss → ...board/font-awesome/scss/font-awesome.scss
diff --git a/...rd/fonts/glyphicons-halflings-regular.eot → ...rd/fonts/glyphicons-halflings-regular.eot b/...rd/fonts/glyphicons-halflings-regular.eot → ...rd/fonts/glyphicons-halflings-regular.eot
diff --git a/...rd/fonts/glyphicons-halflings-regular.svg → ...rd/fonts/glyphicons-halflings-regular.svg b/...rd/fonts/glyphicons-halflings-regular.svg → ...rd/fonts/glyphicons-halflings-regular.svg
diff --git a/...rd/fonts/glyphicons-halflings-regular.ttf → ...rd/fonts/glyphicons-halflings-regular.ttf b/...rd/fonts/glyphicons-halflings-regular.ttf → ...rd/fonts/glyphicons-halflings-regular.ttf
diff --git a/...d/fonts/glyphicons-halflings-regular.woff → ...d/fonts/glyphicons-halflings-regular.woff b/...d/fonts/glyphicons-halflings-regular.woff → ...d/fonts/glyphicons-halflings-regular.woff
diff --git a/...w/static/dashboard/images/ajax-loader.gif → ...w/static/dashboard/images/ajax-loader.gif b/...w/static/dashboard/images/ajax-loader.gif → ...w/static/dashboard/images/ajax-loader.gif
diff --git a/roundware/rw/static/dashboard/index.html → src/roundware/rw/static/dashboard/index.html b/roundware/rw/static/dashboard/index.html → src/roundware/rw/static/dashboard/index.html
diff --git a/roundware/rw/static/dashboard/js/Jplayer.swf → ...ndware/rw/static/dashboard/js/Jplayer.swf b/roundware/rw/static/dashboard/js/Jplayer.swf → ...ndware/rw/static/dashboard/js/Jplayer.swf
diff --git a/...dware/rw/static/dashboard/js/bootstrap.js → ...dware/rw/static/dashboard/js/bootstrap.js b/...dware/rw/static/dashboard/js/bootstrap.js → ...dware/rw/static/dashboard/js/bootstrap.js
diff --git a/...e/rw/static/dashboard/js/bootstrap.min.js → ...e/rw/static/dashboard/js/bootstrap.min.js b/...e/rw/static/dashboard/js/bootstrap.min.js → ...e/rw/static/dashboard/js/bootstrap.min.js
diff --git a/...tatic/dashboard/js/demo/dashboard-demo.js → ...tatic/dashboard/js/demo/dashboard-demo.js b/...tatic/dashboard/js/demo/dashboard-demo.js → ...tatic/dashboard/js/demo/dashboard-demo.js
diff --git a/.../rw/static/dashboard/js/demo/flot-demo.js → .../rw/static/dashboard/js/demo/flot-demo.js b/.../rw/static/dashboard/js/demo/flot-demo.js → .../rw/static/dashboard/js/demo/flot-demo.js
diff --git a/...w/static/dashboard/js/demo/morris-demo.js → ...w/static/dashboard/js/demo/morris-demo.js b/...w/static/dashboard/js/demo/morris-demo.js → ...w/static/dashboard/js/demo/morris-demo.js
diff --git a/...e/rw/static/dashboard/js/jquery-1.10.2.js → ...e/rw/static/dashboard/js/jquery-1.10.2.js b/...e/rw/static/dashboard/js/jquery-1.10.2.js → ...e/rw/static/dashboard/js/jquery-1.10.2.js
diff --git a/...lugins/dataTables/dataTables.bootstrap.js → ...lugins/dataTables/dataTables.bootstrap.js b/...lugins/dataTables/dataTables.bootstrap.js → ...lugins/dataTables/dataTables.bootstrap.js
diff --git a/...s/plugins/dataTables/jquery.dataTables.js → ...s/plugins/dataTables/jquery.dataTables.js b/...s/plugins/dataTables/jquery.dataTables.js → ...s/plugins/dataTables/jquery.dataTables.js
diff --git a/...dashboard/js/plugins/flot/excanvas.min.js → ...dashboard/js/plugins/flot/excanvas.min.js b/...dashboard/js/plugins/flot/excanvas.min.js → ...dashboard/js/plugins/flot/excanvas.min.js
diff --git a/.../dashboard/js/plugins/flot/jquery.flot.js → .../dashboard/js/plugins/flot/jquery.flot.js b/.../dashboard/js/plugins/flot/jquery.flot.js → .../dashboard/js/plugins/flot/jquery.flot.js
diff --git a/...hboard/js/plugins/flot/jquery.flot.pie.js → ...hboard/js/plugins/flot/jquery.flot.pie.js b/...hboard/js/plugins/flot/jquery.flot.pie.js → ...hboard/js/plugins/flot/jquery.flot.pie.js
diff --git a/...ard/js/plugins/flot/jquery.flot.resize.js → ...ard/js/plugins/flot/jquery.flot.resize.js b/...ard/js/plugins/flot/jquery.flot.resize.js → ...ard/js/plugins/flot/jquery.flot.resize.js
diff --git a/...s/plugins/flot/jquery.flot.tooltip.min.js → ...s/plugins/flot/jquery.flot.tooltip.min.js b/...s/plugins/flot/jquery.flot.tooltip.min.js → ...s/plugins/flot/jquery.flot.tooltip.min.js
diff --git a/.../js/plugins/metisMenu/jquery.metisMenu.js → .../js/plugins/metisMenu/jquery.metisMenu.js b/.../js/plugins/metisMenu/jquery.metisMenu.js → .../js/plugins/metisMenu/jquery.metisMenu.js
diff --git a/...tic/dashboard/js/plugins/morris/morris.js → ...tic/dashboard/js/plugins/morris/morris.js b/...tic/dashboard/js/plugins/morris/morris.js → ...tic/dashboard/js/plugins/morris/morris.js
diff --git a/...rd/js/plugins/morris/raphael-2.1.0.min.js → ...rd/js/plugins/morris/raphael-2.1.0.min.js b/...rd/js/plugins/morris/raphael-2.1.0.min.js → ...rd/js/plugins/morris/raphael-2.1.0.min.js
diff --git a/roundware/rw/static/dashboard/js/rw.js → src/roundware/rw/static/dashboard/js/rw.js b/roundware/rw/static/dashboard/js/rw.js → src/roundware/rw/static/dashboard/js/rw.js
diff --git a/roundware/rw/static/dashboard/js/sb-admin.js → ...ndware/rw/static/dashboard/js/sb-admin.js b/roundware/rw/static/dashboard/js/sb-admin.js → ...ndware/rw/static/dashboard/js/sb-admin.js
diff --git a/.../rw/static/dashboard/listen-map-dash.html → .../rw/static/dashboard/listen-map-dash.html b/.../rw/static/dashboard/listen-map-dash.html → .../rw/static/dashboard/listen-map-dash.html
diff --git a/roundware/rw/static/dashboard/morris.html → ...roundware/rw/static/dashboard/morris.html b/roundware/rw/static/dashboard/morris.html → ...roundware/rw/static/dashboard/morris.html
diff --git a/...are/rw/static/dashboard/panels-wells.html → ...are/rw/static/dashboard/panels-wells.html b/...are/rw/static/dashboard/panels-wells.html → ...are/rw/static/dashboard/panels-wells.html
diff --git a/...ware/rw/static/dashboard/session-map.html → ...ware/rw/static/dashboard/session-map.html b/...ware/rw/static/dashboard/session-map.html → ...ware/rw/static/dashboard/session-map.html
diff --git a/roundware/rw/static/dashboard/tables.html → ...roundware/rw/static/dashboard/tables.html b/roundware/rw/static/dashboard/tables.html → ...roundware/rw/static/dashboard/tables.html
diff --git a/...dware/rw/static/dashboard/typography.html → ...dware/rw/static/dashboard/typography.html b/...dware/rw/static/dashboard/typography.html → ...dware/rw/static/dashboard/typography.html
diff --git a/roundware/rw/static/rw/css/asset_admin.css → ...oundware/rw/static/rw/css/asset_admin.css b/roundware/rw/static/rw/css/asset_admin.css → ...oundware/rw/static/rw/css/asset_admin.css
diff --git a/...dware/rw/static/rw/css/envelope_admin.css → ...dware/rw/static/rw/css/envelope_admin.css b/...dware/rw/static/rw/css/envelope_admin.css → ...dware/rw/static/rw/css/envelope_admin.css
diff --git a/.../rw/static/rw/css/jplayer.blue.monday.css → .../rw/static/rw/css/jplayer.blue.monday.css b/.../rw/static/rw/css/jplayer.blue.monday.css → .../rw/static/rw/css/jplayer.blue.monday.css
diff --git a/.../rw/static/rw/css/jplayer.blue.monday.jpg → .../rw/static/rw/css/jplayer.blue.monday.jpg b/.../rw/static/rw/css/jplayer.blue.monday.jpg → .../rw/static/rw/css/jplayer.blue.monday.jpg
diff --git a/roundware/rw/static/rw/css/rw_admin.css → src/roundware/rw/static/rw/css/rw_admin.css b/roundware/rw/static/rw/css/rw_admin.css → src/roundware/rw/static/rw/css/rw_admin.css
diff --git a/roundware/rw/static/rw/css/setup_tag_ui.css → ...undware/rw/static/rw/css/setup_tag_ui.css b/roundware/rw/static/rw/css/setup_tag_ui.css → ...undware/rw/static/rw/css/setup_tag_ui.css
diff --git a/roundware/rw/static/rw/css/tag_batch_add.css → ...ndware/rw/static/rw/css/tag_batch_add.css b/roundware/rw/static/rw/css/tag_batch_add.css → ...ndware/rw/static/rw/css/tag_batch_add.css
diff --git a/roundware/rw/static/rw/img/resize-off.png → ...roundware/rw/static/rw/img/resize-off.png b/roundware/rw/static/rw/img/resize-off.png → ...roundware/rw/static/rw/img/resize-off.png
diff --git a/roundware/rw/static/rw/img/resize.png → src/roundware/rw/static/rw/img/resize.png b/roundware/rw/static/rw/img/resize.png → src/roundware/rw/static/rw/img/resize.png
diff --git a/roundware/rw/static/rw/js/Jplayer.swf → src/roundware/rw/static/rw/js/Jplayer.swf b/roundware/rw/static/rw/js/Jplayer.swf → src/roundware/rw/static/rw/js/Jplayer.swf
diff --git a/...atic/rw/js/add-on/jplayer.playlist.min.js → ...atic/rw/js/add-on/jplayer.playlist.min.js b/...atic/rw/js/add-on/jplayer.playlist.min.js → ...atic/rw/js/add-on/jplayer.playlist.min.js
diff --git a/.../rw/js/add-on/jquery.jplayer.inspector.js → .../rw/js/add-on/jquery.jplayer.inspector.js b/.../rw/js/add-on/jquery.jplayer.inspector.js → .../rw/js/add-on/jquery.jplayer.inspector.js
diff --git a/roundware/rw/static/rw/js/asset_admin.js → src/roundware/rw/static/rw/js/asset_admin.js b/roundware/rw/static/rw/js/asset_admin.js → src/roundware/rw/static/rw/js/asset_admin.js
diff --git a/roundware/rw/static/rw/js/audio.js → src/roundware/rw/static/rw/js/audio.js b/roundware/rw/static/rw/js/audio.js → src/roundware/rw/static/rw/js/audio.js
diff --git a/roundware/rw/static/rw/js/envelope_admin.js → ...undware/rw/static/rw/js/envelope_admin.js b/roundware/rw/static/rw/js/envelope_admin.js → ...undware/rw/static/rw/js/envelope_admin.js
diff --git a/...are/rw/static/rw/js/jquery.formset.min.js → ...are/rw/static/rw/js/jquery.formset.min.js b/...are/rw/static/rw/js/jquery.formset.min.js → ...are/rw/static/rw/js/jquery.formset.min.js
diff --git a/...are/rw/static/rw/js/jquery.jplayer.min.js → ...are/rw/static/rw/js/jquery.jplayer.min.js b/...are/rw/static/rw/js/jquery.jplayer.min.js → ...are/rw/static/rw/js/jquery.jplayer.min.js
diff --git a/roundware/rw/static/rw/js/location_map.js → ...roundware/rw/static/rw/js/location_map.js b/roundware/rw/static/rw/js/location_map.js → ...roundware/rw/static/rw/js/location_map.js
diff --git a/roundware/rw/static/rw/js/setup_tag_ui.js → ...roundware/rw/static/rw/js/setup_tag_ui.js b/roundware/rw/static/rw/js/setup_tag_ui.js → ...roundware/rw/static/rw/js/setup_tag_ui.js
diff --git a/...tatic/rw/js/sortedmulticheckbox_widget.js → ...tatic/rw/js/sortedmulticheckbox_widget.js b/...tatic/rw/js/sortedmulticheckbox_widget.js → ...tatic/rw/js/sortedmulticheckbox_widget.js
diff --git a/roundware/rw/static/tools/css/asset-map.css → ...undware/rw/static/tools/css/asset-map.css b/roundware/rw/static/tools/css/asset-map.css → ...undware/rw/static/tools/css/asset-map.css
diff --git a/roundware/rw/static/tools/css/listen-map.css → ...ndware/rw/static/tools/css/listen-map.css b/roundware/rw/static/tools/css/listen-map.css → ...ndware/rw/static/tools/css/listen-map.css
diff --git a/...are/rw/static/tools/gis/bay_water.geojson → ...are/rw/static/tools/gis/bay_water.geojson b/...are/rw/static/tools/gis/bay_water.geojson → ...are/rw/static/tools/gis/bay_water.geojson
diff --git a/...dware/rw/static/tools/img/ajax-loader.gif → ...dware/rw/static/tools/img/ajax-loader.gif b/...dware/rw/static/tools/img/ajax-loader.gif → ...dware/rw/static/tools/img/ajax-loader.gif
diff --git a/roundware/rw/static/tools/js/Jplayer.swf → src/roundware/rw/static/tools/js/Jplayer.swf b/roundware/rw/static/tools/js/Jplayer.swf → src/roundware/rw/static/tools/js/Jplayer.swf
diff --git a/.../rw/static/tools/js/jquery.jplayer.min.js → .../rw/static/tools/js/jquery.jplayer.min.js b/.../rw/static/tools/js/jquery.jplayer.min.js → .../rw/static/tools/js/jquery.jplayer.min.js
diff --git a/roundware/rw/static/tools/js/listen-map.js → ...oundware/rw/static/tools/js/listen-map.js b/roundware/rw/static/tools/js/listen-map.js → ...oundware/rw/static/tools/js/listen-map.js
diff --git a/...rw/templates/admin/asset_change_form.html → ...rw/templates/admin/asset_change_form.html b/...rw/templates/admin/asset_change_form.html → ...rw/templates/admin/asset_change_form.html
diff --git a/roundware/rw/templates/admin/base_site.html → ...undware/rw/templates/admin/base_site.html b/roundware/rw/templates/admin/base_site.html → ...undware/rw/templates/admin/base_site.html
diff --git a/...e/rw/templates/admin/tag_change_list.html → ...e/rw/templates/admin/tag_change_list.html b/...e/rw/templates/admin/tag_change_list.html → ...e/rw/templates/admin/tag_change_list.html
diff --git a/roundware/rw/templates/rw/404.html → src/roundware/rw/templates/rw/404.html b/roundware/rw/templates/rw/404.html → src/roundware/rw/templates/rw/404.html
diff --git a/...dware/rw/templates/rw/chart_template.html → ...dware/rw/templates/rw/chart_template.html b/...dware/rw/templates/rw/chart_template.html → ...dware/rw/templates/rw/chart_template.html
diff --git a/...re/rw/templates/rw/setup_tag_ui_form.html → ...re/rw/templates/rw/setup_tag_ui_form.html b/...re/rw/templates/rw/setup_tag_ui_form.html → ...re/rw/templates/rw/setup_tag_ui_form.html
diff --git a/...templates/rw/setup_tags_ui_edit_form.html → ...templates/rw/setup_tags_ui_edit_form.html b/...templates/rw/setup_tags_ui_edit_form.html → ...templates/rw/setup_tags_ui_edit_form.html
diff --git a/...mplates/rw/tags_add_to_category_form.html → ...mplates/rw/tags_add_to_category_form.html b/...mplates/rw/tags_add_to_category_form.html → ...mplates/rw/tags_add_to_category_form.html
diff --git a/...rted_checkbox_select_multiple_widget.html → ...rted_checkbox_select_multiple_widget.html b/...rted_checkbox_select_multiple_widget.html → ...rted_checkbox_select_multiple_widget.html
diff --git a/roundware/rw/templates/tools/asset-map.html → ...undware/rw/templates/tools/asset-map.html b/roundware/rw/templates/tools/asset-map.html → ...undware/rw/templates/tools/asset-map.html
diff --git a/roundware/rw/templates/tools/listen-map.html → ...ndware/rw/templates/tools/listen-map.html b/roundware/rw/templates/tools/listen-map.html → ...ndware/rw/templates/tools/listen-map.html
diff --git a/roundware/rw/migrations/__init__.py → src/roundware/rw/tests/__init__.py b/roundware/rw/migrations/__init__.py → src/roundware/rw/tests/__init__.py
diff --git a/roundware/rw/tests/common.py → src/roundware/rw/tests/common.py b/roundware/rw/tests/common.py → src/roundware/rw/tests/common.py
diff --git a/roundware/rw/tests/test_admin.py → src/roundware/rw/tests/test_admin.py b/roundware/rw/tests/test_admin.py → src/roundware/rw/tests/test_admin.py
diff --git a/roundware/rw/tests/test_models.py → src/roundware/rw/tests/test_models.py b/roundware/rw/tests/test_models.py → src/roundware/rw/tests/test_models.py
@@ -99,11 +99,11 @@ def setUp(self):
                                 asset=self.asset1, type="flag")
 
     def test_get_likes(self):
-        self.assertEquals(2, self.asset1.get_likes())
-        self.assertEquals(1, self.asset2.get_likes())
+        self.assertEqual(2, self.asset1.get_likes())
+        self.assertEqual(1, self.asset2.get_likes())
 
     def test_get_flags(self):
-        self.assertEquals(1, self.asset1.get_flags())
+        self.assertEqual(1, self.asset1.get_flags())
 
     def test_distance(self):
         distance = self.asset1.distance({'latitude': 0, 'longitude': 0})
diff --git a/roundware/rw/urls.py → src/roundware/rw/urls.py b/roundware/rw/urls.py → src/roundware/rw/urls.py
diff --git a/roundware/rw/views.py → src/roundware/rw/views.py b/roundware/rw/views.py → src/roundware/rw/views.py
diff --git a/roundware/rw/widgets.py → src/roundware/rw/widgets.py b/roundware/rw/widgets.py → src/roundware/rw/widgets.py
diff --git a/roundware/settings/__init__.py → src/roundware/settings/__init__.py b/roundware/settings/__init__.py → src/roundware/settings/__init__.py
diff --git a/roundware/settings/common.py → src/roundware/settings/common.py b/roundware/settings/common.py → src/roundware/settings/common.py
diff --git a/roundware/settings/dev.py → src/roundware/settings/dev.py b/roundware/settings/dev.py → src/roundware/settings/dev.py
diff --git a/roundware/settings/testing.py → src/roundware/settings/testing.py b/roundware/settings/testing.py → src/roundware/settings/testing.py
diff --git a/roundware/urls.py → src/roundware/urls.py b/roundware/urls.py → src/roundware/urls.py
diff --git a/roundware/wsgi.py → src/roundware/wsgi.py b/roundware/wsgi.py → src/roundware/wsgi.py