NixOS · May 27, 2017 · May 27, 2017 · May 27, 2017
diff --git a/maintainers/scripts/update-python-libraries b/maintainers/scripts/update-python-libraries
@@ -64,15 +64,15 @@ def _fetch_page(url):
     if r.status_code == requests.codes.ok:
         return r.json()
     else:
-        logging.warning("Request for {} failed".format(url))
+        raise ValueError("Request for {} failed".format(url))
 
 def _get_latest_version(package, extension):
 
 
     url = "{}/{}/json".format(INDEX, package)
     json = _fetch_page(url)
 
-    data = extract_relevant_nix_data(json)[1]
+    data = extract_relevant_nix_data(json, extension)[1]
 
     version = data['latest_version']
     if version in data['versions']:
@@ -83,7 +83,7 @@ def _get_latest_version(package, extension):
     return version, sha256
 
 
-def extract_relevant_nix_data(json):
+def extract_relevant_nix_data(json, extension):
     """Extract relevant Nix data from the JSON of a package obtained from PyPI.
 
     :param json: JSON obtained from PyPI
@@ -124,11 +124,11 @@ def extract_relevant_nix_data(json):
         releases = toolz.itemfilter(lambda x: x[1] is not None, releases)
         return releases
 
-    # Collect data
+    # Collect data)
     name = str(json['info']['name'])
     latest_version = str(_extract_latest_version(json))
     #src = _get_src_and_hash(json, latest_version, EXTENSIONS)
-    sources = _get_sources(json, EXTENSIONS)
+    sources = _get_sources(json, [extension])
 
     # Collect meta data
     license = str(_extract_license(json))
@@ -188,7 +188,7 @@ def _update_package(path):
     except ValueError as e:
         # No format mentioned, then we assume we have setuptools
         # and use a .tar.gz
-        logging.warning("Path {}: {}".format(path, str(e)))
+        logging.info("Path {}: {}".format(path, str(e)))
         extension = ".tar.gz"
     else:
         if format == 'wheel':
@@ -197,33 +197,38 @@ def _update_package(path):
             try:
                 url = _get_value('url', text)
                 extension = os.path.splitext(url)[1]
+                if 'pypi' not in url:
+                    logging.warning("Path {}: uses non-PyPI url, not updating.".format(path))
+                    return False
             except ValueError as e:
-                logging.warning("Path {}: {}".format(path, str(e)))
+                logging.info("Path {}: {}".format(path, str(e)))
                 extension = ".tar.gz"
 
-    new_version, new_sha256 = _get_latest_version(pname, extension)
-    if not new_sha256:
-        logging.warning("Path has no valid file available: {}".format(path))
-        return False
-
-    if new_version != version:
-
-        try:
-            text = _replace_value('version', new_version, text)
-        except ValueError as e:
-            logging.warning("Path {}: {}".format(path, str(e)))
-        try:
-            text = _replace_value('sha256', new_sha256, text)
-        except ValueError as e:
-            logging.warning("Path {}: {}".format(path, str(e)))
+    try:
+        new_version, new_sha256 = _get_latest_version(pname, extension)
+    except ValueError as e:
+        logging.warning("Path {}: {}".format(path, str(e)))
+    else:
+        if not new_sha256:
+            logging.warning("Path has no valid file available: {}".format(path))
+            return False
+        if new_version != version:
+            try:
+                text = _replace_value('version', new_version, text)
+            except ValueError as e:
+                logging.warning("Path {}: {}".format(path, str(e)))
+            try:
+                text = _replace_value('sha256', new_sha256, text)
+            except ValueError as e:
+                logging.warning("Path {}: {}".format(path, str(e)))
 
-        with open(path, 'w') as f:
-            f.write(text)
+            with open(path, 'w') as f:
+                f.write(text)
 
-        logging.info("Updated {} from {} to {}".format(pname, version, new_version))
+            logging.info("Updated {} from {} to {}".format(pname, version, new_version))
 
-    else:
-        logging.info("No update available for {} at {}".format(pname, version))
+        else:
+            logging.info("No update available for {} at {}".format(pname, version))
 
     return True
 

diff --git a/pkgs/development/python-modules/asgi_ipc/default.nix b/pkgs/development/python-modules/asgi_ipc/default.nix
@@ -2,8 +2,9 @@
   asgiref, msgpack, posix_ipc
 }:
 buildPythonPackage rec {
-  name = "asgi_ipc-${version}";
   version = "1.3.1";
+  pname = "asgi_ipc";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/a/asgi_ipc/${name}.tar.gz";

diff --git a/pkgs/development/python-modules/asgi_redis/default.nix b/pkgs/development/python-modules/asgi_redis/default.nix
@@ -2,8 +2,9 @@
   asgiref, asgi_ipc, msgpack, six, redis, cryptography
 }:
 buildPythonPackage rec {
-  name = "asgi_redis-${version}";
   version = "1.3.0";
+  pname = "asgi_redis";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/a/asgi_redis/${name}.tar.gz";

diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix
@@ -1,7 +1,8 @@
 { stdenv, buildPythonPackage, fetchurl, six }:
 buildPythonPackage rec {
-  name = "asgiref-${version}";
   version = "1.1.1";
+  pname = "asgiref";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/a/asgiref/${name}.tar.gz";

diff --git a/pkgs/development/python-modules/automat/default.nix b/pkgs/development/python-modules/automat/default.nix
@@ -1,8 +1,9 @@
 { stdenv, buildPythonPackage, fetchurl,
   m2r, setuptools_scm, six, attrs }:
 buildPythonPackage rec {
-  name = "Automat-${version}";
   version = "0.5.0";
+  pname = "Automat";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/A/Automat/${name}.tar.gz";

diff --git a/pkgs/development/python-modules/bap/default.nix b/pkgs/development/python-modules/bap/default.nix
@@ -1,8 +1,9 @@
 {stdenv, buildPythonPackage, fetchFromGitHub, bap, requests}:
 
 buildPythonPackage rec {
-  name = "bap";
+  pname = "bap";
   version = "1.1.0";
+  name = "${pname}-${version}";
   src = fetchFromGitHub {
     owner = "BinaryAnalysisPlatform";
     repo = "bap-python";

diff --git a/pkgs/development/python-modules/bcrypt.nix b/pkgs/development/python-modules/bcrypt.nix
@@ -4,8 +4,9 @@
 with stdenv.lib;
 
 buildPythonPackage rec {
-  name = "bcrypt-${version}";
   version = "3.1.2";
+  pname = "bcrypt";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/b/bcrypt/${name}.tar.gz";

diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix
@@ -7,7 +7,8 @@ let
   selinuxWithPython = libselinux.override pyenable;
   cryptsetupWithPython = cryptsetup.override pyenable;
 in buildPythonPackage rec {
-  name = "blivet-${version}";
+  pname = "blivet";
+  name = "${pname}-${version}";
   version = "0.67";
 
   src = fetchFromGitHub {

diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix
@@ -1,8 +1,9 @@
 { lib, fetchurl, buildPythonPackage, docutils, six, sphinx, isPy3k }:
 
 buildPythonPackage rec {
-  name = "breathe-${version}";
   version = "4.2.0";
+  pname = "breathe";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/b/breathe/${name}.tar.gz";

diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix
@@ -2,7 +2,8 @@
   asgiref, django, daphne
 }:
 buildPythonPackage rec {
-  name = "channels-${version}";
+  pname = "channels";
+  name = "${pname}-${version}";
   version = "1.1.3";
 
   src = fetchurl {

diff --git a/pkgs/development/python-modules/constantly/default.nix b/pkgs/development/python-modules/constantly/default.nix
@@ -1,7 +1,8 @@
 { stdenv, buildPythonPackage, fetchurl
 }:
 buildPythonPackage rec {
-  name = "constantly-${version}";
+  pname = "constantly";
+  name = "${pname}-${version}";
   version = "15.1.0";
 
   src = fetchurl {

diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix
@@ -2,7 +2,8 @@
   asgiref, autobahn, twisted, hypothesis
 }:
 buildPythonPackage rec {
-  name = "daphne-${version}";
+  pname = "daphne";
+  name = "${pname}-${version}";
   version = "1.2.0";
 
   src = fetchurl {

diff --git a/pkgs/development/python-modules/dateutil/default.nix b/pkgs/development/python-modules/dateutil/default.nix
@@ -1,6 +1,7 @@
 { stdenv, buildPythonPackage, fetchurl, six }:
 buildPythonPackage rec {
-  name = "dateutil-${version}";
+  pname = "dateutil";
+  name = "${pname}-${version}";
   version = "2.6.0";
 
   src = fetchurl {

diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix
@@ -2,7 +2,9 @@
 , ncurses, pygobject3 }:
 
 if isPyPy then throw "dbus-python not supported for interpreter ${python.executable}" else buildPythonPackage rec {
-  name = "dbus-python-1.2.4";
+  pname = "dbus-python";
+  version = "1.2.4";
+  name = "${pname}-${version}";
   format = "other";
 
   src = fetchurl {

diff --git a/pkgs/development/python-modules/django-compat/default.nix b/pkgs/development/python-modules/django-compat/default.nix
@@ -2,7 +2,8 @@
   django, django_nose, six
 }:
 buildPythonPackage rec {
-  name = "django-compat-${version}";
+  pname = "django-compat";
+  name = "${pname}-${version}";
   version = "1.0.14";
 
   src = fetchurl {

diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix
@@ -3,8 +3,9 @@
   pyparsing, django, celery
 }:
 buildPythonPackage rec {
-  name = "django-raster-${version}";
   version = "0.3.1";
+  pname = "django-raster";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/d/django-raster/${name}.tar.gz";

diff --git a/pkgs/development/python-modules/django/1_10.nix b/pkgs/development/python-modules/django/1_10.nix
@@ -3,7 +3,8 @@
   geos, gdal
 }:
 buildPythonPackage rec {
-  name = "Django-${version}";
+  pname = "Django";
+  name = "${pname}-${version}";
   version = "1.10.7";
   disabled = pythonOlder "2.7";
 

diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix
@@ -3,8 +3,10 @@
   geos, gdal, pytz
 }:
 buildPythonPackage rec {
-  name = "Django-${version}";
+  pname = "Django";
+  name = "${pname}-${version}";
   version = "1.11.1";
+
   disabled = pythonOlder "2.7";
 
   src = fetchurl {

diff --git a/pkgs/development/python-modules/django_guardian.nix b/pkgs/development/python-modules/django_guardian.nix
@@ -3,7 +3,8 @@
 , pytest, pytestrunner, pytest-django, setuptools_scm
 }:
 buildPythonPackage rec {
-  name = "django-guardian-${version}";
+  pname = "django-guardian";
+  name = "${pname}-${version}";
   version = "1.4.8";
 
   src = fetchurl {

diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix
@@ -1,7 +1,8 @@
 { stdenv, buildPythonPackage, fetchurl, django }:
 buildPythonPackage rec {
-  name = "djangorestframework-${version}";
   version = "3.5.4";
+  pname = "djangorestframework";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/d/djangorestframework/${name}.tar.gz";

diff --git a/pkgs/development/python-modules/docker.nix b/pkgs/development/python-modules/docker.nix
@@ -3,8 +3,9 @@
 , ipaddress, backports_ssl_match_hostname, docker_pycreds
 }:
 buildPythonPackage rec {
-  name = "docker-${version}";
   version = "2.0.2";
+  pname = "docker";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/d/docker/${name}.tar.gz";

diff --git a/pkgs/development/python-modules/docker_compose.nix b/pkgs/development/python-modules/docker_compose.nix
@@ -7,7 +7,8 @@
 }:
 buildPythonApplication rec {
   version = "1.10.0";
-  name = "docker-compose-${version}";
+  pname = "docker-compose";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/d/docker-compose/${name}.tar.gz";

diff --git a/pkgs/development/python-modules/ds4drv.nix b/pkgs/development/python-modules/ds4drv.nix
@@ -4,7 +4,8 @@
 }:
 
 buildPythonPackage rec {
-  name = "ds4drv-${version}";
+  pname = "ds4drv";
+  name = "${pname}-${version}";
   version = "0.5.1";
 
   # PyPi only carries py3 wheel

diff --git a/pkgs/development/python-modules/dulwich.nix b/pkgs/development/python-modules/dulwich.nix
@@ -3,8 +3,9 @@
 , git, glibcLocales }:
 
 buildPythonPackage rec {
-  name = "dulwich-${version}";
   version = "0.14.1";
+  pname = "dulwich";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/d/dulwich/${name}.tar.gz";

diff --git a/pkgs/development/python-modules/ezdxf/default.nix b/pkgs/development/python-modules/ezdxf/default.nix
@@ -2,7 +2,8 @@
 
 buildPythonPackage rec {
   version = "0.8.1";
-  name = "ezdxf-${version}";
+  pname = "ezdxf";
+  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "mozman";

diff --git a/pkgs/development/python-modules/feedgenerator/default.nix b/pkgs/development/python-modules/feedgenerator/default.nix
@@ -1,7 +1,9 @@
 { stdenv, buildPythonPackage, glibcLocales, fetchurl, six, pytz }:
 
 buildPythonPackage rec {
-  name = "feedgenerator-1.9";
+  pname = "feedgenerator";
+  version = "1.9";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/f/feedgenerator/${name}.tar.gz";

diff --git a/pkgs/development/python-modules/flake8-blind-except/default.nix b/pkgs/development/python-modules/flake8-blind-except/default.nix
@@ -1,7 +1,8 @@
 { lib, fetchurl, buildPythonPackage }:
 
 buildPythonPackage rec {
-  name = "flake8-blind-except-${version}";
+  pname = "flake8-blind-except";
+  name = "${pname}-${version}";
   version = "0.1.1";
   src = fetchurl {
     url = "mirror://pypi/f/flake8-blind-except/${name}.tar.gz";

diff --git a/pkgs/development/python-modules/flake8-debugger/default.nix b/pkgs/development/python-modules/flake8-debugger/default.nix
@@ -1,7 +1,8 @@
 { lib, fetchurl, buildPythonPackage, flake8, nose }:
 
 buildPythonPackage rec {
-  name = "flake8-debugger-${version}";
+  pname = "flake8-debugger";
+  name = "${pname}-${version}";
   version = "1.4.0";
   src = fetchurl {
     url = "mirror://pypi/f/flake8-debugger/${name}.tar.gz";