Merge pull request #26 from Elthan/upgrade-django

Upgraded Django version to 1.11

.gitignore

@@ -46,6 +46,7 @@ coverage.xml
 # Django stuff:
 *.log
 *.pot
+**/migrations/
 
 
 # Sphinx documentation
@@ -57,10 +58,11 @@ db.sqlite3
 # Ignore user-specific pycharm settings
 .idea/workspace.xml
 .idea/tasks.xml
+.idea/
 
 # OSX Files
 .DS_Store
 docs/.DS_Store
 
 # dbdev_tempdata
-dbdev_tempdata/
+dbdev_tempdata/

docs/README.txt

@@ -1,5 +1,4 @@
 
 To make html files from doc, run
 
-$ fab docs
-
+$ inv docs

docs/conf.py

@@ -60,7 +60,7 @@
 
 # General information about the project.
 project = u'trix'
-copyright = u'2014, trix'
+copyright = u'2018, trix'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

docs/develop/databasedumps.rst

@@ -4,15 +4,15 @@ Using and creating database dumps
 
 We use dumpscript_ from the django-extentions Django app to create our test
 data. We already have data, so unless you want to add more data, you do not need
-to know anything more than how to run a Django management task or a fabric task.
+to know anything more than how to run a Django management task or an invoke task.
 
 
 ***********************
 Importing the test data
 ***********************
-The easiest method of importing the test database is to use the ``recreate_devdb`` Fabric task::
+The easiest method of importing the test database is to use the ``recreate_devdb`` Invoke task::
 
-    $ fab recreate_devdb
+    $ inv recreate_devdb
 
 .. warning:: This will destroy your current database.
 
@@ -31,10 +31,10 @@ Users in the test database
 **************************
 After importing the test data, you will have some new users. Login to the Django admin UI (http://localhost:8000/admin/) with::
 
-    user: grandma@example.com
-    password: test
+    user: super@example.com
+    password: asdf
 
-and select Users to list all users. The password of all users are ``test``.
+and select Users to list all users. The password of all other users are ``test``.
 
 
 
@@ -45,7 +45,7 @@ To add new data, you just need to do add data to the database manually, or progr
 
 Adding data manually (I.E.: Using the Django admin UI)
 ======================================================
-To add data manually, you should first run thr ``recreate_devdb`` management
+To add data manually, you should first run the ``recreate_devdb`` management
 command to make sure you start out with the current up-to-date dataset. Then you
 can use the web-UI or the Django shell to add data. Finally, run::
 
@@ -60,4 +60,4 @@ the top of ``trix/project/develop/dumps/dev/data.py`` for information
 about how ``import_helper`` works.
 
 
-.. _dumpscript: http://django-extensions.readthedocs.org/en/latest/dumpscript.html
+.. _dumpscript: http://django-extensions.readthedocs.org/en/latest/dumpscript.html

docs/develop/gettingstarted.rst

@@ -8,29 +8,29 @@ Install the requirements
 ************************
 Install the following:
 
-#. Python
+#. Python2.7
 #. PIP_
 #. VirtualEnv_
 #. virtualenvwrapper_
-#. libjpeg, liblcms1, libfreetype6 and zlib for the required format support in Pillow
 #. gettext for Django translations
 #. nodejs and npm for our clientside stuff
+.. #. libjpeg, liblcms1, libfreetype6 and zlib for the required format support in Pillow
 
 
 Install the system packages on OSX with Homebrew
 ================================================
 ::
 
-    $ brew install gettext nodejs
+    $ brew install npm nodejs
 
-You will also have to add gettext to your path if you want to be able to update translation strings. You can eighter run ``brew link gettext --force``, or add ``/usr/local/Cellar/gettext/SOMETHING/bin/`` to your path.
+You will also have to add gettext to your path if you want to be able to update translation strings. You can either run ``brew link gettext --force``, or add ``/usr/local/Cellar/gettext/SOMETHING/bin/`` to your path.
 
 
 Install the system packages on Ubuntu
 ================================================
 ::
 
-    $ sudo apt-get install gettext nodejs
+    $ sudo apt-get install npm nodejs
 
 
 
@@ -41,10 +41,6 @@ Create a virtualenv (an isolated Python environment)::
 
     $ mkvirtualenv trix
 
-Install the development requirements::
-
-    $ pip install -r requirements/develop.txt
-
 
 .. _enable-virtualenv:
 
@@ -55,6 +51,25 @@ Install the development requirements::
 
         $ workon trix
 
+Install the development requirements::
+
+    $ pip install -r requirements/develop.txt
+
+
+Run npm install (include -g if you want global)::
+
+    $ inv npm-install
+
+
+Run bower install::
+
+    $ inv bower-install
+
+
+Finally build the static files::
+
+    $ inv grunt-build
+
 
 *****************
 Create a database
@@ -63,21 +78,17 @@ See :doc:`databasedumps`.
 
 
 
-
-
 **************
 Build the docs
 **************
 :ref:`Enable the virtualenv <enable-virtualenv>`, and run::
 
     $ cd docs/
-    $ fab docs
+    $ inv docs
 
 Then open ``_build/index.html`` in a browser.
 
 
-
-
 .. _PIP: https://pip.pypa.io
 .. _VirtualEnv: https://virtualenv.pypa.io
 .. _virtualenvwrapper: http://virtualenvwrapper.readthedocs.org/

docs/tasks.py

@@ -0,0 +1,9 @@
+from invoke import task
+
+
+@task
+def docs(ctx):
+    """
+    Build the docs.
+    """
+    ctx.run('sphinx-build -b html . _build')