Merge pull request #6 from open-craft/python3.5

Update: Python 3.5, Django 1.9, Ubuntu 16.04

Makefile

@@ -1,5 +1,5 @@
 # OpenCraft -- tools to aid developing and hosting free software projects
-# Copyright (C) 2015 OpenCraft <xavier@opencraft.com>
+# Copyright (C) 2015-2016 OpenCraft <contact@opencraft.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -19,13 +19,13 @@
 
 WORKERS = 4
 SHELL = /bin/bash
-HONCHO_MANAGE := honcho run python3 manage.py 
+HONCHO_MANAGE := honcho run python3 manage.py
 
 
 # Parameters ##################################################################
 
 # For `test_one` use the rest as arguments and turn them into do-nothing targets
-ifeq (test_one,$(firstword $(MAKECMDGOALS)))
+ifeq ($(firstword $(MAKECMDGOALS)),$(filter $(firstword $(MAKECMDGOALS)),test_one manage))
   RUN_ARGS := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
   $(eval $(RUN_ARGS):;@:)
 endif
@@ -37,8 +37,6 @@ all:
 	rundev
 
 apt_get_update:
-	sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10
-	echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' | sudo tee /etc/apt/sources.list.d/mongodb.list
 	sudo apt-get update
 
 clean:
@@ -60,6 +58,9 @@ install_virtualenv_system:
 collectstatic: clean static_external
 	honcho run ./manage.py collectstatic --noinput
 
+manage:
+	$(HONCHO_MANAGE) $(RUN_ARGS)
+
 migrate: clean
 	$(HONCHO_MANAGE) migrate
 

README.md

@@ -25,7 +25,7 @@ First, install [VirtualBox](https://www.virtualbox.org/wiki/Downloads) and
 
     vagrant up
 
-This will provision a virtual machine running Ubuntu 14.04, set up local
+This will provision a virtual machine running Ubuntu 16.04, set up local
 Postgres, MySQL, MongoDB and Redis, install the dependencies and run the tests.
 
 Once the virtual machine is up and running, you can ssh into it with this
@@ -45,7 +45,7 @@ web browser.
 
 If you prefer not to use Vagrant, you can install OpenCraft manually. Refer to
 the [bootstrap](bin/bootstrap) script used by Vagrant for an example.
-Instructions based on Ubuntu 14.04.
+Instructions based on Ubuntu 16.04.
 
 Install the system package dependencies & virtualenv:
 
@@ -258,7 +258,7 @@ Creating a user
 In order to login to the development server locally you will need to create a
 superuser by running:
 
-    honcho run ./manage.py createsuperuser
+    make manage createsuperuser
 
 Once created, you will be able to login with the username and password you set
 up.
@@ -432,6 +432,10 @@ manage.py
 You can also access the Django `manage.py` command directly, using Honcho to
 load the environment:
 
+    make manage <command>
+
+Or run any command using the application environment:
+
     honcho run ./manage.py <command>
 
 

Vagrantfile

@@ -1,12 +1,25 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
+unless Vagrant.has_plugin?("vagrant-vbguest")
+  raise "Please install the vagrant-vbguest plugin by running `vagrant plugin install vagrant-vbguest`"
+end
+
 Vagrant.configure(2) do |config|
-  config.vm.box = 'ubuntu/trusty64'
+  # TODO: Switch back to the official box once it is released
+  config.vm.box = 'opencraft/xenial64'
+  config.vm.synced_folder '.', '/vagrant', disabled: true
+  config.vm.synced_folder '.', '/home/vagrant/opencraft'
+
+  config.vbguest.auto_update = true
+  config.vbguest.auto_reboot = true
+
   config.vm.network 'forwarded_port', guest: 2001, host: 2001
   config.vm.network 'forwarded_port', guest: 5000, host: 5000
   config.vm.network 'forwarded_port', guest: 8888, host: 8888
+
   config.ssh.forward_x11 = true
+
   config.vm.provision 'shell',
                       path: 'bin/bootstrap',
                       privileged: false,

api/router.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # OpenCraft -- tools to aid developing and hosting free software projects
-# Copyright (C) 2015 OpenCraft <xavier@opencraft.com>
+# Copyright (C) 2015-2016 OpenCraft <contact@opencraft.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as

api/urls.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # OpenCraft -- tools to aid developing and hosting free software projects
-# Copyright (C) 2015 OpenCraft <xavier@opencraft.com>
+# Copyright (C) 2015-2016 OpenCraft <contact@opencraft.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as

bin/bootstrap

@@ -1,13 +1,13 @@
 #!/bin/bash
 # This script provisions a development environment with local postgres and
-# redis servers for development and testing. Assumes ubuntu 14.04
+# redis servers for development and testing. Assumes Ubuntu 16.04
 
 set -e
 
-# If this is a vagrant VM, cd to /vagrant on login
+# If this is a vagrant VM, cd to ~/opencraft on login
 if [[ $USER == 'vagrant' ]]; then
-  cd /vagrant
-  grep -Fq 'cd /vagrant' ~/.bashrc || echo 'cd /vagrant' >> ~/.bashrc
+  cd ~/opencraft
+  grep -Fq 'cd ~/opencraft' ~/.bashrc || echo 'cd ~/opencraft' >> ~/.bashrc
 fi
 
 # Install system packages
@@ -28,14 +28,19 @@ if [[ $USER == 'vagrant' ]]; then
 fi
 
 # Install python dependencies
-pip3 install -r requirements.txt
+pip install -r requirements.txt
+
+# TODO: Should only be needed for the unofficial vagrant image
+# Remove when switching to the official, when vagrant release a xenial box
+echo "update user set plugin='mysql_native_password' where user='root' and host='localhost'; flush privileges;" \
+    | sudo -H -u root mysql mysql
 
 # Create postgres user
 sudo -u postgres createuser -d $USER ||
   echo "Could not create postgres user '$USER' - it probably already exists"
 
 # Allow access to postgres from localhost without password
-cat << EOF | sudo tee /etc/postgresql/9.3/main/pg_hba.conf
+cat << EOF | sudo tee /etc/postgresql/9.5/main/pg_hba.conf
 local   all             postgres                                peer
 local   all             all                                     trust
 host    all             all             127.0.0.1/32            trust

circle.yml

@@ -1,6 +1,6 @@
 machine:
   python:
-    version: 3.4.3
+    version: 3.5.1
 dependencies:
   pre:
     - pip install --upgrade pip

debian_db_packages.lst

@@ -1,3 +1,3 @@
 postgresql
 mysql-server
-mongodb-org
+mongodb

instance/admin.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # OpenCraft -- tools to aid developing and hosting free software projects
-# Copyright (C) 2015 OpenCraft <xavier@opencraft.com>
+# Copyright (C) 2015-2016 OpenCraft <contact@opencraft.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -23,6 +23,7 @@
 # Imports #####################################################################
 
 from django.contrib import admin
+
 from instance.models.instance import SingleVMOpenEdXInstance
 from instance.models.log_entry import GeneralLogEntry, InstanceLogEntry, ServerLogEntry
 from instance.models.server import OpenStackServer

instance/ansible.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # OpenCraft -- tools to aid developing and hosting free software projects
-# Copyright (C) 2015 OpenCraft <xavier@opencraft.com>
+# Copyright (C) 2015-2016 OpenCraft <contact@opencraft.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -22,20 +22,19 @@
 
 # Imports #####################################################################
 
+from contextlib import contextmanager
+import logging
 import os
 import shutil
 import subprocess
-import yaml
-
-from contextlib import contextmanager
 from tempfile import mkdtemp, NamedTemporaryFile
+import yaml
 
 from django.conf import settings
 
 
 # Logging #####################################################################
 
-import logging
 logger = logging.getLogger(__name__)
 
 

instance/api/instance.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # OpenCraft -- tools to aid developing and hosting free software projects
-# Copyright (C) 2015 OpenCraft <xavier@opencraft.com>
+# Copyright (C) 2015-2016 OpenCraft <contact@opencraft.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as

instance/api/server.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # OpenCraft -- tools to aid developing and hosting free software projects
-# Copyright (C) 2015 OpenCraft <xavier@opencraft.com>
+# Copyright (C) 2015-2016 OpenCraft <contact@opencraft.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as

instance/gandi.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # OpenCraft -- tools to aid developing and hosting free software projects
-# Copyright (C) 2015 OpenCraft <xavier@opencraft.com>
+# Copyright (C) 2015-2016 OpenCraft <contact@opencraft.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -22,6 +22,7 @@
 
 # Imports #####################################################################
 
+import logging
 import time
 import xmlrpc.client
 
@@ -31,7 +32,6 @@
 
 # Logging #####################################################################
 
-import logging
 logger = logging.getLogger(__name__)
 
 
@@ -45,14 +45,14 @@ def __init__(self, api_url='https://rpc.gandi.net/xmlrpc/'):
         self.client = xmlrpc.client.ServerProxy(api_url)
 
     @property
-    def api_key(self): #pylint: disable=no-self-use
+    def api_key(self):
         """
         Gandi API key
         """
         return settings.GANDI_API_KEY
 
     @property
-    def zone_id(self): #pylint: disable=no-self-use
+    def zone_id(self):
         """
         Gandi Zone ID of the domain
         """

instance/github.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # OpenCraft -- tools to aid developing and hosting free software projects
-# Copyright (C) 2015 OpenCraft <xavier@opencraft.com>
+# Copyright (C) 2015-2016 OpenCraft <contact@opencraft.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -22,19 +22,19 @@
 
 # Imports #####################################################################
 
+import logging
 import functools
 import operator
 import re
-import requests
-import yaml
 
 from django.conf import settings
 from django.template.defaultfilters import truncatewords
+import requests
+import yaml
 
 
 # Logging #####################################################################
 
-import logging
 logger = logging.getLogger(__name__)
 
 

instance/logger_adapter.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # OpenCraft -- tools to aid developing and hosting free software projects
-# Copyright (C) 2015 OpenCraft <xavier@opencraft.com>
+# Copyright (C) 2015-2016 OpenCraft <contact@opencraft.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as

instance/logging.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # OpenCraft -- tools to aid developing and hosting free software projects
-# Copyright (C) 2015 OpenCraft <xavier@opencraft.com>
+# Copyright (C) 2015-2016 OpenCraft <contact@opencraft.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -22,14 +22,13 @@
 
 # Imports #####################################################################
 
+from functools import wraps
 import logging
 import traceback
 
-from functools import wraps
-from swampdragon.pubsub_providers.data_publisher import publish_data
-
 from django.apps import apps
 from django.db import models
+from swampdragon.pubsub_providers.data_publisher import publish_data
 
 from instance.serializers.logentry import LogEntrySerializer
 

instance/models/instance.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # OpenCraft -- tools to aid developing and hosting free software projects
-# Copyright (C) 2015 OpenCraft <xavier@opencraft.com>
+# Copyright (C) 2015-2016 OpenCraft <contact@opencraft.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -22,6 +22,7 @@
 
 # Imports #####################################################################
 
+from functools import partial
 import logging
 import string
 
@@ -32,7 +33,6 @@
 from django.utils import timezone
 from django.utils.crypto import get_random_string
 from django_extensions.db.models import TimeStampedModel
-from functools import partial
 
 from instance.gandi import GandiAPI
 from instance.logger_adapter import InstanceLoggerAdapter

instance/models/log_entry.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # OpenCraft -- tools to aid developing and hosting free software projects
-# Copyright (C) 2015 OpenCraft <xavier@opencraft.com>
+# Copyright (C) 2015-2016 OpenCraft <contact@opencraft.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as

instance/models/mixins/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # OpenCraft -- tools to aid developing and hosting free software projects
-# Copyright (C) 2015 OpenCraft <xavier@opencraft.com>
+# Copyright (C) 2015-2016 OpenCraft <contact@opencraft.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as