Merge pull request #2 from maidstone-hackspace/pyup-initial-update

Merge in pyup

README.org

@@ -1,10 +1,13 @@
-* Maidstone hackspace website
+[[https://cdn.rawgit.com/maidstone-hackspace/administration/2ede7cb1/images/hackspace-banner.png]]
+
+* Maidstone Hackspace website
+[[https://pyup.io/repos/github/maidstone-hackspace/maidstone-hackspace-website/][https://pyup.io/repos/github/maidstone-hackspace/maidstone-hackspace-website/shield.svg]]
 
 Repository for the maidstone hackspace website
 
 
 ** Requirements
-Before getting started make sure you have compose and docker and git installed on your machine
+Before getting started make sure you have git, docker and docker-compose installed on your machine.
 The simplest way to setup this site is to use docker-compose so please install that from this site https://docs.docker.com/engine/installation/ and make sure the quick start guide works https://docs.docker.com/machine/get-started/ then you can use the commands below to test and make changes.
 
 ** Setup
@@ -14,13 +17,13 @@ To get started checkout the project to your machine.
 git clone https://github.com/olymk2/maidstone-hackspace.git
 #+END_SRC
 
-Once checked out build your containers locally if needed, only needed when you first start or if requirements change.
+Once checked out build your containers locally you only need to do this when first start or if requirements change.
 
 #+BEGIN_SRC sh
 docker-compose -fdev.yml build
 #+END_SRC
 
-Startup your new containers containing a database and django 
+*** Start your new containers containing a database and django
 
 #+BEGIN_SRC sh
 docker-compose -fdev up
@@ -30,13 +33,14 @@ Test django is serving pages
 http://127.0.0.1:8180
 
 
-Run migrations and setup admin user
-to run django command just prefix them with =docker-compose -f dev.yml run django= 
+*** Run migrations and setup admin user
+To run django commands just prefix them with =docker-compose -f dev.yml run django=
 #+BEGIN_SRC sh
 docker-compose -f dev.yml run django python manage.py makemigrations
 docker-compose -f dev.yml run django python manage.py migrate
 #+END_SRC
 
+Creating an admin user
 #+BEGIN_SRC sh
 docker-compose -f dev.yml run django python manage.py createsuperuser
 #+END_SRC

requirements/base.txt

@@ -5,11 +5,11 @@
 wheel==0.29.0
 
 # Bleeding edge Django
-django==1.10.4
+django==1.10.5
 
 # Configuration
 django-environ==0.4.1
-whitenoise==3.2.2
+whitenoise==3.2.3
 
 
 # Forms
@@ -17,15 +17,15 @@ django-braces==1.10.0
 django-crispy-forms==1.6.1
 
 # Models
-django-stdimage
+django-stdimage==2.4.0
 django-model-utils==2.6
 
 # Images
-Pillow==3.4.2
+Pillow==4.0.0
 
 # For user registration, either via email or social
 # Well-built with regular release cycles!
-django-allauth==0.29.0
+django-allauth==0.30.0
 
 
 # Python-PostgreSQL Database Adapter
@@ -38,7 +38,7 @@ awesome-slugify==1.6.5
 pytz==2016.10
 
 # Redis support
-django-redis==4.6.0
+django-redis==4.7.0
 redis>=2.10.5
 
 
@@ -47,7 +47,7 @@ redis>=2.10.5
 rcssmin==1.0.6 
 django-compressor==2.1
 
-lxml
+lxml==3.7.2
 
 # Your custom requirements go here
 -e git+https://github.com/olymk2/scaffold.git#egg=scaffold

requirements/local.txt

@@ -4,7 +4,7 @@ coverage==4.3.1
 django-coverage-plugin==1.3.1
 Sphinx==1.5.1
 django-extensions==1.7.5
-Werkzeug==0.11.13
+Werkzeug==0.11.15
 django-test-plus==1.0.16
 factory-boy==2.8.1
 

requirements/production.txt

@@ -17,7 +17,7 @@ django-storages-redux==1.3.2
 
 # Email backends for Mailgun, Postmark, SendGrid and more
 # -------------------------------------------------------
-django-anymail==0.6.1
+django-anymail==0.7