Move sites/sandbox/ to the root directory.

Since there is no demo or us site anymore we can simplify the structure
somewhat by moving the sandbox one directory up

.gitignore

@@ -38,19 +38,10 @@ nosetests.xml
 /htmlcov/*
 /.tox/*
 
-# Example sites
+# Sandbox content
 settings_local.py
-/sites/sandbox/*.sqlite
-/sites/sandbox/assets/
-/sites/sandbox/public/
-/sites/sandbox/whoosh_index/
-/sites/sandbox/logs/
-/sites/demo/*.sqlite
-/sites/demo/assets/
-/sites/demo/public/
-/sites/demo/whoosh_index/
-/sites/demo/logs/
-/sites/us/*.sqlite
-/sites/us/public/
-/sites/us/logs/
-sites/puppet/modules/
+/sandbox/*.sqlite
+/sandbox/assets/
+/sandbox/public/
+/sandbox/whoosh_index/
+/sandbox/logs/

Dockerfile

@@ -2,7 +2,7 @@ FROM python:3.5
 ENV PYTHONUNBUFFERED 1
 
 COPY ./requirements.txt /requirements.txt
-RUN pip3 install -r /requirements.txt psycopg2 raven==5.23.0
+RUN pip3 install -r /requirements.txt psycopg2 raven==5.32.0
 
 RUN groupadd -r django && useradd -r -g django django
 COPY . /app
@@ -17,6 +17,6 @@ USER django
 
 RUN make build_sandbox
 
-RUN cp --remove-destination /app/src/oscar/static/oscar/img/image_not_found.jpg /app/sites/sandbox/public/media/
+RUN cp --remove-destination /app/src/oscar/static/oscar/img/image_not_found.jpg /app/sandbox/public/media/
 
-CMD uwsgi --ini /app/sites/sandbox/uwsgi.ini
+CMD uwsgi --ini /app/sandbox/uwsgi.ini

Makefile

@@ -7,22 +7,22 @@ install:
 
 build_sandbox:
 	# Remove media
-	-rm -rf sites/sandbox/public/media/images
-	-rm -rf sites/sandbox/public/media/cache
-	-rm -rf sites/sandbox/public/static
-	-rm -f sites/sandbox/db.sqlite
+	-rm -rf sandbox/public/media/images
+	-rm -rf sandbox/public/media/cache
+	-rm -rf sandbox/public/static
+	-rm -f sandbox/db.sqlite
 	# Create database
-	sites/sandbox/manage.py migrate
+	sandbox/manage.py migrate
 	# Import some fixtures. Order is important as JSON fixtures include primary keys
-	sites/sandbox/manage.py loaddata sites/sandbox/fixtures/child_products.json
-	sites/sandbox/manage.py oscar_import_catalogue sites/sandbox/fixtures/*.csv
-	sites/sandbox/manage.py oscar_import_catalogue_images sites/sandbox/fixtures/images.tar.gz
-	sites/sandbox/manage.py oscar_populate_countries --initial-only
-	sites/sandbox/manage.py loaddata sites/_fixtures/pages.json sites/_fixtures/auth.json sites/_fixtures/ranges.json sites/_fixtures/offers.json
-	sites/sandbox/manage.py loaddata sites/sandbox/fixtures/orders.json
-	sites/sandbox/manage.py clear_index --noinput
-	sites/sandbox/manage.py update_index catalogue
-	sites/sandbox/manage.py thumbnail cleanup
+	sandbox/manage.py loaddata sandbox/fixtures/child_products.json
+	sandbox/manage.py oscar_import_catalogue sandbox/fixtures/*.csv
+	sandbox/manage.py oscar_import_catalogue_images sandbox/fixtures/images.tar.gz
+	sandbox/manage.py oscar_populate_countries --initial-only
+	sandbox/manage.py loaddata sandbox/fixtures/pages.json sandbox/fixtures/auth.json sandbox/fixtures/ranges.json sandbox/fixtures/offers.json
+	sandbox/manage.py loaddata sandbox/fixtures/orders.json
+	sandbox/manage.py clear_index --noinput
+	sandbox/manage.py update_index catalogue
+	sandbox/manage.py thumbnail cleanup
 
 sandbox: install build_sandbox
 
@@ -44,7 +44,7 @@ lint:
 
 testmigrations:
 	pip install -r requirements_migrations.txt
-	cd sites/sandbox && ./test_migrations.sh
+	cd sandbox && ./test_migrations.sh
 
 messages:
 	# Create the .po files used for i18n

docs/source/internals/sandbox.rst

@@ -60,7 +60,7 @@ Install Oscar and its dependencies within a virtualenv:
     $ cd django-oscar
     $ mkvirtualenv oscar  # needs virtualenvwrapper
     (oscar) $ make sandbox
-    (oscar) $ sites/sandbox/manage.py runserver
+    (oscar) $ sandbox/manage.py runserver
 
 .. warning::
     

docs/source/topics/deploying.rst

@@ -44,7 +44,7 @@ Search Engine Optimisation
 --------------------------
 
 A basic example of what a sitemap for Oscar could look like has been added
-to the sandbox site. Have a look at ``sites/sandbox/urls.py`` for inspiration.
+to the sandbox site. Have a look at ``sandbox/urls.py`` for inspiration.
 
 .. _deployment: https://docs.djangoproject.com/en/dev/howto/deployment/
 .. _`Django's guidelines for security`: https://docs.djangoproject.com/en/dev/topics/security/

sites/README.rst → sandbox/README.rst

@@ -1,11 +1,11 @@
-===========
-Oscar sites
-===========
+============
+Sandbox site
+============
 
-Oscar ships with two working Django projects that use Oscar:
+This site is deployed there:
 
-Sandbox
--------
+http://latest.oscarcommerce.com
+-------------------------------
 
 This is a vanilla install of Oscar with as little customisation as possible to
 get a basic site working.  It's really intended for local development and QA.
@@ -17,4 +17,4 @@ It does have a few customisations:
 * A profile model with a few fields, designed to test Oscar's account section
   which should automatically allow the profile fields to be edited.
 
-It is deployed hourly to: http://latest.oscarcommerce.com
+It is deployed automatically to: http://latest.oscarcommerce.com

sites/sandbox/README.rst

@@ -1,14 +0,0 @@
-============
-Sandbox site
-============
-
-This site is deployed there:
-
-http://latest.oscarcommerce.com
--------------------------------
-
-This site is used for testing the vanilla Oscar functionality, that is, Oscar
-without any customisation.  It is not a demo site for clients or potential Oscar
-users.  It is built automatically from the HEAD of the master branch every 20
-minutes.
-

sites/sandbox/update_latest.sh

@@ -1,41 +0,0 @@
-#!/usr/bin/env bash
-
-# Update to latest commit
-cd /var/www/oscar/builds/latest
-git pull --ff-only 2> /dev/null
-[ $? -gt 0 ] && echo "Git pull failed" >&2 && exit 1
-
-# Remove existing pyc files
-find . -type f -name "*.pyc" -delete
-
-# Update any dependencies
-source ../../virtualenvs/latest/bin/activate
-python setup.py develop
-pip install -r requirements.txt
-
-# Update sandbox database
-cd sites/sandbox
-./manage.py migrate
-
-# Rebuild statics
-./manage.py collectstatic --noinput
-./manage.py thumbnail clear
-
-# Load standard fixtures
-./manage.py loaddata ../_fixtures/promotions.json
-
-# Restart Tomcat (to pick up any Solr schema changes)
-/etc/init.d/tomcat7 restart
-
-# Re-compile python code
-touch deploy/wsgi/latest.wsgi
-
-# Copy down server config files
-cp deploy/nginx/latest.conf /etc/nginx/sites-enabled/latest.oscarcommerce.com
-/etc/init.d/nginx configtest 2> /dev/null && /etc/init.d/nginx force-reload 2> /dev/null
-
-cp deploy/supervisord/latest.conf /etc/supervisor/conf.d/latest.conf
-supervisorctl reread && supervisorctl reload
-
-# Copy down cronjob file
-cp deploy/cron.d/oscar /etc/cron.d/oscar-latest