From patchwork Mon Mar 14 13:17:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Finucane X-Patchwork-Id: 597029 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3qNyxj0gJ3z9sBf for ; Tue, 15 Mar 2016 00:18:49 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3qNyxh72cqzDqyN for ; Tue, 15 Mar 2016 00:18:48 +1100 (AEDT) X-Original-To: patchwork@lists.ozlabs.org Delivered-To: patchwork@lists.ozlabs.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lists.ozlabs.org (Postfix) with ESMTP id 3qNyxX62dxzDq6T for ; Tue, 15 Mar 2016 00:18:40 +1100 (AEDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP; 14 Mar 2016 06:17:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,335,1455004800"; d="scan'208";a="923625961" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga001.fm.intel.com with ESMTP; 14 Mar 2016 06:17:09 -0700 Received: from sivswdev01.ir.intel.com (sivswdev01.ir.intel.com [10.237.217.45]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id u2EDH8cY023499; Mon, 14 Mar 2016 13:17:08 GMT Received: from sivswdev01.ir.intel.com (localhost [127.0.0.1]) by sivswdev01.ir.intel.com with ESMTP id u2EDH8s7001731; Mon, 14 Mar 2016 13:17:08 GMT Received: (from sfinucan@localhost) by sivswdev01.ir.intel.com with id u2EDH80Y001707; Mon, 14 Mar 2016 13:17:08 GMT From: Stephen Finucane To: patchwork@lists.ozlabs.org Subject: [PATCH] docs: Refer to fixtures by name, not path Date: Mon, 14 Mar 2016 13:17:03 +0000 Message-Id: <1457961423-1488-1-git-send-email-stephen.finucane@intel.com> X-Mailer: git-send-email 2.0.0 X-BeenThere: patchwork@lists.ozlabs.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Patchwork development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: patchwork-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Patchwork" It's not necessary to use paths for fixtures, so update the docs and Vagrant install scripts to remove these. Signed-off-by: Stephen Finucane --- docs/development.md | 4 +--- tools/install/install.sh | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/docs/development.md b/docs/development.md index d69f42f..d48d048 100644 --- a/docs/development.md +++ b/docs/development.md @@ -183,9 +183,7 @@ fixtures provide. These can be loaded using the `loaddata` command: - (.venv)$ ./manage.py loaddata patchwork/fixtures/default_tags.xml - (.venv)$ ./manage.py loaddata patchwork/fixtures/default_states.xml - (.venv)$ ./manage.py loaddata patchwork/fixtures/default_projects.xml + (.venv)$ ./manage.py loaddata default_tags default_states default_projects You should also take the opportunity to create a "superuser". You can do this using the aptly-named `createsuperuser` command: diff --git a/tools/install/install.sh b/tools/install/install.sh index b2a074b..380acaf 100644 --- a/tools/install/install.sh +++ b/tools/install/install.sh @@ -45,11 +45,11 @@ echo -e "\n--- Loading initial data ---\n" sudo -E -u vagrant python3 $PROJECT_HOME/manage.py migrate > /dev/null sudo -E -u vagrant python3 $PROJECT_HOME/manage.py loaddata \ - $PROJECT_HOME/patchwork/fixtures/default_tags.xml > /dev/null + default_tags > /dev/null sudo -E -u vagrant python3 $PROJECT_HOME/manage.py loaddata \ - $PROJECT_HOME/patchwork/fixtures/default_states.xml > /dev/null + default_states > /dev/null sudo -E -u vagrant python3 $PROJECT_HOME/manage.py loaddata \ - $PROJECT_HOME/patchwork/fixtures/default_projects.xml > /dev/null + default_projects > /dev/null echo -e "\n--- Configuring environment ---\n"