Add python version info to admin list view

Now also 2 and 3 compatible

Author: hugorodgerbrown

.travis.yml

@@ -2,6 +2,7 @@ language:
     python
 
 python:
+    2.7
     3.6
 
 install:

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):
@@ -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)

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")

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?'),
+        ),
+    ]

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,
@@ -118,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

package_monitor/pypi.py

@@ -27,10 +27,17 @@ 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,6 +93,9 @@ 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'))
 
@@ -99,3 +109,10 @@ def next_version(self, current_version):
             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

package_monitor/tests/test_models.py

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 from django.test import TestCase
 
-from unittest.mock import patch
 from requirements import requirement
 from semantic_version import Version
 
 from .. import models
+from ..compat import mock
 from ..tests import mock_get
 
 
@@ -81,7 +81,7 @@ def test_init_unparseable(self):
         self.assertEqual(v.is_editable, False)
         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
@@ -93,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

package_monitor/tests/test_pypi.py

@@ -2,14 +2,14 @@
 """Tests for the pypi module."""
 import json
 from os import path
-from unittest import mock
 
 from django.core.cache import cache
 from django.test import TestCase
 
 from semantic_version import Version
 
 from .. import pypi
+from ..compat import mock
 
 
 def mock_get(packge_url):

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)

requirements.txt

@@ -1,4 +1,4 @@
-django==1.11
+django>=1.8
 requests>=2.0
 requirements_parser==0.1.0
 semantic_version>=2.5