From d1ff0c896a15783f39345ae3d40a2003bb660159 Mon Sep 17 00:00:00 2001 From: Evan Babb Date: Tue, 12 Nov 2024 14:39:34 -0800 Subject: [PATCH] src layout; dev container; fix tests --- docker/base.dockerfile | 2 +- docker/dev.dockerfile | 3 +++ pyproject.toml | 3 +-- roundware/rw/tests/__init__.py | 0 src/roundware/__init__.py | 1 + {roundware => src/roundware/api1}/__init__.py | 0 {roundware => src/roundware}/api1/commands.py | 0 {roundware => src/roundware}/api1/serializers.py | 0 {roundware => src/roundware}/api1/urls.py | 0 {roundware => src/roundware}/api1/views.py | 0 {roundware => src/roundware}/api2/__init__.py | 0 {roundware => src/roundware}/api2/apps.py | 0 {roundware => src/roundware}/api2/filters.py | 0 {roundware => src/roundware}/api2/permissions.py | 0 {roundware => src/roundware}/api2/serializers.py | 0 {roundware => src/roundware}/api2/signals.py | 0 {roundware => src/roundware}/api2/tests.py | 0 {roundware => src/roundware}/api2/urls.py | 0 {roundware => src/roundware}/api2/views.py | 0 {roundware/api1 => src/roundware/lib}/__init__.py | 0 {roundware => src/roundware}/lib/api.py | 0 {roundware => src/roundware}/lib/convertaudio.py | 0 .../roundware}/lib/discover_audiolength.py | 0 {roundware => src/roundware}/lib/exception.py | 0 {roundware => src/roundware}/manage.py | 0 .../roundware}/notifications/__init__.py | 0 {roundware => src/roundware}/notifications/admin.py | 0 .../notifications/migrations/0001_initial.py | 0 .../migrations/0002_remove_time_default.py | 0 .../roundware/notifications/migrations}/__init__.py | 0 .../roundware}/notifications/models.py | 0 .../migrations => src/roundware/rw}/__init__.py | 0 {roundware => src/roundware}/rw/admin.py | 0 {roundware => src/roundware}/rw/admin_helper.py | 0 {roundware => src/roundware}/rw/apps.py | 0 {roundware => src/roundware}/rw/baker_recipes.py | 0 {roundware => src/roundware}/rw/fields.py | 0 {roundware => src/roundware}/rw/filters.py | 0 .../roundware}/rw/fixtures/default_auth.json | 0 .../roundware}/rw/fixtures/sample_project.json | 0 .../roundware}/rw/fixtures/speakers.json | 0 {roundware => src/roundware}/rw/forms.py | 0 .../rw => src/roundware/rw/management}/__init__.py | 0 .../roundware}/rw/management/commands/__init__.py | 0 .../rw/management/commands/check_assets.py | 0 .../rw/management/commands/check_media.py | 0 .../rw/management/commands/clean_media.py | 0 .../roundware}/rw/migrations/0001_initial.py | 0 .../rw/migrations/0002_select_method_to_choice.py | 0 .../rw/migrations/0003_uimode_to_choice.py | 0 .../rw/migrations/0004_repeat_mode_to_choice.py | 0 .../roundware}/rw/migrations/0005_timedassets.py | 0 .../rw/migrations/0006_tag_filter_browse.py | 0 .../roundware}/rw/migrations/0007_repeat_mode.py | 0 .../migrations/0008_project_timed_asset_priority.py | 0 .../roundware}/rw/migrations/0009_userprofile.py | 0 .../rw/migrations/0010_session_timezone.py | 0 .../rw/migrations/0011_add_rate_vote_type.py | 0 .../roundware}/rw/migrations/0012_asset_ordering.py | 0 .../rw/migrations/0013_speaker_geometry.py | 0 .../0014__data__speaker_shape_creation.py | 0 .../rw/migrations/0015_remove_null_from_mtm.py | 0 .../rw/migrations/0016_tags_uigroups_api2.py | 0 .../rw/migrations/0017_uiitem_blank_parent.py | 0 .../roundware}/rw/migrations/0018_proj_languages.py | 0 .../rw/migrations/0019_remove_speaker_fields.py | 0 .../roundware}/rw/migrations/0020_add_vote_block.py | 0 .../migrations/0021_session_geo_listen_enabled.py | 0 .../rw/migrations/0022_update_meta_options.py | 0 .../roundware}/rw/migrations/0023_asset_shape.py | 0 .../rw/migrations/0024_speaker_backupuri.py | 0 .../rw/migrations/0025_ui_model_ordering.py | 0 .../rw/migrations/0026_add_projectgroup.py | 0 .../rw/migrations/0027_add_owner_desc_to_project.py | 0 .../rw/migrations/0028_add_uielement_models.py | 0 .../rw/migrations/0029_envelope_related_name.py | 0 .../migrations/0030_add_audiotrack_tag_filters.py | 0 .../0031_add_audiotrack_client_mixing_fields.py | 0 .../rw/migrations/0032_add_asset_crop_fields.py | 0 .../migrations/0033_add_audiotrack_geo_fadeout.py | 0 .../roundware}/rw/migrations/0034_add_asset_user.py | 0 .../0035_add_audiotrack_timed_asset_priority.py | 0 .../rw/migrations/0036_add_asset_updated.py | 0 .../migrations/0037_asset_file_and_loc_caption.py | 0 .../roundware/rw/migrations}/__init__.py | 0 {roundware => src/roundware}/rw/models.py | 2 +- .../roundware}/rw/static/dashboard/blank.html | 0 .../roundware}/rw/static/dashboard/buttons.html | 0 .../rw/static/dashboard/css/bootstrap.css | 0 .../rw/static/dashboard/css/bootstrap.min.css | 0 .../css/plugins/dataTables/dataTables.bootstrap.css | 0 .../css/plugins/morris/morris-0.4.3.min.css | 0 .../css/plugins/social-buttons/social-buttons.css | 0 .../dashboard/css/plugins/timeline/timeline.css | 0 .../roundware}/rw/static/dashboard/css/rw.css | 0 .../roundware}/rw/static/dashboard/css/sb-admin.css | 0 .../roundware}/rw/static/dashboard/flot.html | 0 .../dashboard/font-awesome/css/font-awesome.css | 0 .../dashboard/font-awesome/css/font-awesome.min.css | 0 .../dashboard/font-awesome/fonts/FontAwesome.otf | Bin .../font-awesome/fonts/fontawesome-webfont.eot | Bin .../font-awesome/fonts/fontawesome-webfont.svg | 0 .../font-awesome/fonts/fontawesome-webfont.ttf | Bin .../font-awesome/fonts/fontawesome-webfont.woff | Bin .../font-awesome/less/bordered-pulled.less | 0 .../rw/static/dashboard/font-awesome/less/core.less | 0 .../dashboard/font-awesome/less/fixed-width.less | 0 .../dashboard/font-awesome/less/font-awesome.less | 0 .../static/dashboard/font-awesome/less/icons.less | 0 .../static/dashboard/font-awesome/less/larger.less | 0 .../rw/static/dashboard/font-awesome/less/list.less | 0 .../static/dashboard/font-awesome/less/mixins.less | 0 .../rw/static/dashboard/font-awesome/less/path.less | 0 .../font-awesome/less/rotated-flipped.less | 0 .../dashboard/font-awesome/less/spinning.less | 0 .../static/dashboard/font-awesome/less/stacked.less | 0 .../dashboard/font-awesome/less/variables.less | 0 .../font-awesome/scss/_bordered-pulled.scss | 0 .../static/dashboard/font-awesome/scss/_core.scss | 0 .../dashboard/font-awesome/scss/_fixed-width.scss | 0 .../static/dashboard/font-awesome/scss/_icons.scss | 0 .../static/dashboard/font-awesome/scss/_larger.scss | 0 .../static/dashboard/font-awesome/scss/_list.scss | 0 .../static/dashboard/font-awesome/scss/_mixins.scss | 0 .../static/dashboard/font-awesome/scss/_path.scss | 0 .../font-awesome/scss/_rotated-flipped.scss | 0 .../dashboard/font-awesome/scss/_spinning.scss | 0 .../dashboard/font-awesome/scss/_stacked.scss | 0 .../dashboard/font-awesome/scss/_variables.scss | 0 .../dashboard/font-awesome/scss/font-awesome.scss | 0 .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../rw/static/dashboard/images/ajax-loader.gif | Bin .../roundware}/rw/static/dashboard/index.html | 0 .../roundware}/rw/static/dashboard/js/Jplayer.swf | Bin .../roundware}/rw/static/dashboard/js/bootstrap.js | 0 .../rw/static/dashboard/js/bootstrap.min.js | 0 .../rw/static/dashboard/js/demo/dashboard-demo.js | 0 .../rw/static/dashboard/js/demo/flot-demo.js | 0 .../rw/static/dashboard/js/demo/morris-demo.js | 0 .../rw/static/dashboard/js/jquery-1.10.2.js | 0 .../js/plugins/dataTables/dataTables.bootstrap.js | 0 .../js/plugins/dataTables/jquery.dataTables.js | 0 .../dashboard/js/plugins/flot/excanvas.min.js | 0 .../static/dashboard/js/plugins/flot/jquery.flot.js | 0 .../dashboard/js/plugins/flot/jquery.flot.pie.js | 0 .../dashboard/js/plugins/flot/jquery.flot.resize.js | 0 .../js/plugins/flot/jquery.flot.tooltip.min.js | 0 .../js/plugins/metisMenu/jquery.metisMenu.js | 0 .../rw/static/dashboard/js/plugins/morris/morris.js | 0 .../js/plugins/morris/raphael-2.1.0.min.js | 0 .../roundware}/rw/static/dashboard/js/rw.js | 0 .../roundware}/rw/static/dashboard/js/sb-admin.js | 0 .../rw/static/dashboard/listen-map-dash.html | 0 .../roundware}/rw/static/dashboard/morris.html | 0 .../rw/static/dashboard/panels-wells.html | 0 .../roundware}/rw/static/dashboard/session-map.html | 0 .../roundware}/rw/static/dashboard/tables.html | 0 .../roundware}/rw/static/dashboard/typography.html | 0 .../roundware}/rw/static/rw/css/asset_admin.css | 0 .../roundware}/rw/static/rw/css/envelope_admin.css | 0 .../rw/static/rw/css/jplayer.blue.monday.css | 0 .../rw/static/rw/css/jplayer.blue.monday.jpg | Bin .../roundware}/rw/static/rw/css/rw_admin.css | 0 .../roundware}/rw/static/rw/css/setup_tag_ui.css | 0 .../roundware}/rw/static/rw/css/tag_batch_add.css | 0 .../roundware}/rw/static/rw/img/resize-off.png | Bin .../roundware}/rw/static/rw/img/resize.png | Bin .../roundware}/rw/static/rw/js/Jplayer.swf | Bin .../rw/static/rw/js/add-on/jplayer.playlist.min.js | 0 .../static/rw/js/add-on/jquery.jplayer.inspector.js | 0 .../roundware}/rw/static/rw/js/asset_admin.js | 0 .../roundware}/rw/static/rw/js/audio.js | 0 .../roundware}/rw/static/rw/js/envelope_admin.js | 0 .../rw/static/rw/js/jquery.formset.min.js | 0 .../rw/static/rw/js/jquery.jplayer.min.js | 0 .../roundware}/rw/static/rw/js/location_map.js | 0 .../roundware}/rw/static/rw/js/setup_tag_ui.js | 0 .../rw/static/rw/js/sortedmulticheckbox_widget.js | 0 .../roundware}/rw/static/tools/css/asset-map.css | 0 .../roundware}/rw/static/tools/css/listen-map.css | 0 .../rw/static/tools/gis/bay_water.geojson | 0 .../roundware}/rw/static/tools/img/ajax-loader.gif | Bin .../roundware}/rw/static/tools/js/Jplayer.swf | Bin .../rw/static/tools/js/jquery.jplayer.min.js | 0 .../roundware}/rw/static/tools/js/listen-map.js | 0 .../rw/templates/admin/asset_change_form.html | 0 .../roundware}/rw/templates/admin/base_site.html | 0 .../rw/templates/admin/tag_change_list.html | 0 .../roundware}/rw/templates/rw/404.html | 0 .../roundware}/rw/templates/rw/chart_template.html | 0 .../rw/templates/rw/setup_tag_ui_form.html | 0 .../rw/templates/rw/setup_tags_ui_edit_form.html | 0 .../rw/templates/rw/tags_add_to_category_form.html | 0 .../sorted_checkbox_select_multiple_widget.html | 0 .../roundware}/rw/templates/tools/asset-map.html | 0 .../roundware}/rw/templates/tools/listen-map.html | 0 .../roundware/rw/tests}/__init__.py | 0 {roundware => src/roundware}/rw/tests/common.py | 0 {roundware => src/roundware}/rw/tests/test_admin.py | 0 .../roundware}/rw/tests/test_models.py | 6 +++--- {roundware => src/roundware}/rw/urls.py | 0 {roundware => src/roundware}/rw/views.py | 0 {roundware => src/roundware}/rw/widgets.py | 0 {roundware => src/roundware}/settings/__init__.py | 0 {roundware => src/roundware}/settings/common.py | 0 {roundware => src/roundware}/settings/dev.py | 0 {roundware => src/roundware}/settings/testing.py | 0 {roundware => src/roundware}/urls.py | 0 {roundware => src/roundware}/wsgi.py | 0 212 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 docker/dev.dockerfile delete mode 100644 roundware/rw/tests/__init__.py create mode 100644 src/roundware/__init__.py rename {roundware => src/roundware/api1}/__init__.py (100%) rename {roundware => src/roundware}/api1/commands.py (100%) rename {roundware => src/roundware}/api1/serializers.py (100%) rename {roundware => src/roundware}/api1/urls.py (100%) rename {roundware => src/roundware}/api1/views.py (100%) rename {roundware => src/roundware}/api2/__init__.py (100%) rename {roundware => src/roundware}/api2/apps.py (100%) rename {roundware => src/roundware}/api2/filters.py (100%) rename {roundware => src/roundware}/api2/permissions.py (100%) rename {roundware => src/roundware}/api2/serializers.py (100%) rename {roundware => src/roundware}/api2/signals.py (100%) rename {roundware => src/roundware}/api2/tests.py (100%) rename {roundware => src/roundware}/api2/urls.py (100%) rename {roundware => src/roundware}/api2/views.py (100%) rename {roundware/api1 => src/roundware/lib}/__init__.py (100%) rename {roundware => src/roundware}/lib/api.py (100%) rename {roundware => src/roundware}/lib/convertaudio.py (100%) rename {roundware => src/roundware}/lib/discover_audiolength.py (100%) rename {roundware => src/roundware}/lib/exception.py (100%) rename {roundware => src/roundware}/manage.py (100%) rename {roundware => src/roundware}/notifications/__init__.py (100%) rename {roundware => src/roundware}/notifications/admin.py (100%) rename {roundware => src/roundware}/notifications/migrations/0001_initial.py (100%) rename {roundware => src/roundware}/notifications/migrations/0002_remove_time_default.py (100%) rename {roundware/lib => src/roundware/notifications/migrations}/__init__.py (100%) rename {roundware => src/roundware}/notifications/models.py (100%) rename {roundware/notifications/migrations => src/roundware/rw}/__init__.py (100%) rename {roundware => src/roundware}/rw/admin.py (100%) rename {roundware => src/roundware}/rw/admin_helper.py (100%) rename {roundware => src/roundware}/rw/apps.py (100%) rename {roundware => src/roundware}/rw/baker_recipes.py (100%) rename {roundware => src/roundware}/rw/fields.py (100%) rename {roundware => src/roundware}/rw/filters.py (100%) rename {roundware => src/roundware}/rw/fixtures/default_auth.json (100%) rename {roundware => src/roundware}/rw/fixtures/sample_project.json (100%) rename {roundware => src/roundware}/rw/fixtures/speakers.json (100%) rename {roundware => src/roundware}/rw/forms.py (100%) rename {roundware/rw => src/roundware/rw/management}/__init__.py (100%) rename {roundware => src/roundware}/rw/management/commands/__init__.py (100%) rename {roundware => src/roundware}/rw/management/commands/check_assets.py (100%) rename {roundware => src/roundware}/rw/management/commands/check_media.py (100%) rename {roundware => src/roundware}/rw/management/commands/clean_media.py (100%) rename {roundware => src/roundware}/rw/migrations/0001_initial.py (100%) rename {roundware => src/roundware}/rw/migrations/0002_select_method_to_choice.py (100%) rename {roundware => src/roundware}/rw/migrations/0003_uimode_to_choice.py (100%) rename {roundware => src/roundware}/rw/migrations/0004_repeat_mode_to_choice.py (100%) rename {roundware => src/roundware}/rw/migrations/0005_timedassets.py (100%) rename {roundware => src/roundware}/rw/migrations/0006_tag_filter_browse.py (100%) rename {roundware => src/roundware}/rw/migrations/0007_repeat_mode.py (100%) rename {roundware => src/roundware}/rw/migrations/0008_project_timed_asset_priority.py (100%) rename {roundware => src/roundware}/rw/migrations/0009_userprofile.py (100%) rename {roundware => src/roundware}/rw/migrations/0010_session_timezone.py (100%) rename {roundware => src/roundware}/rw/migrations/0011_add_rate_vote_type.py (100%) rename {roundware => src/roundware}/rw/migrations/0012_asset_ordering.py (100%) rename {roundware => src/roundware}/rw/migrations/0013_speaker_geometry.py (100%) rename {roundware => src/roundware}/rw/migrations/0014__data__speaker_shape_creation.py (100%) rename {roundware => src/roundware}/rw/migrations/0015_remove_null_from_mtm.py (100%) rename {roundware => src/roundware}/rw/migrations/0016_tags_uigroups_api2.py (100%) rename {roundware => src/roundware}/rw/migrations/0017_uiitem_blank_parent.py (100%) rename {roundware => src/roundware}/rw/migrations/0018_proj_languages.py (100%) rename {roundware => src/roundware}/rw/migrations/0019_remove_speaker_fields.py (100%) rename {roundware => src/roundware}/rw/migrations/0020_add_vote_block.py (100%) rename {roundware => src/roundware}/rw/migrations/0021_session_geo_listen_enabled.py (100%) rename {roundware => src/roundware}/rw/migrations/0022_update_meta_options.py (100%) rename {roundware => src/roundware}/rw/migrations/0023_asset_shape.py (100%) rename {roundware => src/roundware}/rw/migrations/0024_speaker_backupuri.py (100%) rename {roundware => src/roundware}/rw/migrations/0025_ui_model_ordering.py (100%) rename {roundware => src/roundware}/rw/migrations/0026_add_projectgroup.py (100%) rename {roundware => src/roundware}/rw/migrations/0027_add_owner_desc_to_project.py (100%) rename {roundware => src/roundware}/rw/migrations/0028_add_uielement_models.py (100%) rename {roundware => src/roundware}/rw/migrations/0029_envelope_related_name.py (100%) rename {roundware => src/roundware}/rw/migrations/0030_add_audiotrack_tag_filters.py (100%) rename {roundware => src/roundware}/rw/migrations/0031_add_audiotrack_client_mixing_fields.py (100%) rename {roundware => src/roundware}/rw/migrations/0032_add_asset_crop_fields.py (100%) rename {roundware => src/roundware}/rw/migrations/0033_add_audiotrack_geo_fadeout.py (100%) rename {roundware => src/roundware}/rw/migrations/0034_add_asset_user.py (100%) rename {roundware => src/roundware}/rw/migrations/0035_add_audiotrack_timed_asset_priority.py (100%) rename {roundware => src/roundware}/rw/migrations/0036_add_asset_updated.py (100%) rename {roundware => src/roundware}/rw/migrations/0037_asset_file_and_loc_caption.py (100%) rename {roundware/rw/management => src/roundware/rw/migrations}/__init__.py (100%) rename {roundware => src/roundware}/rw/models.py (99%) rename {roundware => src/roundware}/rw/static/dashboard/blank.html (100%) rename {roundware => src/roundware}/rw/static/dashboard/buttons.html (100%) rename {roundware => src/roundware}/rw/static/dashboard/css/bootstrap.css (100%) rename {roundware => src/roundware}/rw/static/dashboard/css/bootstrap.min.css (100%) rename {roundware => src/roundware}/rw/static/dashboard/css/plugins/dataTables/dataTables.bootstrap.css (100%) rename {roundware => src/roundware}/rw/static/dashboard/css/plugins/morris/morris-0.4.3.min.css (100%) rename {roundware => src/roundware}/rw/static/dashboard/css/plugins/social-buttons/social-buttons.css (100%) rename {roundware => src/roundware}/rw/static/dashboard/css/plugins/timeline/timeline.css (100%) rename {roundware => src/roundware}/rw/static/dashboard/css/rw.css (100%) rename {roundware => src/roundware}/rw/static/dashboard/css/sb-admin.css (100%) rename {roundware => src/roundware}/rw/static/dashboard/flot.html (100%) rename {roundware => src/roundware}/rw/static/dashboard/font-awesome/css/font-awesome.css (100%) rename {roundware => src/roundware}/rw/static/dashboard/font-awesome/css/font-awesome.min.css (100%) rename {roundware => src/roundware}/rw/static/dashboard/font-awesome/fonts/FontAwesome.otf (100%) rename {roundware => src/roundware}/rw/static/dashboard/font-awesome/fonts/fontawesome-webfont.eot (100%) rename {roundware => src/roundware}/rw/static/dashboard/font-awesome/fonts/fontawesome-webfont.svg (100%) rename {roundware => src/roundware}/rw/static/dashboard/font-awesome/fonts/fontawesome-webfont.ttf (100%) rename {roundware => src/roundware}/rw/static/dashboard/font-awesome/fonts/fontawesome-webfont.woff (100%) rename {roundware => src/roundware}/rw/static/dashboard/font-awesome/less/bordered-pulled.less (100%) rename {roundware => src/roundware}/rw/static/dashboard/font-awesome/less/core.less (100%) rename {roundware => src/roundware}/rw/static/dashboard/font-awesome/less/fixed-width.less (100%) rename {roundware => src/roundware}/rw/static/dashboard/font-awesome/less/font-awesome.less (100%) rename {roundware => src/roundware}/rw/static/dashboard/font-awesome/less/icons.less (100%) rename {roundware => src/roundware}/rw/static/dashboard/font-awesome/less/larger.less (100%) rename {roundware => src/roundware}/rw/static/dashboard/font-awesome/less/list.less (100%) rename {roundware => src/roundware}/rw/static/dashboard/font-awesome/less/mixins.less (100%) rename {roundware => src/roundware}/rw/static/dashboard/font-awesome/less/path.less (100%) rename {roundware => src/roundware}/rw/static/dashboard/font-awesome/less/rotated-flipped.less (100%) rename {roundware => src/roundware}/rw/static/dashboard/font-awesome/less/spinning.less (100%) rename {roundware => src/roundware}/rw/static/dashboard/font-awesome/less/stacked.less (100%) rename {roundware => src/roundware}/rw/static/dashboard/font-awesome/less/variables.less (100%) rename {roundware => src/roundware}/rw/static/dashboard/font-awesome/scss/_bordered-pulled.scss (100%) rename {roundware => src/roundware}/rw/static/dashboard/font-awesome/scss/_core.scss (100%) rename {roundware => src/roundware}/rw/static/dashboard/font-awesome/scss/_fixed-width.scss (100%) rename {roundware => src/roundware}/rw/static/dashboard/font-awesome/scss/_icons.scss (100%) rename {roundware => src/roundware}/rw/static/dashboard/font-awesome/scss/_larger.scss (100%) rename {roundware => src/roundware}/rw/static/dashboard/font-awesome/scss/_list.scss (100%) rename {roundware => src/roundware}/rw/static/dashboard/font-awesome/scss/_mixins.scss (100%) rename {roundware => src/roundware}/rw/static/dashboard/font-awesome/scss/_path.scss (100%) rename {roundware => src/roundware}/rw/static/dashboard/font-awesome/scss/_rotated-flipped.scss (100%) rename {roundware => src/roundware}/rw/static/dashboard/font-awesome/scss/_spinning.scss (100%) rename {roundware => src/roundware}/rw/static/dashboard/font-awesome/scss/_stacked.scss (100%) rename {roundware => src/roundware}/rw/static/dashboard/font-awesome/scss/_variables.scss (100%) rename {roundware => src/roundware}/rw/static/dashboard/font-awesome/scss/font-awesome.scss (100%) rename {roundware => src/roundware}/rw/static/dashboard/fonts/glyphicons-halflings-regular.eot (100%) rename {roundware => src/roundware}/rw/static/dashboard/fonts/glyphicons-halflings-regular.svg (100%) rename {roundware => src/roundware}/rw/static/dashboard/fonts/glyphicons-halflings-regular.ttf (100%) rename {roundware => src/roundware}/rw/static/dashboard/fonts/glyphicons-halflings-regular.woff (100%) rename {roundware => src/roundware}/rw/static/dashboard/images/ajax-loader.gif (100%) rename {roundware => src/roundware}/rw/static/dashboard/index.html (100%) rename {roundware => src/roundware}/rw/static/dashboard/js/Jplayer.swf (100%) rename {roundware => src/roundware}/rw/static/dashboard/js/bootstrap.js (100%) rename {roundware => src/roundware}/rw/static/dashboard/js/bootstrap.min.js (100%) rename {roundware => src/roundware}/rw/static/dashboard/js/demo/dashboard-demo.js (100%) rename {roundware => src/roundware}/rw/static/dashboard/js/demo/flot-demo.js (100%) rename {roundware => src/roundware}/rw/static/dashboard/js/demo/morris-demo.js (100%) rename {roundware => src/roundware}/rw/static/dashboard/js/jquery-1.10.2.js (100%) rename {roundware => src/roundware}/rw/static/dashboard/js/plugins/dataTables/dataTables.bootstrap.js (100%) rename {roundware => src/roundware}/rw/static/dashboard/js/plugins/dataTables/jquery.dataTables.js (100%) rename {roundware => src/roundware}/rw/static/dashboard/js/plugins/flot/excanvas.min.js (100%) rename {roundware => src/roundware}/rw/static/dashboard/js/plugins/flot/jquery.flot.js (100%) rename {roundware => src/roundware}/rw/static/dashboard/js/plugins/flot/jquery.flot.pie.js (100%) rename {roundware => src/roundware}/rw/static/dashboard/js/plugins/flot/jquery.flot.resize.js (100%) rename {roundware => src/roundware}/rw/static/dashboard/js/plugins/flot/jquery.flot.tooltip.min.js (100%) rename {roundware => src/roundware}/rw/static/dashboard/js/plugins/metisMenu/jquery.metisMenu.js (100%) rename {roundware => src/roundware}/rw/static/dashboard/js/plugins/morris/morris.js (100%) rename {roundware => src/roundware}/rw/static/dashboard/js/plugins/morris/raphael-2.1.0.min.js (100%) rename {roundware => src/roundware}/rw/static/dashboard/js/rw.js (100%) rename {roundware => src/roundware}/rw/static/dashboard/js/sb-admin.js (100%) rename {roundware => src/roundware}/rw/static/dashboard/listen-map-dash.html (100%) rename {roundware => src/roundware}/rw/static/dashboard/morris.html (100%) rename {roundware => src/roundware}/rw/static/dashboard/panels-wells.html (100%) rename {roundware => src/roundware}/rw/static/dashboard/session-map.html (100%) rename {roundware => src/roundware}/rw/static/dashboard/tables.html (100%) rename {roundware => src/roundware}/rw/static/dashboard/typography.html (100%) rename {roundware => src/roundware}/rw/static/rw/css/asset_admin.css (100%) rename {roundware => src/roundware}/rw/static/rw/css/envelope_admin.css (100%) rename {roundware => src/roundware}/rw/static/rw/css/jplayer.blue.monday.css (100%) rename {roundware => src/roundware}/rw/static/rw/css/jplayer.blue.monday.jpg (100%) rename {roundware => src/roundware}/rw/static/rw/css/rw_admin.css (100%) rename {roundware => src/roundware}/rw/static/rw/css/setup_tag_ui.css (100%) rename {roundware => src/roundware}/rw/static/rw/css/tag_batch_add.css (100%) rename {roundware => src/roundware}/rw/static/rw/img/resize-off.png (100%) rename {roundware => src/roundware}/rw/static/rw/img/resize.png (100%) rename {roundware => src/roundware}/rw/static/rw/js/Jplayer.swf (100%) rename {roundware => src/roundware}/rw/static/rw/js/add-on/jplayer.playlist.min.js (100%) rename {roundware => src/roundware}/rw/static/rw/js/add-on/jquery.jplayer.inspector.js (100%) rename {roundware => src/roundware}/rw/static/rw/js/asset_admin.js (100%) rename {roundware => src/roundware}/rw/static/rw/js/audio.js (100%) rename {roundware => src/roundware}/rw/static/rw/js/envelope_admin.js (100%) rename {roundware => src/roundware}/rw/static/rw/js/jquery.formset.min.js (100%) rename {roundware => src/roundware}/rw/static/rw/js/jquery.jplayer.min.js (100%) rename {roundware => src/roundware}/rw/static/rw/js/location_map.js (100%) rename {roundware => src/roundware}/rw/static/rw/js/setup_tag_ui.js (100%) rename {roundware => src/roundware}/rw/static/rw/js/sortedmulticheckbox_widget.js (100%) rename {roundware => src/roundware}/rw/static/tools/css/asset-map.css (100%) rename {roundware => src/roundware}/rw/static/tools/css/listen-map.css (100%) rename {roundware => src/roundware}/rw/static/tools/gis/bay_water.geojson (100%) rename {roundware => src/roundware}/rw/static/tools/img/ajax-loader.gif (100%) rename {roundware => src/roundware}/rw/static/tools/js/Jplayer.swf (100%) rename {roundware => src/roundware}/rw/static/tools/js/jquery.jplayer.min.js (100%) rename {roundware => src/roundware}/rw/static/tools/js/listen-map.js (100%) rename {roundware => src/roundware}/rw/templates/admin/asset_change_form.html (100%) rename {roundware => src/roundware}/rw/templates/admin/base_site.html (100%) rename {roundware => src/roundware}/rw/templates/admin/tag_change_list.html (100%) rename {roundware => src/roundware}/rw/templates/rw/404.html (100%) rename {roundware => src/roundware}/rw/templates/rw/chart_template.html (100%) rename {roundware => src/roundware}/rw/templates/rw/setup_tag_ui_form.html (100%) rename {roundware => src/roundware}/rw/templates/rw/setup_tags_ui_edit_form.html (100%) rename {roundware => src/roundware}/rw/templates/rw/tags_add_to_category_form.html (100%) rename {roundware => src/roundware}/rw/templates/sortedm2m/sorted_checkbox_select_multiple_widget.html (100%) rename {roundware => src/roundware}/rw/templates/tools/asset-map.html (100%) rename {roundware => src/roundware}/rw/templates/tools/listen-map.html (100%) rename {roundware/rw/migrations => src/roundware/rw/tests}/__init__.py (100%) rename {roundware => src/roundware}/rw/tests/common.py (100%) rename {roundware => src/roundware}/rw/tests/test_admin.py (100%) rename {roundware => src/roundware}/rw/tests/test_models.py (96%) rename {roundware => src/roundware}/rw/urls.py (100%) rename {roundware => src/roundware}/rw/views.py (100%) rename {roundware => src/roundware}/rw/widgets.py (100%) rename {roundware => src/roundware}/settings/__init__.py (100%) rename {roundware => src/roundware}/settings/common.py (100%) rename {roundware => src/roundware}/settings/dev.py (100%) rename {roundware => src/roundware}/settings/testing.py (100%) rename {roundware => src/roundware}/urls.py (100%) rename {roundware => src/roundware}/wsgi.py (100%) diff --git a/docker/base.dockerfile b/docker/base.dockerfile index dd3e5673..5799e4a8 100644 --- 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 new file mode 100644 index 00000000..b64d8383 --- /dev/null +++ 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 index 4a5c1880..9fd47772 100644 --- 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 = ["."] \ No newline at end of file +where = ["src"] \ No newline at end of file diff --git a/roundware/rw/tests/__init__.py b/roundware/rw/tests/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/src/roundware/__init__.py b/src/roundware/__init__.py new file mode 100644 index 00000000..abeeedbf --- /dev/null +++ b/src/roundware/__init__.py @@ -0,0 +1 @@ +__version__ = '0.4.0' diff --git a/roundware/__init__.py b/src/roundware/api1/__init__.py similarity index 100% rename from roundware/__init__.py rename to src/roundware/api1/__init__.py diff --git a/roundware/api1/commands.py b/src/roundware/api1/commands.py similarity index 100% rename from roundware/api1/commands.py rename to src/roundware/api1/commands.py diff --git a/roundware/api1/serializers.py b/src/roundware/api1/serializers.py similarity index 100% rename from roundware/api1/serializers.py rename to src/roundware/api1/serializers.py diff --git a/roundware/api1/urls.py b/src/roundware/api1/urls.py similarity index 100% rename from roundware/api1/urls.py rename to src/roundware/api1/urls.py diff --git a/roundware/api1/views.py b/src/roundware/api1/views.py similarity index 100% rename from roundware/api1/views.py rename to src/roundware/api1/views.py diff --git a/roundware/api2/__init__.py b/src/roundware/api2/__init__.py similarity index 100% rename from roundware/api2/__init__.py rename to src/roundware/api2/__init__.py diff --git a/roundware/api2/apps.py b/src/roundware/api2/apps.py similarity index 100% rename from roundware/api2/apps.py rename to src/roundware/api2/apps.py diff --git a/roundware/api2/filters.py b/src/roundware/api2/filters.py similarity index 100% rename from roundware/api2/filters.py rename to src/roundware/api2/filters.py diff --git a/roundware/api2/permissions.py b/src/roundware/api2/permissions.py similarity index 100% rename from roundware/api2/permissions.py rename to src/roundware/api2/permissions.py diff --git a/roundware/api2/serializers.py b/src/roundware/api2/serializers.py similarity index 100% rename from roundware/api2/serializers.py rename to src/roundware/api2/serializers.py diff --git a/roundware/api2/signals.py b/src/roundware/api2/signals.py similarity index 100% rename from roundware/api2/signals.py rename to src/roundware/api2/signals.py diff --git a/roundware/api2/tests.py b/src/roundware/api2/tests.py similarity index 100% rename from roundware/api2/tests.py rename to src/roundware/api2/tests.py diff --git a/roundware/api2/urls.py b/src/roundware/api2/urls.py similarity index 100% rename from roundware/api2/urls.py rename to src/roundware/api2/urls.py diff --git a/roundware/api2/views.py b/src/roundware/api2/views.py similarity index 100% rename from roundware/api2/views.py rename to src/roundware/api2/views.py diff --git a/roundware/api1/__init__.py b/src/roundware/lib/__init__.py similarity index 100% rename from roundware/api1/__init__.py rename to src/roundware/lib/__init__.py diff --git a/roundware/lib/api.py b/src/roundware/lib/api.py similarity index 100% rename from roundware/lib/api.py rename to src/roundware/lib/api.py diff --git a/roundware/lib/convertaudio.py b/src/roundware/lib/convertaudio.py similarity index 100% rename from roundware/lib/convertaudio.py rename to src/roundware/lib/convertaudio.py diff --git a/roundware/lib/discover_audiolength.py b/src/roundware/lib/discover_audiolength.py similarity index 100% rename from roundware/lib/discover_audiolength.py rename to src/roundware/lib/discover_audiolength.py diff --git a/roundware/lib/exception.py b/src/roundware/lib/exception.py similarity index 100% rename from roundware/lib/exception.py rename to src/roundware/lib/exception.py diff --git a/roundware/manage.py b/src/roundware/manage.py similarity index 100% rename from roundware/manage.py rename to src/roundware/manage.py diff --git a/roundware/notifications/__init__.py b/src/roundware/notifications/__init__.py similarity index 100% rename from roundware/notifications/__init__.py rename to src/roundware/notifications/__init__.py diff --git a/roundware/notifications/admin.py b/src/roundware/notifications/admin.py similarity index 100% rename from roundware/notifications/admin.py rename to src/roundware/notifications/admin.py diff --git a/roundware/notifications/migrations/0001_initial.py b/src/roundware/notifications/migrations/0001_initial.py similarity index 100% rename from roundware/notifications/migrations/0001_initial.py rename to src/roundware/notifications/migrations/0001_initial.py diff --git a/roundware/notifications/migrations/0002_remove_time_default.py b/src/roundware/notifications/migrations/0002_remove_time_default.py similarity index 100% rename from roundware/notifications/migrations/0002_remove_time_default.py rename to src/roundware/notifications/migrations/0002_remove_time_default.py diff --git a/roundware/lib/__init__.py b/src/roundware/notifications/migrations/__init__.py similarity index 100% rename from roundware/lib/__init__.py rename to src/roundware/notifications/migrations/__init__.py diff --git a/roundware/notifications/models.py b/src/roundware/notifications/models.py similarity index 100% rename from roundware/notifications/models.py rename to src/roundware/notifications/models.py diff --git a/roundware/notifications/migrations/__init__.py b/src/roundware/rw/__init__.py similarity index 100% rename from roundware/notifications/migrations/__init__.py rename to src/roundware/rw/__init__.py diff --git a/roundware/rw/admin.py b/src/roundware/rw/admin.py similarity index 100% rename from roundware/rw/admin.py rename to src/roundware/rw/admin.py diff --git a/roundware/rw/admin_helper.py b/src/roundware/rw/admin_helper.py similarity index 100% rename from roundware/rw/admin_helper.py rename to src/roundware/rw/admin_helper.py diff --git a/roundware/rw/apps.py b/src/roundware/rw/apps.py similarity index 100% rename from roundware/rw/apps.py rename to src/roundware/rw/apps.py diff --git a/roundware/rw/baker_recipes.py b/src/roundware/rw/baker_recipes.py similarity index 100% rename from roundware/rw/baker_recipes.py rename to src/roundware/rw/baker_recipes.py diff --git a/roundware/rw/fields.py b/src/roundware/rw/fields.py similarity index 100% rename from roundware/rw/fields.py rename to src/roundware/rw/fields.py diff --git a/roundware/rw/filters.py b/src/roundware/rw/filters.py similarity index 100% rename from roundware/rw/filters.py rename to src/roundware/rw/filters.py diff --git a/roundware/rw/fixtures/default_auth.json b/src/roundware/rw/fixtures/default_auth.json similarity index 100% rename from roundware/rw/fixtures/default_auth.json rename to src/roundware/rw/fixtures/default_auth.json diff --git a/roundware/rw/fixtures/sample_project.json b/src/roundware/rw/fixtures/sample_project.json similarity index 100% rename from roundware/rw/fixtures/sample_project.json rename to src/roundware/rw/fixtures/sample_project.json diff --git a/roundware/rw/fixtures/speakers.json b/src/roundware/rw/fixtures/speakers.json similarity index 100% rename from roundware/rw/fixtures/speakers.json rename to src/roundware/rw/fixtures/speakers.json diff --git a/roundware/rw/forms.py b/src/roundware/rw/forms.py similarity index 100% rename from roundware/rw/forms.py rename to src/roundware/rw/forms.py diff --git a/roundware/rw/__init__.py b/src/roundware/rw/management/__init__.py similarity index 100% rename from roundware/rw/__init__.py rename to src/roundware/rw/management/__init__.py diff --git a/roundware/rw/management/commands/__init__.py b/src/roundware/rw/management/commands/__init__.py similarity index 100% rename from roundware/rw/management/commands/__init__.py rename to src/roundware/rw/management/commands/__init__.py diff --git a/roundware/rw/management/commands/check_assets.py b/src/roundware/rw/management/commands/check_assets.py similarity index 100% rename from roundware/rw/management/commands/check_assets.py rename to src/roundware/rw/management/commands/check_assets.py diff --git a/roundware/rw/management/commands/check_media.py b/src/roundware/rw/management/commands/check_media.py similarity index 100% rename from roundware/rw/management/commands/check_media.py rename to src/roundware/rw/management/commands/check_media.py diff --git a/roundware/rw/management/commands/clean_media.py b/src/roundware/rw/management/commands/clean_media.py similarity index 100% rename from roundware/rw/management/commands/clean_media.py rename to src/roundware/rw/management/commands/clean_media.py diff --git a/roundware/rw/migrations/0001_initial.py b/src/roundware/rw/migrations/0001_initial.py similarity index 100% rename from roundware/rw/migrations/0001_initial.py rename to src/roundware/rw/migrations/0001_initial.py diff --git a/roundware/rw/migrations/0002_select_method_to_choice.py b/src/roundware/rw/migrations/0002_select_method_to_choice.py similarity index 100% rename from roundware/rw/migrations/0002_select_method_to_choice.py rename to src/roundware/rw/migrations/0002_select_method_to_choice.py diff --git a/roundware/rw/migrations/0003_uimode_to_choice.py b/src/roundware/rw/migrations/0003_uimode_to_choice.py similarity index 100% rename from roundware/rw/migrations/0003_uimode_to_choice.py rename to src/roundware/rw/migrations/0003_uimode_to_choice.py diff --git a/roundware/rw/migrations/0004_repeat_mode_to_choice.py b/src/roundware/rw/migrations/0004_repeat_mode_to_choice.py similarity index 100% rename from roundware/rw/migrations/0004_repeat_mode_to_choice.py rename to src/roundware/rw/migrations/0004_repeat_mode_to_choice.py diff --git a/roundware/rw/migrations/0005_timedassets.py b/src/roundware/rw/migrations/0005_timedassets.py similarity index 100% rename from roundware/rw/migrations/0005_timedassets.py rename to src/roundware/rw/migrations/0005_timedassets.py diff --git a/roundware/rw/migrations/0006_tag_filter_browse.py b/src/roundware/rw/migrations/0006_tag_filter_browse.py similarity index 100% rename from roundware/rw/migrations/0006_tag_filter_browse.py rename to src/roundware/rw/migrations/0006_tag_filter_browse.py diff --git a/roundware/rw/migrations/0007_repeat_mode.py b/src/roundware/rw/migrations/0007_repeat_mode.py similarity index 100% rename from roundware/rw/migrations/0007_repeat_mode.py rename to src/roundware/rw/migrations/0007_repeat_mode.py diff --git a/roundware/rw/migrations/0008_project_timed_asset_priority.py b/src/roundware/rw/migrations/0008_project_timed_asset_priority.py similarity index 100% rename from roundware/rw/migrations/0008_project_timed_asset_priority.py rename to src/roundware/rw/migrations/0008_project_timed_asset_priority.py diff --git a/roundware/rw/migrations/0009_userprofile.py b/src/roundware/rw/migrations/0009_userprofile.py similarity index 100% rename from roundware/rw/migrations/0009_userprofile.py rename to src/roundware/rw/migrations/0009_userprofile.py diff --git a/roundware/rw/migrations/0010_session_timezone.py b/src/roundware/rw/migrations/0010_session_timezone.py similarity index 100% rename from roundware/rw/migrations/0010_session_timezone.py rename to src/roundware/rw/migrations/0010_session_timezone.py diff --git a/roundware/rw/migrations/0011_add_rate_vote_type.py b/src/roundware/rw/migrations/0011_add_rate_vote_type.py similarity index 100% rename from roundware/rw/migrations/0011_add_rate_vote_type.py rename to src/roundware/rw/migrations/0011_add_rate_vote_type.py diff --git a/roundware/rw/migrations/0012_asset_ordering.py b/src/roundware/rw/migrations/0012_asset_ordering.py similarity index 100% rename from roundware/rw/migrations/0012_asset_ordering.py rename to src/roundware/rw/migrations/0012_asset_ordering.py diff --git a/roundware/rw/migrations/0013_speaker_geometry.py b/src/roundware/rw/migrations/0013_speaker_geometry.py similarity index 100% rename from roundware/rw/migrations/0013_speaker_geometry.py rename to src/roundware/rw/migrations/0013_speaker_geometry.py diff --git a/roundware/rw/migrations/0014__data__speaker_shape_creation.py b/src/roundware/rw/migrations/0014__data__speaker_shape_creation.py similarity index 100% rename from roundware/rw/migrations/0014__data__speaker_shape_creation.py rename to src/roundware/rw/migrations/0014__data__speaker_shape_creation.py diff --git a/roundware/rw/migrations/0015_remove_null_from_mtm.py b/src/roundware/rw/migrations/0015_remove_null_from_mtm.py similarity index 100% rename from roundware/rw/migrations/0015_remove_null_from_mtm.py rename to src/roundware/rw/migrations/0015_remove_null_from_mtm.py diff --git a/roundware/rw/migrations/0016_tags_uigroups_api2.py b/src/roundware/rw/migrations/0016_tags_uigroups_api2.py similarity index 100% rename from roundware/rw/migrations/0016_tags_uigroups_api2.py rename to src/roundware/rw/migrations/0016_tags_uigroups_api2.py diff --git a/roundware/rw/migrations/0017_uiitem_blank_parent.py b/src/roundware/rw/migrations/0017_uiitem_blank_parent.py similarity index 100% rename from roundware/rw/migrations/0017_uiitem_blank_parent.py rename to src/roundware/rw/migrations/0017_uiitem_blank_parent.py diff --git a/roundware/rw/migrations/0018_proj_languages.py b/src/roundware/rw/migrations/0018_proj_languages.py similarity index 100% rename from roundware/rw/migrations/0018_proj_languages.py rename to src/roundware/rw/migrations/0018_proj_languages.py diff --git a/roundware/rw/migrations/0019_remove_speaker_fields.py b/src/roundware/rw/migrations/0019_remove_speaker_fields.py similarity index 100% rename from roundware/rw/migrations/0019_remove_speaker_fields.py rename to src/roundware/rw/migrations/0019_remove_speaker_fields.py diff --git a/roundware/rw/migrations/0020_add_vote_block.py b/src/roundware/rw/migrations/0020_add_vote_block.py similarity index 100% rename from roundware/rw/migrations/0020_add_vote_block.py rename to src/roundware/rw/migrations/0020_add_vote_block.py diff --git a/roundware/rw/migrations/0021_session_geo_listen_enabled.py b/src/roundware/rw/migrations/0021_session_geo_listen_enabled.py similarity index 100% rename from roundware/rw/migrations/0021_session_geo_listen_enabled.py rename to src/roundware/rw/migrations/0021_session_geo_listen_enabled.py diff --git a/roundware/rw/migrations/0022_update_meta_options.py b/src/roundware/rw/migrations/0022_update_meta_options.py similarity index 100% rename from roundware/rw/migrations/0022_update_meta_options.py rename to src/roundware/rw/migrations/0022_update_meta_options.py diff --git a/roundware/rw/migrations/0023_asset_shape.py b/src/roundware/rw/migrations/0023_asset_shape.py similarity index 100% rename from roundware/rw/migrations/0023_asset_shape.py rename to src/roundware/rw/migrations/0023_asset_shape.py diff --git a/roundware/rw/migrations/0024_speaker_backupuri.py b/src/roundware/rw/migrations/0024_speaker_backupuri.py similarity index 100% rename from roundware/rw/migrations/0024_speaker_backupuri.py rename to src/roundware/rw/migrations/0024_speaker_backupuri.py diff --git a/roundware/rw/migrations/0025_ui_model_ordering.py b/src/roundware/rw/migrations/0025_ui_model_ordering.py similarity index 100% rename from roundware/rw/migrations/0025_ui_model_ordering.py rename to src/roundware/rw/migrations/0025_ui_model_ordering.py diff --git a/roundware/rw/migrations/0026_add_projectgroup.py b/src/roundware/rw/migrations/0026_add_projectgroup.py similarity index 100% rename from roundware/rw/migrations/0026_add_projectgroup.py rename to src/roundware/rw/migrations/0026_add_projectgroup.py diff --git a/roundware/rw/migrations/0027_add_owner_desc_to_project.py b/src/roundware/rw/migrations/0027_add_owner_desc_to_project.py similarity index 100% rename from roundware/rw/migrations/0027_add_owner_desc_to_project.py rename to src/roundware/rw/migrations/0027_add_owner_desc_to_project.py diff --git a/roundware/rw/migrations/0028_add_uielement_models.py b/src/roundware/rw/migrations/0028_add_uielement_models.py similarity index 100% rename from roundware/rw/migrations/0028_add_uielement_models.py rename to src/roundware/rw/migrations/0028_add_uielement_models.py diff --git a/roundware/rw/migrations/0029_envelope_related_name.py b/src/roundware/rw/migrations/0029_envelope_related_name.py similarity index 100% rename from roundware/rw/migrations/0029_envelope_related_name.py rename to src/roundware/rw/migrations/0029_envelope_related_name.py diff --git a/roundware/rw/migrations/0030_add_audiotrack_tag_filters.py b/src/roundware/rw/migrations/0030_add_audiotrack_tag_filters.py similarity index 100% rename from roundware/rw/migrations/0030_add_audiotrack_tag_filters.py rename to src/roundware/rw/migrations/0030_add_audiotrack_tag_filters.py diff --git a/roundware/rw/migrations/0031_add_audiotrack_client_mixing_fields.py b/src/roundware/rw/migrations/0031_add_audiotrack_client_mixing_fields.py similarity index 100% rename from roundware/rw/migrations/0031_add_audiotrack_client_mixing_fields.py rename to src/roundware/rw/migrations/0031_add_audiotrack_client_mixing_fields.py diff --git a/roundware/rw/migrations/0032_add_asset_crop_fields.py b/src/roundware/rw/migrations/0032_add_asset_crop_fields.py similarity index 100% rename from roundware/rw/migrations/0032_add_asset_crop_fields.py rename to src/roundware/rw/migrations/0032_add_asset_crop_fields.py diff --git a/roundware/rw/migrations/0033_add_audiotrack_geo_fadeout.py b/src/roundware/rw/migrations/0033_add_audiotrack_geo_fadeout.py similarity index 100% rename from roundware/rw/migrations/0033_add_audiotrack_geo_fadeout.py rename to src/roundware/rw/migrations/0033_add_audiotrack_geo_fadeout.py diff --git a/roundware/rw/migrations/0034_add_asset_user.py b/src/roundware/rw/migrations/0034_add_asset_user.py similarity index 100% rename from roundware/rw/migrations/0034_add_asset_user.py rename to src/roundware/rw/migrations/0034_add_asset_user.py diff --git a/roundware/rw/migrations/0035_add_audiotrack_timed_asset_priority.py b/src/roundware/rw/migrations/0035_add_audiotrack_timed_asset_priority.py similarity index 100% rename from roundware/rw/migrations/0035_add_audiotrack_timed_asset_priority.py rename to src/roundware/rw/migrations/0035_add_audiotrack_timed_asset_priority.py diff --git a/roundware/rw/migrations/0036_add_asset_updated.py b/src/roundware/rw/migrations/0036_add_asset_updated.py similarity index 100% rename from roundware/rw/migrations/0036_add_asset_updated.py rename to src/roundware/rw/migrations/0036_add_asset_updated.py diff --git a/roundware/rw/migrations/0037_asset_file_and_loc_caption.py b/src/roundware/rw/migrations/0037_asset_file_and_loc_caption.py similarity index 100% rename from roundware/rw/migrations/0037_asset_file_and_loc_caption.py rename to src/roundware/rw/migrations/0037_asset_file_and_loc_caption.py diff --git a/roundware/rw/management/__init__.py b/src/roundware/rw/migrations/__init__.py similarity index 100% rename from roundware/rw/management/__init__.py rename to src/roundware/rw/migrations/__init__.py diff --git a/roundware/rw/models.py b/src/roundware/rw/models.py similarity index 99% rename from roundware/rw/models.py rename to src/roundware/rw/models.py index 9dfe1d83..b6b5db83 100644 --- a/roundware/rw/models.py +++ b/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 b/src/roundware/rw/static/dashboard/blank.html similarity index 100% rename from roundware/rw/static/dashboard/blank.html rename to src/roundware/rw/static/dashboard/blank.html diff --git a/roundware/rw/static/dashboard/buttons.html b/src/roundware/rw/static/dashboard/buttons.html similarity index 100% rename from roundware/rw/static/dashboard/buttons.html rename to src/roundware/rw/static/dashboard/buttons.html diff --git a/roundware/rw/static/dashboard/css/bootstrap.css b/src/roundware/rw/static/dashboard/css/bootstrap.css similarity index 100% rename from roundware/rw/static/dashboard/css/bootstrap.css rename to src/roundware/rw/static/dashboard/css/bootstrap.css diff --git a/roundware/rw/static/dashboard/css/bootstrap.min.css b/src/roundware/rw/static/dashboard/css/bootstrap.min.css similarity index 100% rename from roundware/rw/static/dashboard/css/bootstrap.min.css rename to src/roundware/rw/static/dashboard/css/bootstrap.min.css diff --git a/roundware/rw/static/dashboard/css/plugins/dataTables/dataTables.bootstrap.css b/src/roundware/rw/static/dashboard/css/plugins/dataTables/dataTables.bootstrap.css similarity index 100% rename from roundware/rw/static/dashboard/css/plugins/dataTables/dataTables.bootstrap.css rename to src/roundware/rw/static/dashboard/css/plugins/dataTables/dataTables.bootstrap.css diff --git a/roundware/rw/static/dashboard/css/plugins/morris/morris-0.4.3.min.css b/src/roundware/rw/static/dashboard/css/plugins/morris/morris-0.4.3.min.css similarity index 100% rename from roundware/rw/static/dashboard/css/plugins/morris/morris-0.4.3.min.css rename to src/roundware/rw/static/dashboard/css/plugins/morris/morris-0.4.3.min.css diff --git a/roundware/rw/static/dashboard/css/plugins/social-buttons/social-buttons.css b/src/roundware/rw/static/dashboard/css/plugins/social-buttons/social-buttons.css similarity index 100% rename from roundware/rw/static/dashboard/css/plugins/social-buttons/social-buttons.css rename to src/roundware/rw/static/dashboard/css/plugins/social-buttons/social-buttons.css diff --git a/roundware/rw/static/dashboard/css/plugins/timeline/timeline.css b/src/roundware/rw/static/dashboard/css/plugins/timeline/timeline.css similarity index 100% rename from roundware/rw/static/dashboard/css/plugins/timeline/timeline.css rename to src/roundware/rw/static/dashboard/css/plugins/timeline/timeline.css diff --git a/roundware/rw/static/dashboard/css/rw.css b/src/roundware/rw/static/dashboard/css/rw.css similarity index 100% rename from roundware/rw/static/dashboard/css/rw.css rename to src/roundware/rw/static/dashboard/css/rw.css diff --git a/roundware/rw/static/dashboard/css/sb-admin.css b/src/roundware/rw/static/dashboard/css/sb-admin.css similarity index 100% rename from roundware/rw/static/dashboard/css/sb-admin.css rename to src/roundware/rw/static/dashboard/css/sb-admin.css diff --git a/roundware/rw/static/dashboard/flot.html b/src/roundware/rw/static/dashboard/flot.html similarity index 100% rename from roundware/rw/static/dashboard/flot.html rename to src/roundware/rw/static/dashboard/flot.html diff --git a/roundware/rw/static/dashboard/font-awesome/css/font-awesome.css b/src/roundware/rw/static/dashboard/font-awesome/css/font-awesome.css similarity index 100% rename from roundware/rw/static/dashboard/font-awesome/css/font-awesome.css rename to src/roundware/rw/static/dashboard/font-awesome/css/font-awesome.css diff --git a/roundware/rw/static/dashboard/font-awesome/css/font-awesome.min.css b/src/roundware/rw/static/dashboard/font-awesome/css/font-awesome.min.css similarity index 100% rename from roundware/rw/static/dashboard/font-awesome/css/font-awesome.min.css rename to src/roundware/rw/static/dashboard/font-awesome/css/font-awesome.min.css diff --git a/roundware/rw/static/dashboard/font-awesome/fonts/FontAwesome.otf b/src/roundware/rw/static/dashboard/font-awesome/fonts/FontAwesome.otf similarity index 100% rename from roundware/rw/static/dashboard/font-awesome/fonts/FontAwesome.otf rename to src/roundware/rw/static/dashboard/font-awesome/fonts/FontAwesome.otf diff --git a/roundware/rw/static/dashboard/font-awesome/fonts/fontawesome-webfont.eot b/src/roundware/rw/static/dashboard/font-awesome/fonts/fontawesome-webfont.eot similarity index 100% rename from roundware/rw/static/dashboard/font-awesome/fonts/fontawesome-webfont.eot rename to src/roundware/rw/static/dashboard/font-awesome/fonts/fontawesome-webfont.eot diff --git a/roundware/rw/static/dashboard/font-awesome/fonts/fontawesome-webfont.svg b/src/roundware/rw/static/dashboard/font-awesome/fonts/fontawesome-webfont.svg similarity index 100% rename from roundware/rw/static/dashboard/font-awesome/fonts/fontawesome-webfont.svg rename to src/roundware/rw/static/dashboard/font-awesome/fonts/fontawesome-webfont.svg diff --git a/roundware/rw/static/dashboard/font-awesome/fonts/fontawesome-webfont.ttf b/src/roundware/rw/static/dashboard/font-awesome/fonts/fontawesome-webfont.ttf similarity index 100% rename from roundware/rw/static/dashboard/font-awesome/fonts/fontawesome-webfont.ttf rename to src/roundware/rw/static/dashboard/font-awesome/fonts/fontawesome-webfont.ttf diff --git a/roundware/rw/static/dashboard/font-awesome/fonts/fontawesome-webfont.woff b/src/roundware/rw/static/dashboard/font-awesome/fonts/fontawesome-webfont.woff similarity index 100% rename from roundware/rw/static/dashboard/font-awesome/fonts/fontawesome-webfont.woff rename to src/roundware/rw/static/dashboard/font-awesome/fonts/fontawesome-webfont.woff diff --git a/roundware/rw/static/dashboard/font-awesome/less/bordered-pulled.less b/src/roundware/rw/static/dashboard/font-awesome/less/bordered-pulled.less similarity index 100% rename from roundware/rw/static/dashboard/font-awesome/less/bordered-pulled.less rename to src/roundware/rw/static/dashboard/font-awesome/less/bordered-pulled.less diff --git a/roundware/rw/static/dashboard/font-awesome/less/core.less b/src/roundware/rw/static/dashboard/font-awesome/less/core.less similarity index 100% rename from roundware/rw/static/dashboard/font-awesome/less/core.less rename to src/roundware/rw/static/dashboard/font-awesome/less/core.less diff --git a/roundware/rw/static/dashboard/font-awesome/less/fixed-width.less b/src/roundware/rw/static/dashboard/font-awesome/less/fixed-width.less similarity index 100% rename from roundware/rw/static/dashboard/font-awesome/less/fixed-width.less rename to src/roundware/rw/static/dashboard/font-awesome/less/fixed-width.less diff --git a/roundware/rw/static/dashboard/font-awesome/less/font-awesome.less b/src/roundware/rw/static/dashboard/font-awesome/less/font-awesome.less similarity index 100% rename from roundware/rw/static/dashboard/font-awesome/less/font-awesome.less rename to src/roundware/rw/static/dashboard/font-awesome/less/font-awesome.less diff --git a/roundware/rw/static/dashboard/font-awesome/less/icons.less b/src/roundware/rw/static/dashboard/font-awesome/less/icons.less similarity index 100% rename from roundware/rw/static/dashboard/font-awesome/less/icons.less rename to src/roundware/rw/static/dashboard/font-awesome/less/icons.less diff --git a/roundware/rw/static/dashboard/font-awesome/less/larger.less b/src/roundware/rw/static/dashboard/font-awesome/less/larger.less similarity index 100% rename from roundware/rw/static/dashboard/font-awesome/less/larger.less rename to src/roundware/rw/static/dashboard/font-awesome/less/larger.less diff --git a/roundware/rw/static/dashboard/font-awesome/less/list.less b/src/roundware/rw/static/dashboard/font-awesome/less/list.less similarity index 100% rename from roundware/rw/static/dashboard/font-awesome/less/list.less rename to src/roundware/rw/static/dashboard/font-awesome/less/list.less diff --git a/roundware/rw/static/dashboard/font-awesome/less/mixins.less b/src/roundware/rw/static/dashboard/font-awesome/less/mixins.less similarity index 100% rename from roundware/rw/static/dashboard/font-awesome/less/mixins.less rename to src/roundware/rw/static/dashboard/font-awesome/less/mixins.less diff --git a/roundware/rw/static/dashboard/font-awesome/less/path.less b/src/roundware/rw/static/dashboard/font-awesome/less/path.less similarity index 100% rename from roundware/rw/static/dashboard/font-awesome/less/path.less rename to src/roundware/rw/static/dashboard/font-awesome/less/path.less diff --git a/roundware/rw/static/dashboard/font-awesome/less/rotated-flipped.less b/src/roundware/rw/static/dashboard/font-awesome/less/rotated-flipped.less similarity index 100% rename from roundware/rw/static/dashboard/font-awesome/less/rotated-flipped.less rename to src/roundware/rw/static/dashboard/font-awesome/less/rotated-flipped.less diff --git a/roundware/rw/static/dashboard/font-awesome/less/spinning.less b/src/roundware/rw/static/dashboard/font-awesome/less/spinning.less similarity index 100% rename from roundware/rw/static/dashboard/font-awesome/less/spinning.less rename to src/roundware/rw/static/dashboard/font-awesome/less/spinning.less diff --git a/roundware/rw/static/dashboard/font-awesome/less/stacked.less b/src/roundware/rw/static/dashboard/font-awesome/less/stacked.less similarity index 100% rename from roundware/rw/static/dashboard/font-awesome/less/stacked.less rename to src/roundware/rw/static/dashboard/font-awesome/less/stacked.less diff --git a/roundware/rw/static/dashboard/font-awesome/less/variables.less b/src/roundware/rw/static/dashboard/font-awesome/less/variables.less similarity index 100% rename from roundware/rw/static/dashboard/font-awesome/less/variables.less rename to src/roundware/rw/static/dashboard/font-awesome/less/variables.less diff --git a/roundware/rw/static/dashboard/font-awesome/scss/_bordered-pulled.scss b/src/roundware/rw/static/dashboard/font-awesome/scss/_bordered-pulled.scss similarity index 100% rename from roundware/rw/static/dashboard/font-awesome/scss/_bordered-pulled.scss rename to src/roundware/rw/static/dashboard/font-awesome/scss/_bordered-pulled.scss diff --git a/roundware/rw/static/dashboard/font-awesome/scss/_core.scss b/src/roundware/rw/static/dashboard/font-awesome/scss/_core.scss similarity index 100% rename from roundware/rw/static/dashboard/font-awesome/scss/_core.scss rename to src/roundware/rw/static/dashboard/font-awesome/scss/_core.scss diff --git a/roundware/rw/static/dashboard/font-awesome/scss/_fixed-width.scss b/src/roundware/rw/static/dashboard/font-awesome/scss/_fixed-width.scss similarity index 100% rename from roundware/rw/static/dashboard/font-awesome/scss/_fixed-width.scss rename to src/roundware/rw/static/dashboard/font-awesome/scss/_fixed-width.scss diff --git a/roundware/rw/static/dashboard/font-awesome/scss/_icons.scss b/src/roundware/rw/static/dashboard/font-awesome/scss/_icons.scss similarity index 100% rename from roundware/rw/static/dashboard/font-awesome/scss/_icons.scss rename to src/roundware/rw/static/dashboard/font-awesome/scss/_icons.scss diff --git a/roundware/rw/static/dashboard/font-awesome/scss/_larger.scss b/src/roundware/rw/static/dashboard/font-awesome/scss/_larger.scss similarity index 100% rename from roundware/rw/static/dashboard/font-awesome/scss/_larger.scss rename to src/roundware/rw/static/dashboard/font-awesome/scss/_larger.scss diff --git a/roundware/rw/static/dashboard/font-awesome/scss/_list.scss b/src/roundware/rw/static/dashboard/font-awesome/scss/_list.scss similarity index 100% rename from roundware/rw/static/dashboard/font-awesome/scss/_list.scss rename to src/roundware/rw/static/dashboard/font-awesome/scss/_list.scss diff --git a/roundware/rw/static/dashboard/font-awesome/scss/_mixins.scss b/src/roundware/rw/static/dashboard/font-awesome/scss/_mixins.scss similarity index 100% rename from roundware/rw/static/dashboard/font-awesome/scss/_mixins.scss rename to src/roundware/rw/static/dashboard/font-awesome/scss/_mixins.scss diff --git a/roundware/rw/static/dashboard/font-awesome/scss/_path.scss b/src/roundware/rw/static/dashboard/font-awesome/scss/_path.scss similarity index 100% rename from roundware/rw/static/dashboard/font-awesome/scss/_path.scss rename to src/roundware/rw/static/dashboard/font-awesome/scss/_path.scss diff --git a/roundware/rw/static/dashboard/font-awesome/scss/_rotated-flipped.scss b/src/roundware/rw/static/dashboard/font-awesome/scss/_rotated-flipped.scss similarity index 100% rename from roundware/rw/static/dashboard/font-awesome/scss/_rotated-flipped.scss rename to src/roundware/rw/static/dashboard/font-awesome/scss/_rotated-flipped.scss diff --git a/roundware/rw/static/dashboard/font-awesome/scss/_spinning.scss b/src/roundware/rw/static/dashboard/font-awesome/scss/_spinning.scss similarity index 100% rename from roundware/rw/static/dashboard/font-awesome/scss/_spinning.scss rename to src/roundware/rw/static/dashboard/font-awesome/scss/_spinning.scss diff --git a/roundware/rw/static/dashboard/font-awesome/scss/_stacked.scss b/src/roundware/rw/static/dashboard/font-awesome/scss/_stacked.scss similarity index 100% rename from roundware/rw/static/dashboard/font-awesome/scss/_stacked.scss rename to src/roundware/rw/static/dashboard/font-awesome/scss/_stacked.scss diff --git a/roundware/rw/static/dashboard/font-awesome/scss/_variables.scss b/src/roundware/rw/static/dashboard/font-awesome/scss/_variables.scss similarity index 100% rename from roundware/rw/static/dashboard/font-awesome/scss/_variables.scss rename to src/roundware/rw/static/dashboard/font-awesome/scss/_variables.scss diff --git a/roundware/rw/static/dashboard/font-awesome/scss/font-awesome.scss b/src/roundware/rw/static/dashboard/font-awesome/scss/font-awesome.scss similarity index 100% rename from roundware/rw/static/dashboard/font-awesome/scss/font-awesome.scss rename to src/roundware/rw/static/dashboard/font-awesome/scss/font-awesome.scss diff --git a/roundware/rw/static/dashboard/fonts/glyphicons-halflings-regular.eot b/src/roundware/rw/static/dashboard/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from roundware/rw/static/dashboard/fonts/glyphicons-halflings-regular.eot rename to src/roundware/rw/static/dashboard/fonts/glyphicons-halflings-regular.eot diff --git a/roundware/rw/static/dashboard/fonts/glyphicons-halflings-regular.svg b/src/roundware/rw/static/dashboard/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from roundware/rw/static/dashboard/fonts/glyphicons-halflings-regular.svg rename to src/roundware/rw/static/dashboard/fonts/glyphicons-halflings-regular.svg diff --git a/roundware/rw/static/dashboard/fonts/glyphicons-halflings-regular.ttf b/src/roundware/rw/static/dashboard/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from roundware/rw/static/dashboard/fonts/glyphicons-halflings-regular.ttf rename to src/roundware/rw/static/dashboard/fonts/glyphicons-halflings-regular.ttf diff --git a/roundware/rw/static/dashboard/fonts/glyphicons-halflings-regular.woff b/src/roundware/rw/static/dashboard/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from roundware/rw/static/dashboard/fonts/glyphicons-halflings-regular.woff rename to src/roundware/rw/static/dashboard/fonts/glyphicons-halflings-regular.woff diff --git a/roundware/rw/static/dashboard/images/ajax-loader.gif b/src/roundware/rw/static/dashboard/images/ajax-loader.gif similarity index 100% rename from roundware/rw/static/dashboard/images/ajax-loader.gif rename to src/roundware/rw/static/dashboard/images/ajax-loader.gif diff --git a/roundware/rw/static/dashboard/index.html b/src/roundware/rw/static/dashboard/index.html similarity index 100% rename from roundware/rw/static/dashboard/index.html rename to src/roundware/rw/static/dashboard/index.html diff --git a/roundware/rw/static/dashboard/js/Jplayer.swf b/src/roundware/rw/static/dashboard/js/Jplayer.swf similarity index 100% rename from roundware/rw/static/dashboard/js/Jplayer.swf rename to src/roundware/rw/static/dashboard/js/Jplayer.swf diff --git a/roundware/rw/static/dashboard/js/bootstrap.js b/src/roundware/rw/static/dashboard/js/bootstrap.js similarity index 100% rename from roundware/rw/static/dashboard/js/bootstrap.js rename to src/roundware/rw/static/dashboard/js/bootstrap.js diff --git a/roundware/rw/static/dashboard/js/bootstrap.min.js b/src/roundware/rw/static/dashboard/js/bootstrap.min.js similarity index 100% rename from roundware/rw/static/dashboard/js/bootstrap.min.js rename to src/roundware/rw/static/dashboard/js/bootstrap.min.js diff --git a/roundware/rw/static/dashboard/js/demo/dashboard-demo.js b/src/roundware/rw/static/dashboard/js/demo/dashboard-demo.js similarity index 100% rename from roundware/rw/static/dashboard/js/demo/dashboard-demo.js rename to src/roundware/rw/static/dashboard/js/demo/dashboard-demo.js diff --git a/roundware/rw/static/dashboard/js/demo/flot-demo.js b/src/roundware/rw/static/dashboard/js/demo/flot-demo.js similarity index 100% rename from roundware/rw/static/dashboard/js/demo/flot-demo.js rename to src/roundware/rw/static/dashboard/js/demo/flot-demo.js diff --git a/roundware/rw/static/dashboard/js/demo/morris-demo.js b/src/roundware/rw/static/dashboard/js/demo/morris-demo.js similarity index 100% rename from roundware/rw/static/dashboard/js/demo/morris-demo.js rename to src/roundware/rw/static/dashboard/js/demo/morris-demo.js diff --git a/roundware/rw/static/dashboard/js/jquery-1.10.2.js b/src/roundware/rw/static/dashboard/js/jquery-1.10.2.js similarity index 100% rename from roundware/rw/static/dashboard/js/jquery-1.10.2.js rename to src/roundware/rw/static/dashboard/js/jquery-1.10.2.js diff --git a/roundware/rw/static/dashboard/js/plugins/dataTables/dataTables.bootstrap.js b/src/roundware/rw/static/dashboard/js/plugins/dataTables/dataTables.bootstrap.js similarity index 100% rename from roundware/rw/static/dashboard/js/plugins/dataTables/dataTables.bootstrap.js rename to src/roundware/rw/static/dashboard/js/plugins/dataTables/dataTables.bootstrap.js diff --git a/roundware/rw/static/dashboard/js/plugins/dataTables/jquery.dataTables.js b/src/roundware/rw/static/dashboard/js/plugins/dataTables/jquery.dataTables.js similarity index 100% rename from roundware/rw/static/dashboard/js/plugins/dataTables/jquery.dataTables.js rename to src/roundware/rw/static/dashboard/js/plugins/dataTables/jquery.dataTables.js diff --git a/roundware/rw/static/dashboard/js/plugins/flot/excanvas.min.js b/src/roundware/rw/static/dashboard/js/plugins/flot/excanvas.min.js similarity index 100% rename from roundware/rw/static/dashboard/js/plugins/flot/excanvas.min.js rename to src/roundware/rw/static/dashboard/js/plugins/flot/excanvas.min.js diff --git a/roundware/rw/static/dashboard/js/plugins/flot/jquery.flot.js b/src/roundware/rw/static/dashboard/js/plugins/flot/jquery.flot.js similarity index 100% rename from roundware/rw/static/dashboard/js/plugins/flot/jquery.flot.js rename to src/roundware/rw/static/dashboard/js/plugins/flot/jquery.flot.js diff --git a/roundware/rw/static/dashboard/js/plugins/flot/jquery.flot.pie.js b/src/roundware/rw/static/dashboard/js/plugins/flot/jquery.flot.pie.js similarity index 100% rename from roundware/rw/static/dashboard/js/plugins/flot/jquery.flot.pie.js rename to src/roundware/rw/static/dashboard/js/plugins/flot/jquery.flot.pie.js diff --git a/roundware/rw/static/dashboard/js/plugins/flot/jquery.flot.resize.js b/src/roundware/rw/static/dashboard/js/plugins/flot/jquery.flot.resize.js similarity index 100% rename from roundware/rw/static/dashboard/js/plugins/flot/jquery.flot.resize.js rename to src/roundware/rw/static/dashboard/js/plugins/flot/jquery.flot.resize.js diff --git a/roundware/rw/static/dashboard/js/plugins/flot/jquery.flot.tooltip.min.js b/src/roundware/rw/static/dashboard/js/plugins/flot/jquery.flot.tooltip.min.js similarity index 100% rename from roundware/rw/static/dashboard/js/plugins/flot/jquery.flot.tooltip.min.js rename to src/roundware/rw/static/dashboard/js/plugins/flot/jquery.flot.tooltip.min.js diff --git a/roundware/rw/static/dashboard/js/plugins/metisMenu/jquery.metisMenu.js b/src/roundware/rw/static/dashboard/js/plugins/metisMenu/jquery.metisMenu.js similarity index 100% rename from roundware/rw/static/dashboard/js/plugins/metisMenu/jquery.metisMenu.js rename to src/roundware/rw/static/dashboard/js/plugins/metisMenu/jquery.metisMenu.js diff --git a/roundware/rw/static/dashboard/js/plugins/morris/morris.js b/src/roundware/rw/static/dashboard/js/plugins/morris/morris.js similarity index 100% rename from roundware/rw/static/dashboard/js/plugins/morris/morris.js rename to src/roundware/rw/static/dashboard/js/plugins/morris/morris.js diff --git a/roundware/rw/static/dashboard/js/plugins/morris/raphael-2.1.0.min.js b/src/roundware/rw/static/dashboard/js/plugins/morris/raphael-2.1.0.min.js similarity index 100% rename from roundware/rw/static/dashboard/js/plugins/morris/raphael-2.1.0.min.js rename to src/roundware/rw/static/dashboard/js/plugins/morris/raphael-2.1.0.min.js diff --git a/roundware/rw/static/dashboard/js/rw.js b/src/roundware/rw/static/dashboard/js/rw.js similarity index 100% rename from roundware/rw/static/dashboard/js/rw.js rename to src/roundware/rw/static/dashboard/js/rw.js diff --git a/roundware/rw/static/dashboard/js/sb-admin.js b/src/roundware/rw/static/dashboard/js/sb-admin.js similarity index 100% rename from roundware/rw/static/dashboard/js/sb-admin.js rename to src/roundware/rw/static/dashboard/js/sb-admin.js diff --git a/roundware/rw/static/dashboard/listen-map-dash.html b/src/roundware/rw/static/dashboard/listen-map-dash.html similarity index 100% rename from roundware/rw/static/dashboard/listen-map-dash.html rename to src/roundware/rw/static/dashboard/listen-map-dash.html diff --git a/roundware/rw/static/dashboard/morris.html b/src/roundware/rw/static/dashboard/morris.html similarity index 100% rename from roundware/rw/static/dashboard/morris.html rename to src/roundware/rw/static/dashboard/morris.html diff --git a/roundware/rw/static/dashboard/panels-wells.html b/src/roundware/rw/static/dashboard/panels-wells.html similarity index 100% rename from roundware/rw/static/dashboard/panels-wells.html rename to src/roundware/rw/static/dashboard/panels-wells.html diff --git a/roundware/rw/static/dashboard/session-map.html b/src/roundware/rw/static/dashboard/session-map.html similarity index 100% rename from roundware/rw/static/dashboard/session-map.html rename to src/roundware/rw/static/dashboard/session-map.html diff --git a/roundware/rw/static/dashboard/tables.html b/src/roundware/rw/static/dashboard/tables.html similarity index 100% rename from roundware/rw/static/dashboard/tables.html rename to src/roundware/rw/static/dashboard/tables.html diff --git a/roundware/rw/static/dashboard/typography.html b/src/roundware/rw/static/dashboard/typography.html similarity index 100% rename from roundware/rw/static/dashboard/typography.html rename to src/roundware/rw/static/dashboard/typography.html diff --git a/roundware/rw/static/rw/css/asset_admin.css b/src/roundware/rw/static/rw/css/asset_admin.css similarity index 100% rename from roundware/rw/static/rw/css/asset_admin.css rename to src/roundware/rw/static/rw/css/asset_admin.css diff --git a/roundware/rw/static/rw/css/envelope_admin.css b/src/roundware/rw/static/rw/css/envelope_admin.css similarity index 100% rename from roundware/rw/static/rw/css/envelope_admin.css rename to src/roundware/rw/static/rw/css/envelope_admin.css diff --git a/roundware/rw/static/rw/css/jplayer.blue.monday.css b/src/roundware/rw/static/rw/css/jplayer.blue.monday.css similarity index 100% rename from roundware/rw/static/rw/css/jplayer.blue.monday.css rename to src/roundware/rw/static/rw/css/jplayer.blue.monday.css diff --git a/roundware/rw/static/rw/css/jplayer.blue.monday.jpg b/src/roundware/rw/static/rw/css/jplayer.blue.monday.jpg similarity index 100% rename from roundware/rw/static/rw/css/jplayer.blue.monday.jpg rename to src/roundware/rw/static/rw/css/jplayer.blue.monday.jpg diff --git a/roundware/rw/static/rw/css/rw_admin.css b/src/roundware/rw/static/rw/css/rw_admin.css similarity index 100% rename from roundware/rw/static/rw/css/rw_admin.css rename to src/roundware/rw/static/rw/css/rw_admin.css diff --git a/roundware/rw/static/rw/css/setup_tag_ui.css b/src/roundware/rw/static/rw/css/setup_tag_ui.css similarity index 100% rename from roundware/rw/static/rw/css/setup_tag_ui.css rename to src/roundware/rw/static/rw/css/setup_tag_ui.css diff --git a/roundware/rw/static/rw/css/tag_batch_add.css b/src/roundware/rw/static/rw/css/tag_batch_add.css similarity index 100% rename from roundware/rw/static/rw/css/tag_batch_add.css rename to src/roundware/rw/static/rw/css/tag_batch_add.css diff --git a/roundware/rw/static/rw/img/resize-off.png b/src/roundware/rw/static/rw/img/resize-off.png similarity index 100% rename from roundware/rw/static/rw/img/resize-off.png rename to src/roundware/rw/static/rw/img/resize-off.png diff --git a/roundware/rw/static/rw/img/resize.png b/src/roundware/rw/static/rw/img/resize.png similarity index 100% rename from roundware/rw/static/rw/img/resize.png rename to src/roundware/rw/static/rw/img/resize.png diff --git a/roundware/rw/static/rw/js/Jplayer.swf b/src/roundware/rw/static/rw/js/Jplayer.swf similarity index 100% rename from roundware/rw/static/rw/js/Jplayer.swf rename to src/roundware/rw/static/rw/js/Jplayer.swf diff --git a/roundware/rw/static/rw/js/add-on/jplayer.playlist.min.js b/src/roundware/rw/static/rw/js/add-on/jplayer.playlist.min.js similarity index 100% rename from roundware/rw/static/rw/js/add-on/jplayer.playlist.min.js rename to src/roundware/rw/static/rw/js/add-on/jplayer.playlist.min.js diff --git a/roundware/rw/static/rw/js/add-on/jquery.jplayer.inspector.js b/src/roundware/rw/static/rw/js/add-on/jquery.jplayer.inspector.js similarity index 100% rename from roundware/rw/static/rw/js/add-on/jquery.jplayer.inspector.js rename to src/roundware/rw/static/rw/js/add-on/jquery.jplayer.inspector.js diff --git a/roundware/rw/static/rw/js/asset_admin.js b/src/roundware/rw/static/rw/js/asset_admin.js similarity index 100% rename from roundware/rw/static/rw/js/asset_admin.js rename to src/roundware/rw/static/rw/js/asset_admin.js diff --git a/roundware/rw/static/rw/js/audio.js b/src/roundware/rw/static/rw/js/audio.js similarity index 100% rename from roundware/rw/static/rw/js/audio.js rename to src/roundware/rw/static/rw/js/audio.js diff --git a/roundware/rw/static/rw/js/envelope_admin.js b/src/roundware/rw/static/rw/js/envelope_admin.js similarity index 100% rename from roundware/rw/static/rw/js/envelope_admin.js rename to src/roundware/rw/static/rw/js/envelope_admin.js diff --git a/roundware/rw/static/rw/js/jquery.formset.min.js b/src/roundware/rw/static/rw/js/jquery.formset.min.js similarity index 100% rename from roundware/rw/static/rw/js/jquery.formset.min.js rename to src/roundware/rw/static/rw/js/jquery.formset.min.js diff --git a/roundware/rw/static/rw/js/jquery.jplayer.min.js b/src/roundware/rw/static/rw/js/jquery.jplayer.min.js similarity index 100% rename from roundware/rw/static/rw/js/jquery.jplayer.min.js rename to src/roundware/rw/static/rw/js/jquery.jplayer.min.js diff --git a/roundware/rw/static/rw/js/location_map.js b/src/roundware/rw/static/rw/js/location_map.js similarity index 100% rename from roundware/rw/static/rw/js/location_map.js rename to src/roundware/rw/static/rw/js/location_map.js diff --git a/roundware/rw/static/rw/js/setup_tag_ui.js b/src/roundware/rw/static/rw/js/setup_tag_ui.js similarity index 100% rename from roundware/rw/static/rw/js/setup_tag_ui.js rename to src/roundware/rw/static/rw/js/setup_tag_ui.js diff --git a/roundware/rw/static/rw/js/sortedmulticheckbox_widget.js b/src/roundware/rw/static/rw/js/sortedmulticheckbox_widget.js similarity index 100% rename from roundware/rw/static/rw/js/sortedmulticheckbox_widget.js rename to src/roundware/rw/static/rw/js/sortedmulticheckbox_widget.js diff --git a/roundware/rw/static/tools/css/asset-map.css b/src/roundware/rw/static/tools/css/asset-map.css similarity index 100% rename from roundware/rw/static/tools/css/asset-map.css rename to src/roundware/rw/static/tools/css/asset-map.css diff --git a/roundware/rw/static/tools/css/listen-map.css b/src/roundware/rw/static/tools/css/listen-map.css similarity index 100% rename from roundware/rw/static/tools/css/listen-map.css rename to src/roundware/rw/static/tools/css/listen-map.css diff --git a/roundware/rw/static/tools/gis/bay_water.geojson b/src/roundware/rw/static/tools/gis/bay_water.geojson similarity index 100% rename from roundware/rw/static/tools/gis/bay_water.geojson rename to src/roundware/rw/static/tools/gis/bay_water.geojson diff --git a/roundware/rw/static/tools/img/ajax-loader.gif b/src/roundware/rw/static/tools/img/ajax-loader.gif similarity index 100% rename from roundware/rw/static/tools/img/ajax-loader.gif rename to src/roundware/rw/static/tools/img/ajax-loader.gif diff --git a/roundware/rw/static/tools/js/Jplayer.swf b/src/roundware/rw/static/tools/js/Jplayer.swf similarity index 100% rename from roundware/rw/static/tools/js/Jplayer.swf rename to src/roundware/rw/static/tools/js/Jplayer.swf diff --git a/roundware/rw/static/tools/js/jquery.jplayer.min.js b/src/roundware/rw/static/tools/js/jquery.jplayer.min.js similarity index 100% rename from roundware/rw/static/tools/js/jquery.jplayer.min.js rename to src/roundware/rw/static/tools/js/jquery.jplayer.min.js diff --git a/roundware/rw/static/tools/js/listen-map.js b/src/roundware/rw/static/tools/js/listen-map.js similarity index 100% rename from roundware/rw/static/tools/js/listen-map.js rename to src/roundware/rw/static/tools/js/listen-map.js diff --git a/roundware/rw/templates/admin/asset_change_form.html b/src/roundware/rw/templates/admin/asset_change_form.html similarity index 100% rename from roundware/rw/templates/admin/asset_change_form.html rename to src/roundware/rw/templates/admin/asset_change_form.html diff --git a/roundware/rw/templates/admin/base_site.html b/src/roundware/rw/templates/admin/base_site.html similarity index 100% rename from roundware/rw/templates/admin/base_site.html rename to src/roundware/rw/templates/admin/base_site.html diff --git a/roundware/rw/templates/admin/tag_change_list.html b/src/roundware/rw/templates/admin/tag_change_list.html similarity index 100% rename from roundware/rw/templates/admin/tag_change_list.html rename to src/roundware/rw/templates/admin/tag_change_list.html diff --git a/roundware/rw/templates/rw/404.html b/src/roundware/rw/templates/rw/404.html similarity index 100% rename from roundware/rw/templates/rw/404.html rename to src/roundware/rw/templates/rw/404.html diff --git a/roundware/rw/templates/rw/chart_template.html b/src/roundware/rw/templates/rw/chart_template.html similarity index 100% rename from roundware/rw/templates/rw/chart_template.html rename to src/roundware/rw/templates/rw/chart_template.html diff --git a/roundware/rw/templates/rw/setup_tag_ui_form.html b/src/roundware/rw/templates/rw/setup_tag_ui_form.html similarity index 100% rename from roundware/rw/templates/rw/setup_tag_ui_form.html rename to src/roundware/rw/templates/rw/setup_tag_ui_form.html diff --git a/roundware/rw/templates/rw/setup_tags_ui_edit_form.html b/src/roundware/rw/templates/rw/setup_tags_ui_edit_form.html similarity index 100% rename from roundware/rw/templates/rw/setup_tags_ui_edit_form.html rename to src/roundware/rw/templates/rw/setup_tags_ui_edit_form.html diff --git a/roundware/rw/templates/rw/tags_add_to_category_form.html b/src/roundware/rw/templates/rw/tags_add_to_category_form.html similarity index 100% rename from roundware/rw/templates/rw/tags_add_to_category_form.html rename to src/roundware/rw/templates/rw/tags_add_to_category_form.html diff --git a/roundware/rw/templates/sortedm2m/sorted_checkbox_select_multiple_widget.html b/src/roundware/rw/templates/sortedm2m/sorted_checkbox_select_multiple_widget.html similarity index 100% rename from roundware/rw/templates/sortedm2m/sorted_checkbox_select_multiple_widget.html rename to src/roundware/rw/templates/sortedm2m/sorted_checkbox_select_multiple_widget.html diff --git a/roundware/rw/templates/tools/asset-map.html b/src/roundware/rw/templates/tools/asset-map.html similarity index 100% rename from roundware/rw/templates/tools/asset-map.html rename to src/roundware/rw/templates/tools/asset-map.html diff --git a/roundware/rw/templates/tools/listen-map.html b/src/roundware/rw/templates/tools/listen-map.html similarity index 100% rename from roundware/rw/templates/tools/listen-map.html rename to src/roundware/rw/templates/tools/listen-map.html diff --git a/roundware/rw/migrations/__init__.py b/src/roundware/rw/tests/__init__.py similarity index 100% rename from roundware/rw/migrations/__init__.py rename to src/roundware/rw/tests/__init__.py diff --git a/roundware/rw/tests/common.py b/src/roundware/rw/tests/common.py similarity index 100% rename from roundware/rw/tests/common.py rename to src/roundware/rw/tests/common.py diff --git a/roundware/rw/tests/test_admin.py b/src/roundware/rw/tests/test_admin.py similarity index 100% rename from roundware/rw/tests/test_admin.py rename to src/roundware/rw/tests/test_admin.py diff --git a/roundware/rw/tests/test_models.py b/src/roundware/rw/tests/test_models.py similarity index 96% rename from roundware/rw/tests/test_models.py rename to src/roundware/rw/tests/test_models.py index c6e74019..3cbc0a09 100644 --- a/roundware/rw/tests/test_models.py +++ b/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 b/src/roundware/rw/urls.py similarity index 100% rename from roundware/rw/urls.py rename to src/roundware/rw/urls.py diff --git a/roundware/rw/views.py b/src/roundware/rw/views.py similarity index 100% rename from roundware/rw/views.py rename to src/roundware/rw/views.py diff --git a/roundware/rw/widgets.py b/src/roundware/rw/widgets.py similarity index 100% rename from roundware/rw/widgets.py rename to src/roundware/rw/widgets.py diff --git a/roundware/settings/__init__.py b/src/roundware/settings/__init__.py similarity index 100% rename from roundware/settings/__init__.py rename to src/roundware/settings/__init__.py diff --git a/roundware/settings/common.py b/src/roundware/settings/common.py similarity index 100% rename from roundware/settings/common.py rename to src/roundware/settings/common.py diff --git a/roundware/settings/dev.py b/src/roundware/settings/dev.py similarity index 100% rename from roundware/settings/dev.py rename to src/roundware/settings/dev.py diff --git a/roundware/settings/testing.py b/src/roundware/settings/testing.py similarity index 100% rename from roundware/settings/testing.py rename to src/roundware/settings/testing.py diff --git a/roundware/urls.py b/src/roundware/urls.py similarity index 100% rename from roundware/urls.py rename to src/roundware/urls.py diff --git a/roundware/wsgi.py b/src/roundware/wsgi.py similarity index 100% rename from roundware/wsgi.py rename to src/roundware/wsgi.py