From fbcca9d7f997aea0d187669064b38d12af7e4ddc Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 9 Jan 2017 19:20:34 +0000 Subject: [PATCH 01/10] Pin django-stdimage to latest version 2.4.0 --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index 559a240..d93d67c 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -17,7 +17,7 @@ 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 From 924c0c34fca6c0acd53c50376753a0e089a751db Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 9 Jan 2017 19:20:34 +0000 Subject: [PATCH 02/10] Update django-anymail from 0.6.1 to 0.7 --- requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/production.txt b/requirements/production.txt index d0b9ce3..7e00ad8 100644 --- a/requirements/production.txt +++ b/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 From 406124bdfde4a78392857aae030e0618c1cd9852 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 9 Jan 2017 19:20:35 +0000 Subject: [PATCH 03/10] Pin lxml to latest version 3.7.2 --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index d93d67c..6698564 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -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 From 3ff41632f534f62eae584a376adf0def1e9f72aa Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 9 Jan 2017 19:20:36 +0000 Subject: [PATCH 04/10] Update django-redis from 4.6.0 to 4.7.0 --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index 6698564..faae98f 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -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 From 4898e2e1e465543e761c10af6a09fb7aa7f1b8f3 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 9 Jan 2017 19:20:37 +0000 Subject: [PATCH 05/10] Update werkzeug from 0.11.13 to 0.11.15 --- requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/local.txt b/requirements/local.txt index f73417d..42e0a59 100644 --- a/requirements/local.txt +++ b/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 From b3cffbb2006a5426db8858d233c018729777f4e4 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 9 Jan 2017 19:20:38 +0000 Subject: [PATCH 06/10] Update django-allauth from 0.29.0 to 0.30.0 --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index faae98f..85c9cd0 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -25,7 +25,7 @@ Pillow==3.4.2 # 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 From 7bb26bdc79b883893d8839b15d27af84c1746eec Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 9 Jan 2017 19:20:39 +0000 Subject: [PATCH 07/10] Update django from 1.10.4 to 1.10.5 --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index 85c9cd0..06a5f13 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -5,7 +5,7 @@ wheel==0.29.0 # Bleeding edge Django -django==1.10.4 +django==1.10.5 # Configuration django-environ==0.4.1 From a2d767575299a7e415ba4780316817b8983a9a81 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 9 Jan 2017 19:20:40 +0000 Subject: [PATCH 08/10] Update pillow from 3.4.2 to 4.0.0 --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index 06a5f13..c7fde52 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -21,7 +21,7 @@ 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! From e8a3d5c3f127a7d19240db8ee9776ba1a9bdc736 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 9 Jan 2017 19:20:41 +0000 Subject: [PATCH 09/10] Update whitenoise from 3.2.2 to 3.2.3 --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index c7fde52..7c50ff3 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -9,7 +9,7 @@ django==1.10.5 # Configuration django-environ==0.4.1 -whitenoise==3.2.2 +whitenoise==3.2.3 # Forms From 034da2fc6277b37a989ded2eb523a990baa3094b Mon Sep 17 00:00:00 2001 From: Sam Collins Date: Mon, 9 Jan 2017 21:20:45 +0000 Subject: [PATCH 10/10] Added PyUp link and improved docs --- README.org | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/README.org b/README.org index 5f15e85..6b38aa2 100644 --- a/README.org +++ b/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