remove mkt occurences from Makefile, and split targets

Makefile

@@ -2,7 +2,7 @@
 DJANGO = python manage.py
 SETTINGS = settings_local
 
-.PHONY: help docs test test_force_db tdd test_failed update update_landfill reindex reindex_mkt
+.PHONY: help docs test test_force_db tdd test_failed update_code update_deps update_db update_landfill full_update reindex
 
 help:
 	@echo "Please use \`make <target>' where <target> is one of"
@@ -11,13 +11,15 @@ help:
 	@echo "  test_force_db    to run all the test suite with a new database"
 	@echo "  tdd              to run all the test suite, but stop on the first error"
 	@echo "  test_failed      to rerun the failed tests from the previous run"
-	@echo "  update           to run a full update (git, pip, schematic, landfill)"
-	@echo "  update_mkt       to run a full update of zamboni, plus any Commonplace projects"
+	@echo "  update_code      to update the git repository and submodules"
+	@echo "  update_deps      to update the python and npm dependencies"
+	@echo "  update_db        to run the database migrations"
+	@echo "  full_update      to update the code, the dependencies and the database"
+	@echo "  update_landfill  to load the landfill database data"
 	@echo "  reindex          to reindex everything in elasticsearch, for AMO"
-	@echo "  reindex_mkt      to reindex everything in elasticsearch, for marketplace"
 	@echo "Check the Makefile to know exactly what each target is doing. If you see a "
 	@echo "target using something like $(SETTINGS), you can make it use another value:"
-	@echo "  make SETTINGS=settings_mkt docs"
+	@echo "  make SETTINGS=settings_mine docs"
 
 docs:
 	$(MAKE) -C docs html
@@ -34,21 +36,21 @@ tdd:
 test_failed:
 	$(DJANGO) test --settings=$(SETTINGS) --noinput --logging-clear-handlers --with-id --failed $(ARGS)
 
-update:
+update_code:
 	git checkout master && git pull && git submodule update --init --recursive
-	pushd vendor && git pull && git submodule update --init && popd
+	cd vendor && git pull && git submodule update --init && cd -
+
+update_deps:
 	pip install --no-deps --exists-action=w --download-cache=/tmp/pip-cache -r requirements/dev.txt --find-links https://pyrepo.addons.mozilla.org/ --allow-external PIL --allow-unverified PIL
-	schematic migrations
 	npm install
 
-update_mkt: update
-	commonplace fiddle
+update_db:
+	schematic migrations
 
-update_landfill: update
+full_update: update_code update_deps update_db
+
+update_landfill:
 	$(DJANGO) install_landfill --settings=$(SETTINGS) $(ARGS)
 
 reindex:
 	$(DJANGO) reindex --settings=$(SETTINGS) $(ARGS)
-
-reindex_mkt:
-	$(DJANGO) reindex_mkt --settings=$(SETTINGS) $(ARGS)

docs/topics/hacking/testing.rst

@@ -58,7 +58,7 @@ To fail and stop running tests on the first failure::
 If you wish to add arguments, or run a specific test, overload the variables
 (check the Makefile for more information)::
 
-    make SETTINGS=settings_mkt ARGS='--verbosity 2 olympia.apps.amo.tests.test_url_prefix:MiddlewareTest.test_get_app' test
+    make SETTINGS=settings_test ARGS='--verbosity 2 olympia.apps.amo.tests.test_url_prefix:MiddlewareTest.test_get_app' test
 
 Those targets include some useful options, like the ``--with-id`` which allows
 you to re-run only the tests failed from the previous run::

docs/topics/install-olympia/installation.rst

@@ -369,7 +369,7 @@ Updating
 To run a full update of olympia (including source files, pip requirements and
 database migrations)::
 
-    make update
+    make full_update
 
 Use the following if you also wish to prefill your database with the data from
 landfill::