Update INSTALLATION.rst

This commit is contained in:
tmslav 2016-04-10 04:20:15 +02:00
parent e8849a6a48
commit 39dedf92d2
1 changed files with 28 additions and 9 deletions

View File

@ -1,7 +1,4 @@
ungleich Dynamicweb
========
dynamicweb
---------- ----------
Installation for dynamicweb Installation for dynamicweb
======= =======
@ -14,17 +11,39 @@ Requirements
Install Install
======= =======
The quick way: The quick way:
`pip install -r requirements.txt` ``pip install -r requirements.txt``
Next find the dump.db file on stagging server. Path for the file is under the base application folder. Next find the dump.db file on stagging server. Path for the file is under the base application folder.
Install the postgresql server and import the database:: Install the postgresql server and import the database::
`psql -d app < dump.db` ``psql -d app < dump.db``
**No migration is needed after a clean install, and You are ready to start developing.**
Development Development
=========== ===========
Project is separated in master branch and development branch. Project is separated in master branch and development branch, and feature branches.
Master branch is currently used on `Digital Glarus`<https://digitalglarus.ungleich.ch/en-us/digitalglarus/> and [Ungleich blog](https://digitalglarus.ungleich.ch/en-us/blog/). Master branch is currently used on `Digital Glarus <https://digitalglarus.ungleich.ch/en-us/digitalglarus/>`_ and `Ungleich blog <https://digitalglarus.ungleich.ch/en-us/blog/>`_.
If You are starting to create a new feature fork the github `repo <https://github.com/ungleich/dynamicweb>`_ and branch the development branch.
After You have complited the task create a pull request and ask someone to review the code from other developers.
**Cheat sheet for branching and forking**:
*branching*
``git branch feature_name && git checkout feature_name``
*fetching upstream(should be done everytime before development is started)*
``git fetch upstream && git merge upstream/feature_name``
`read more about getting code from upstream here <https://help.github.com/articles/syncing-a-fork/>`_