From 608897b9ec8378cff113a9aa0231a6e8d21d0748 Mon Sep 17 00:00:00 2001
From: Nik Nyby <nnyby@columbia.edu>
Date: Sat, 31 Oct 2015 12:51:56 -0400
Subject: [PATCH] Test on python 3.3 and 3.4 with travis

Python 3.2.x is deprecated, so I thought it would be
good to get tests running on some newer pythons. I've
switched from the python3-gi package to using 'pgi' from
pypi, because the apt-installed python3-gi was having trouble
importing.

pgi required python 3.3+ (see: https://pypi.python.org/pypi/pgi),
so I've removed python 3.2 from the test matrix. Let me know if
we're using python 3.2 anywhere, but as far as I know plinth is
run on python 3.4.3 with debian sid on the freedombox image.
---
 .travis.yml                      |  8 +++-----
 plinth/modules/networks/forms.py |  6 +++---
 plinth/network.py                | 10 +++++-----
 plinth/package.py                | 10 +++++-----
 requirements.txt                 |  1 +
 5 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 89c4a4dab..58939c6ab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,15 +2,13 @@
 
 language: python
 python:
-  - "3.2"
+  - "3.3.6"
+  - "3.4.3"
 
 # Debian packages required
 before_install:
   - sudo apt-get update -qq
-  - sudo apt-get install python3-dbus python3-gi gir1.2-packagekitglib-1.0
-
-virtualenv:
-  system_site_packages: true
+  - sudo apt-get install python3-dbus gir1.2-packagekitglib-1.0
 
 # Command to install dependencies
 install:
diff --git a/plinth/modules/networks/forms.py b/plinth/modules/networks/forms.py
index a80df48c0..177d02512 100644
--- a/plinth/modules/networks/forms.py
+++ b/plinth/modules/networks/forms.py
@@ -20,9 +20,9 @@ from django.core import validators
 from django.utils.translation import ugettext_lazy as _
 
 from plinth import network
-import gi
-gi.require_version('NM', '1.0')
-from gi.repository import NM as nm
+import pgi
+pgi.require_version('NM', '1.0')
+from pgi.repository import NM as nm
 
 
 def _get_interface_choices(device_type):
diff --git a/plinth/network.py b/plinth/network.py
index eaee2bd9f..4fb7adcad 100644
--- a/plinth/network.py
+++ b/plinth/network.py
@@ -21,11 +21,11 @@ Helper functions for working with network manager.
 
 import collections
 from django.utils.translation import ugettext_lazy as _
-import gi
-gi.require_version('GLib', '2.0')
-from gi.repository import GLib as glib
-gi.require_version('NM', '1.0')
-from gi.repository import NM as nm
+import pgi
+pgi.require_version('GLib', '2.0')
+from pgi.repository import GLib as glib
+pgi.require_version('NM', '1.0')
+from pgi.repository import NM as nm
 import logging
 import socket
 import struct
diff --git a/plinth/package.py b/plinth/package.py
index b9906d780..234a422fc 100644
--- a/plinth/package.py
+++ b/plinth/package.py
@@ -22,11 +22,11 @@ Framework for installing and updating distribution packages
 from django.contrib import messages
 from django.utils.translation import ugettext as _
 import functools
-import gi
-gi.require_version('GLib', '2.0')
-from gi.repository import GLib as glib
-gi.require_version('PackageKitGlib', '1.0')
-from gi.repository import PackageKitGlib as packagekit
+import pgi
+pgi.require_version('GLib', '2.0')
+from pgi.repository import GLib as glib
+pgi.require_version('PackageKitGlib', '1.0')
+from pgi.repository import PackageKitGlib as packagekit
 import logging
 import threading
 
diff --git a/requirements.txt b/requirements.txt
index eb0ff243f..93d51c0b2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,3 +5,4 @@ django-stronghold
 psutil
 python-augeas
 pyyaml
+pgi >= 0.0.10.1