From 66a901c48c18b47899c1ce132f0d17ca00283067 Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Thu, 14 May 2015 14:04:30 +0100 Subject: [PATCH] removed duplicated/out-of-date information about getting started using the demo site. this is now only in the actual wagtaildemo repo --- docs/contributing/developing.rst | 19 ++---- docs/contributing/index.rst | 1 + docs/contributing/python_guidelines.rst | 6 ++ docs/getting_started/demo_site.rst | 80 ++----------------------- 4 files changed, 17 insertions(+), 89 deletions(-) create mode 100644 docs/contributing/python_guidelines.rst diff --git a/docs/contributing/developing.rst b/docs/contributing/developing.rst index c70608ccf4..fdef61cf77 100644 --- a/docs/contributing/developing.rst +++ b/docs/contributing/developing.rst @@ -1,5 +1,5 @@ -Development environment ------------------------ +Development process +------------------- Using the demo site & Vagrant ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -28,19 +28,10 @@ Uncomment the lines from ``import sys`` onward, and edit the rest of ``local.py` If your VM is currently running, you'll then need to run ``vagrant halt`` followed by ``vagrant up`` for the changes to take effect. -Coding guidelines -~~~~~~~~~~~~~~~~~ - -* PEP8. We ask that all Python contributions adhere to the `PEP8 `_ style guide, apart from the restriction on line length (E501). The `pep8 tool `_ makes it easy to check your code, e.g. ``pep8 --ignore=E501 your_file.py``. -* Python 2 and 3 compatibility. All contributions should support Python 2 and 3 and we recommend using the `six `_ compatibility library (use the pip version installed as a dependency, not the version bundled with Django). -* Tests. Wagtail has a suite of tests, which we are committed to improving and expanding. We run continuous integration at `travis-ci.org/torchbox/wagtail `_ to ensure that no commits or pull requests introduce test failures. If your contributions add functionality to Wagtail, please include the additional tests to cover it; if your contributions alter existing functionality, please update the relevant tests accordingly. - - -Running the unit tests -~~~~~~~~~~~~~~~~~~~~~~ - -In order to run Wagtail's test suite, you will need to install some dependencies first. We recommend installing these into a virtual environment. +Unit tests +~~~~~~~~~~ +Wagtail has extensive tests which should be run before submitting pull requests. To run Wagtail's test suite you will need to install some dependencies. We recommend installing these into a virtual environment. **Setting up the virtual environment** diff --git a/docs/contributing/index.rst b/docs/contributing/index.rst index ed64f97103..76b0b61f91 100644 --- a/docs/contributing/index.rst +++ b/docs/contributing/index.rst @@ -32,5 +32,6 @@ We welcome contributions to all aspects of Wagtail. If you would like to improve developing styleguide + python_guidelines css_guidelines javascript_guidelines diff --git a/docs/contributing/python_guidelines.rst b/docs/contributing/python_guidelines.rst new file mode 100644 index 0000000000..a20cd4de70 --- /dev/null +++ b/docs/contributing/python_guidelines.rst @@ -0,0 +1,6 @@ +Python coding guidelines +======================== + +* PEP8. We ask that all Python contributions adhere to the `PEP8 `_ style guide, apart from the restriction on line length (E501). The `pep8 tool `_ makes it easy to check your code, e.g. ``pep8 --ignore=E501 your_file.py``. +* Python 2 and 3 compatibility. All contributions should support Python 2 and 3 and we recommend using the `six `_ compatibility library (use the pip version installed as a dependency, not the version bundled with Django). +* Tests. Wagtail has a suite of tests, which we are committed to improving and expanding. We run continuous integration at `travis-ci.org/torchbox/wagtail `_ to ensure that no commits or pull requests introduce test failures. If your contributions add functionality to Wagtail, please include the additional tests to cover it; if your contributions alter existing functionality, please update the relevant tests accordingly. diff --git a/docs/getting_started/demo_site.rst b/docs/getting_started/demo_site.rst index e08793308d..a3116c8f4f 100644 --- a/docs/getting_started/demo_site.rst +++ b/docs/getting_started/demo_site.rst @@ -1,78 +1,8 @@ -============== -Trying Wagtail -============== +========= +Demo site +========= -Wagtail demo -============ +To create a new site on Wagtail we recommend the ``wagtail start`` command in :doc:`creating_your_project`, however a demo site exists containing example page types and models. The demo site is also our recommended basis for contributing to Wagtail itself. -We provide a demo site containing a set of standard templates and page types - if you're new to Wagtail, this is the best way to try it out and familiarise yourself with how Wagtail works from the point of view of an editor. - -If you're happy to use Vagrant, and you just want to set up the Wagtail demo site, or any other pre-existing Wagtail site that ships with Vagrant support, you don't need to install Wagtail at all. Install `Vagrant `__ and `VirtualBox `__, and run:: - - git clone https://github.com/torchbox/wagtaildemo.git - cd wagtaildemo - vagrant up - vagrant ssh - - -Then, within the SSH session:: - - ./manage.py createsuperuser - ./manage.py runserver 0.0.0.0:8000 - - -This will make the demo site available on your host machine at the URL http://localhost:8000/ - you can access the Wagtail admin interface at http://localhost:8000/admin/ . Further instructions can be found at :ref:`editor_manual`. - -Once you’ve experimented with the demo site and are ready to build your own site, it's time to install Wagtail on your host machine. Even if you intend to do all further Wagtail work within Vagrant, installing the Wagtail package on your host machine will provide the ``wagtail start`` command that sets up the initial file structure for your project. - - -One line install -================ - - -Ubuntu ------- - -If you have a fresh instance of Ubuntu 13.04 or later, you can install Wagtail, -along with a demonstration site containing a set of standard templates and page -types, in one step. As the root user:: - - curl -O https://raw.githubusercontent.com/torchbox/wagtail/master/scripts/install/ubuntu.sh; bash ubuntu.sh - -This script installs all the dependencies for a production-ready Wagtail site, -including PostgreSQL, Redis, Elasticsearch, Nginx and uWSGI. We -recommend you check through the script before running it, and adapt it according -to your deployment preferences. The canonical version is at -`github.com/torchbox/wagtail/blob/master/scripts/install/ubuntu.sh -`_. - - -Debian ------- - -If you have a fresh instance of Debian 7, you can install Wagtail, along with a -demonstration site containing a set of standard templates and page types, in one -step. As the root user:: - - curl -O https://raw.githubusercontent.com/torchbox/wagtail/master/scripts/install/debian.sh; bash debian.sh - -This script installs all the dependencies for a production-ready Wagtail site, -including PostgreSQL, Redis, Elasticsearch, Nginx and uWSGI. We -recommend you check through the script before running it, and adapt it according -to your deployment preferences. The canonical version is at -`github.com/torchbox/wagtail/blob/master/scripts/install/debian.sh -`_. - - -Docker -====== - -`@oyvindsk `_ has built a Dockerfile for the Wagtail demo. Simply run:: - - docker run -p 8000:8000 -d oyvindsk/wagtail-demo - -then access the site at http://your-ip:8000 and the admin -interface at http://your-ip:8000/admin using admin / test. - -See https://index.docker.io/u/oyvindsk/wagtail-demo/ for more details. +The repo and installation instructions can be found here: `https://github.com/torchbox/wagtaildemo `_