Merge branch 'python3'

hugorodgerbrown · hugorodgerbrown · commit 310219905d9c · 2017-04-08T17:40:35.000+01:00
* python3:
  Update travis.yml to generate build matrix
  Add python version info to admin list view
  Run through 2to3
  Update  to support Python3 in preparation for Django 2.0

# Conflicts:
#	.travis.yml
#	README.rst
#	tox.ini
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,9 @@
 language:
-    python
-
+  python
 python:
-    2.7
-
+  - "2.7"
+  - "3.6"
 install:
-    pip install tox
-
+  pip install tox-travis
 script:
-    tox
+  tox
diff --git a/README.rst b/README.rst
@@ -4,7 +4,6 @@
 .. image:: https://badge.fury.io/py/django-package-monitor.svg
     :target: https://badge.fury.io/py/django-package-monitor
 
-
 Django Package Monitor
 ======================
 
diff --git a/package_monitor/admin.py b/package_monitor/admin.py
@@ -27,6 +27,8 @@ def check_pypi(modeladmin, request, queryset):
             logger.debug("Ignoring version update '%s' is editable", p.package_name)
         else:
             p.update_from_pypi()
+
+
 check_pypi.short_description = "Update selected packages from PyPI"
 
 
@@ -76,15 +78,39 @@ class PackageVersionAdmin(admin.ModelAdmin):
     actions = (check_pypi,)
     change_list_template = 'change_list.html'
     list_display = (
-        'package_name', 'is_editable', '_updateable', 'current_version', 'next_version',
-        'latest_version', '_licence', 'diff_status', 'checked_pypi_at', 'is_parseable'
+        'package_name',
+        '_updateable',
+        'current_version',
+        'next_version',
+        'latest_version',
+        'supports_py3',
+        '_licence',
+        'diff_status',
+        'checked_pypi_at',
+    )
+    list_filter = (
+        'diff_status',
+        'is_editable',
+        'is_parseable',
+        UpdateAvailableListFilter,
+        'supports_py3'
     )
-    list_filter = ('diff_status', 'is_editable', 'is_parseable', UpdateAvailableListFilter)
     ordering = ["package_name"]
     readonly_fields = (
-        'package_name', 'is_editable', 'current_version', 'next_version',
-        'latest_version', 'diff_status', 'checked_pypi_at',
-        'url', 'licence', 'raw', 'available_updates', 'is_parseable'
+        'package_name',
+        'is_editable',
+        'is_parseable',
+        'current_version',
+        'next_version',
+        'latest_version',
+        'diff_status',
+        'checked_pypi_at',
+        'url',
+        'licence',
+        'raw',
+        'available_updates',
+        'python_support',
+        'supports_py3',
     )
 
     def _licence(self, obj):
@@ -99,7 +125,7 @@ def _updateable(self, obj):
         else:
             return obj.latest_version != obj.current_version
     _updateable.boolean = True
-    _updateable.short_description = u"Update available"
+    _updateable.short_description = "Update available"
 
     def available_updates(self, obj):
         """Print out all versions ahead of the current one."""
@@ -108,4 +134,5 @@ def available_updates(self, obj):
         versions = package.all_versions()
         return html_list([v for v in versions if v > obj.current_version])
 
+
 admin.site.register(PackageVersion, PackageVersionAdmin)
diff --git a/package_monitor/compat.py b/package_monitor/compat.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+"""Python 2/3 compatibility imports."""
+try:
+    from unittest import mock
+    print("Successfully imports mock from unittest")
+except ImportError:
+    print("Trying to import standalone mock")
+    import mock
+    print("Successfully imported standalone mock")
diff --git a/package_monitor/migrations/0001_initial.py b/package_monitor/migrations/0001_initial.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import migrations, models
 import semantic_version.django_fields
diff --git a/package_monitor/migrations/0002_auto_20151126_1453.py b/package_monitor/migrations/0002_auto_20151126_1453.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import migrations, models
 
diff --git a/package_monitor/migrations/0003_packageversion_next_version.py b/package_monitor/migrations/0003_packageversion_next_version.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import migrations, models
 import semantic_version.django_fields
diff --git a/package_monitor/migrations/0004_auto_20160109_1339.py b/package_monitor/migrations/0004_auto_20160109_1339.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import migrations, models
 
diff --git a/package_monitor/migrations/0005_packageversion_is_parseable.py b/package_monitor/migrations/0005_packageversion_is_parseable.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import migrations, models
 
diff --git a/package_monitor/migrations/0006_add_python_version_info.py b/package_monitor/migrations/0006_add_python_version_info.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('package_monitor', '0005_packageversion_is_parseable'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='packageversion',
+            name='python_support',
+            field=models.CharField(default='', help_text=b'Python version support as specified in the PyPI classifiers.', max_length=100),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='packageversion',
+            name='supports_py3',
+            field=models.NullBooleanField(default=None, help_text=b'Does this package support Python3?'),
+        ),
+    ]
diff --git a/package_monitor/models.py b/package_monitor/models.py
@@ -48,6 +48,14 @@ class PackageVersion(models.Model):
         null=True, blank=True,
         help_text="Next available version available from PyPI."
     )
+    python_support = models.CharField(
+        max_length=100,
+        help_text="Python version support as specified in the PyPI classifiers."
+    )
+    supports_py3 = models.NullBooleanField(
+        default=None,
+        help_text="Does this package support Python3?"
+    )
     licence = models.CharField(
         max_length=100,
         blank=True,
@@ -107,11 +115,8 @@ def __init__(self, *args, **kwargs):
                 logger.debug("Unparseable package version (%s): %s", requirement.specs[0][1], ex)
             self.url = pypi.package_url(requirement.name)
 
-    def __unicode__(self):
-        return u"Package '%s'" % self.raw
-
     def __str__(self):
-        return unicode(self).encode('utf-8')
+        return "Package '%s'" % self.raw
 
     def update_from_pypi(self):
         """Call get_latest_version and then save the object."""
@@ -121,6 +126,8 @@ def update_from_pypi(self):
             self.latest_version = package.latest_version()
             self.next_version = package.next_version(self.current_version)
             self.diff_status = pypi.version_diff(self.current_version, self.latest_version)
+            self.python_support = package.python_support()
+            self.supports_py3 = package.supports_py3()
         self.checked_pypi_at = tz_now()
         self.save()
         return self
diff --git a/package_monitor/pypi.py b/package_monitor/pypi.py
@@ -20,17 +20,24 @@ def cache_key(package_name):
 
 def package_url(package_name):
     """Return fully-qualified URL to package on PyPI (JSON endpoint)."""
-    return u"http://pypi.python.org/pypi/%s/json" % package_name
+    return "http://pypi.python.org/pypi/%s/json" % package_name
 
 
 def parse_version(version_string):
     """Parse a string into a PackageVersion."""
     try:
         return Version.coerce(version_string)
-    except:
+    except Exception:
         return None
 
 
+def parse_python(classifiers):
+    """Parse out the versions of python supported a/c classifiers."""
+    prefix = 'Programming Language :: Python ::'
+    python_classifiers = [c.split('::')[2].strip() for c in classifiers if c.startswith(prefix)]
+    return ', '.join([c for c in python_classifiers if parse_version(c)])
+
+
 def version_diff(version1, version2):
     """Return string representing the diff between package versions.
 
@@ -86,16 +93,26 @@ def info(self):
     def licence(self):
         return self.info().get('license') or '(unspecified)'
 
+    def classifiers(self):
+        return self.info().get('classifiers', [])
+
     def latest_version(self):
         return parse_version(self.info().get('version'))
 
     def all_versions(self):
         release_data = self.data().get('releases')
-        versions = [parse_version(r) for r in release_data.keys()]
+        versions = [parse_version(r) for r in list(release_data.keys())]
         return sorted([v for v in versions if v is not None])
 
     def next_version(self, current_version):
         try:
             return min([v for v in self.all_versions() if v > current_version])
         except ValueError:
             return None
+
+    def python_support(self):
+        return parse_python(self.classifiers())
+
+    def supports_py3(self):
+        versions = self.python_support().split(', ')
+        return len([v for v in versions if v != '' and v[0] == '3']) > 0
diff --git a/package_monitor/tests/test_models.py b/package_monitor/tests/test_models.py
@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 from django.test import TestCase
 
-from mock import patch
 from requirements import requirement
 from semantic_version import Version
 
 from .. import models
+from ..compat import mock
 from ..tests import mock_get
 
 
@@ -39,8 +39,7 @@ def test_attrs(self):
         self.assertEqual(v.url, None)
 
         v.raw = 'foobar==1.2'
-        self.assertEqual(unicode(v), u"Package 'foobar==1.2'")
-        self.assertEqual(str(v), u"Package 'foobar==1.2'")
+        self.assertEqual(str(v), "Package 'foobar==1.2'")
 
     def test_init(self):
         r = requirement.Requirement.parse("foobar==0.0.1")
@@ -53,7 +52,7 @@ def test_init(self):
         self.assertEqual(v.diff_status, 'unknown')
         self.assertEqual(v.checked_pypi_at, None)
         self.assertEqual(v.is_editable, False)
-        self.assertEqual(v.url, u"http://pypi.python.org/pypi/foobar/json")
+        self.assertEqual(v.url, "http://pypi.python.org/pypi/foobar/json")
 
     def test_init_editable(self):
         url = "git+https://foobar.com#egg=foo"
@@ -80,9 +79,9 @@ def test_init_unparseable(self):
         self.assertEqual(v.checked_pypi_at, None)
         self.assertEqual(v.is_editable, False)
         self.assertEqual(v.is_editable, False)
-        self.assertEqual(v.url, u'http://pypi.python.org/pypi/foo/json')
+        self.assertEqual(v.url, 'http://pypi.python.org/pypi/foo/json')
 
-    @patch('requests.get', mock_get)
+    @mock.patch('requests.get', mock_get)
     def test_update_from_pypi(self):
         """Test the update_from_pypi method."""
         # editable packages return None
@@ -94,7 +93,7 @@ def test_update_from_pypi(self):
         self.assertEqual(v.latest_version, Version('1.9.1'))
         self.assertEqual(v.diff_status, 'major')
 
-    @patch('requests.get', mock_get)
+    @mock.patch('requests.get', mock_get)
     def test_update_from_pypi_unparseable(self):
         """Test the update_from_pypi method for unparseable requirements."""
         # editable packages return None
diff --git a/package_monitor/tests/test_pypi.py b/package_monitor/tests/test_pypi.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 """Tests for the pypi module."""
 import json
-import mock
 from os import path
 
 from django.core.cache import cache
@@ -10,6 +9,7 @@
 from semantic_version import Version
 
 from .. import pypi
+from ..compat import mock
 
 
 def mock_get(packge_url):
@@ -73,7 +73,7 @@ def test_parse_version(self):
         self.assertEqual(pypi.parse_version("foobar"), None)
 
     def test_package_url(self):
-        self.assertEqual(pypi.package_url('django'), u"http://pypi.python.org/pypi/django/json")
+        self.assertEqual(pypi.package_url('django'), "http://pypi.python.org/pypi/django/json")
 
 
 class PackageTests(TestCase):
diff --git a/package_monitor/views.py b/package_monitor/views.py
@@ -10,6 +10,7 @@ def reload(request):
     """Reload local requirements file."""
     refresh_packages.clean()
     refresh_packages.local()
+    refresh_packages.remote()
     url = request.META.get('HTTP_REFERER')
     if url:
         return HttpResponseRedirect(url)
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,4 @@
+django>=1.8
 requests>=2.0
 requirements_parser==0.1.0
 semantic_version>=2.5
diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@
 
 setup(
     name="django-package-monitor",
-    version="0.4.1-dev",
+    version="0.5.0",
     packages=find_packages(),
     install_requires=REQUIREMENTS,
     include_package_data=True,
@@ -31,6 +31,7 @@
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
     ],
diff --git a/tox.ini b/tox.ini
@@ -1,13 +1,13 @@
 [tox]
-envlist = py27-django{18,19,110,111}
+envlist = py{27,36}-django{18,19,110,111}
 
 [testenv]
 deps =
     coverage==4.2
-    mock==2.0
+    py27: mock==2.0
+    django110: Django==1.10
     django18: Django==1.8
     django19: Django==1.9
-    django110: Django==1.10
     django111: Django==1.11
 
 commands=
