python: editorconfig fixes

2020-08-25 12:07:09 +10:00 · 2020-08-25 12:07:09 +10:00 · 0cff30bb44
parent 1c2ebdc5a3
commit 0cff30bb44
87 changed files with 149 additions and 157 deletions
--- a/pkgs/development/python-modules/ansiconv/default.nix
+++ b/pkgs/development/python-modules/ansiconv/default.nix
@ -9,7 +9,7 @@ buildPythonPackage rec {
    repo = pname;
    rev = "v${version}";
    sha256 = "0ljfpl8x069arzginvpi1v6hlaq4x2qpjqj01qds2ylz33scq8r4";
-  };  
+  };

  checkInputs = [ pytest ];

@ -21,4 +21,3 @@ buildPythonPackage rec {
  };

 }
-
--- a/pkgs/development/python-modules/aria2p/default.nix
+++ b/pkgs/development/python-modules/aria2p/default.nix
@ -15,7 +15,7 @@ buildPythonPackage rec {
    rev = "v${version}";
    sha256 = "1inak3y2win58zbzykfzy6xp00f276sqsz69h2nfsd93mpr74wf6";
  };
-  
+
  nativeBuildInputs = [ poetry ];

  preBuild = ''
--- a/pkgs/development/python-modules/atlassian-python-api/default.nix
+++ b/pkgs/development/python-modules/atlassian-python-api/default.nix
@ -17,16 +17,16 @@
 buildPythonPackage rec {
  pname = "atlassian-python-api";
  version = "1.16.0";
-  
+
  src = fetchPypi {
    inherit pname version;
    sha256 = "1sp036192vdl5nqifcswg2j838vf8i9k8bfd0w4qh1vz4f0pjz7y";
  };
-  
+
  checkInputs = [ pytestrunner pytest ];
-  
+
  propagatedBuildInputs = [ oauthlib requests requests_oauthlib six ];
-  
+
  meta = with lib; {
    description = "Python Atlassian REST API Wrapper";
    homepage = "https://github.com/atlassian-api/atlassian-python-api";
@ -34,4 +34,3 @@ buildPythonPackage rec {
    maintainers = [ maintainers.arnoldfarkas ];
  };
 }
-
--- a/pkgs/development/python-modules/audiotools/default.nix
+++ b/pkgs/development/python-modules/audiotools/default.nix
@ -25,4 +25,4 @@ buildPythonPackage rec {
    homepage = "http://audiotools.sourceforge.net/";
    license = lib.licenses.gpl2Plus;
  };
-}
+}
--- a/pkgs/development/python-modules/batchgenerators/default.nix
+++ b/pkgs/development/python-modules/batchgenerators/default.nix
@ -25,7 +25,7 @@ buildPythonPackage rec {
    repo = pname;
    rev = "v${version}";
    sha256 = "0cc3i4wznqb7lk8n6jkprvkpsby6r7khkxqwn75k8f01mxgjfpvf";
-    
+
  };

  patches = [
--- a/pkgs/development/python-modules/bayesian-optimization/default.nix
+++ b/pkgs/development/python-modules/bayesian-optimization/default.nix
@ -22,7 +22,7 @@ buildPythonPackage rec {
    scikitlearn
    scipy
  ];
-  
+
  checkInputs = [ pytest ];
  checkPhase = ''
    pytest tests
--- a/pkgs/development/python-modules/bespon/default.nix
+++ b/pkgs/development/python-modules/bespon/default.nix
@ -15,7 +15,7 @@ buildPythonPackage rec {
  propagatedBuildInputs = [ ];
  # upstream doesn't contain tests
  doCheck = false;
-  
+
  pythonImportsCheck = [ "bespon" ];
  meta = with stdenv.lib; {
    description = "Encodes and decodes data in the BespON format.";
--- a/pkgs/development/python-modules/brotlipy/default.nix
+++ b/pkgs/development/python-modules/brotlipy/default.nix
@ -33,4 +33,4 @@ buildPythonPackage rec {
    homepage = "https://github.com/python-hyper/brotlipy/";
    license = lib.licenses.mit;
  };
-}
+}
--- a/pkgs/development/python-modules/build/default.nix
+++ b/pkgs/development/python-modules/build/default.nix
@ -43,4 +43,4 @@ buildPythonPackage rec {
    description = "A simple, correct PEP517 package builder";
    license = lib.licenses.mit;
  };
-}
+}
--- a/pkgs/development/python-modules/certipy/default.nix
+++ b/pkgs/development/python-modules/certipy/default.nix
@ -14,7 +14,7 @@ buildPythonPackage rec {
  };

  propagatedBuildInputs = [ pyopenssl ];
-  
+
  doCheck = false; #no tests were included

  meta = with stdenv.lib; {
--- a/pkgs/development/python-modules/cftime/default.nix
+++ b/pkgs/development/python-modules/cftime/default.nix
@ -28,4 +28,4 @@ buildPythonPackage rec {
    description = "Time-handling functionality from netcdf4-python";
  };

-}
+}
--- a/pkgs/development/python-modules/channels-redis/default.nix
+++ b/pkgs/development/python-modules/channels-redis/default.nix
@ -34,7 +34,7 @@ buildPythonPackage rec {
  #   pytest
  #   pytest-asyncio
  # ];
-  # 
+  #
  # # Fails with : ConnectionRefusedError: [Errno 111] Connect call failed ('127.0.0.1', 6379)
  # # (even with a local redis instance running)
  # checkPhase = ''
--- a/pkgs/development/python-modules/configparser/4.nix
+++ b/pkgs/development/python-modules/configparser/4.nix
@ -23,4 +23,4 @@ buildPythonPackage rec {
    license = licenses.mit;
    homepage = "https://github.com/jaraco/configparser";
  };
-}
+}
--- a/pkgs/development/python-modules/cookiecutter/default.nix
+++ b/pkgs/development/python-modules/cookiecutter/default.nix
@ -19,7 +19,7 @@ buildPythonPackage rec {
  propagatedBuildInputs = [
    jinja2 future binaryornot click whichcraft poyo jinja2_time requests python-slugify
  ];
-  
+
  # requires network access for cloning git repos
  doCheck = false;
  checkPhase = ''
--- a/pkgs/development/python-modules/cppy/default.nix
+++ b/pkgs/development/python-modules/cppy/default.nix
@ -24,4 +24,4 @@ buildPythonPackage rec {
    homepage = "https://github.com/nucleic/cppy";
    license = lib.licenses.bsd3;
  };
-}
+}
--- a/pkgs/development/python-modules/cupy/default.nix
+++ b/pkgs/development/python-modules/cupy/default.nix
@ -20,7 +20,7 @@ buildPythonPackage rec {

  preConfigure = ''
      export CUDA_PATH=${cudatoolkit}
-  ''; 
+  '';

  propagatedBuildInputs = [
    cudatoolkit
--- a/pkgs/development/python-modules/django-auth-ldap/default.nix
+++ b/pkgs/development/python-modules/django-auth-ldap/default.nix
@ -1,7 +1,7 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi, isPy27
-, ldap , django 
+, ldap , django
 , mock
 }:

@ -14,8 +14,8 @@ buildPythonPackage rec {
    sha256 = "11af1773b08613339d2c3a0cec1308a4d563518f17b1719c3759994d0b4d04bf";
  };

-  propagatedBuildInputs = [ ldap django ]; 
-  checkInputs = [ mock ]; 
+  propagatedBuildInputs = [ ldap django ];
+  checkInputs = [ mock ];

  # django.core.exceptions.ImproperlyConfigured: Requested setting INSTALLED_APPS, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings
  doCheck = false;
--- a/pkgs/development/python-modules/django-dynamic-preferences/default.nix
+++ b/pkgs/development/python-modules/django-dynamic-preferences/default.nix
@ -11,7 +11,7 @@ buildPythonPackage rec {
    sha256 = "2310291c7f40606be045938d65e117383549aa8a979c6c4b700464c6a6204a34";
  };

-  propagatedBuildInputs = [ six django persisting-theory ]; 
+  propagatedBuildInputs = [ six django persisting-theory ];

  # django.core.exceptions.ImproperlyConfigured: Requested setting DYNAMIC_PREFERENCES, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings
  doCheck = false;
--- a/pkgs/development/python-modules/django-multiselectfield/default.nix
+++ b/pkgs/development/python-modules/django-multiselectfield/default.nix
@ -23,4 +23,4 @@ buildPythonPackage rec {
    homepage = "https://github.com/goinnn/django-multiselectfield";
    license = lib.licenses.lgpl3;
  };
-}
+}
--- a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix
+++ b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix
@ -3,17 +3,17 @@
 buildPythonPackage rec {
  pname = "djangorestframework_simplejwt";
  version = "4.4.0";
-  
+
  src = fetchPypi {
    inherit pname version;
    sha256 = "c315be70aa12a5f5790c0ab9acd426c3a58eebea65a77d0893248c5144a5080c";
  };
-  
+
  propagatedBuildInputs = [ django djangorestframework pyjwt ];
-  
+
  # Test raises django.core.exceptions.ImproperlyConfigured
  doCheck = false;
-  
+
  meta = with lib; {
    description = "A minimal JSON Web Token authentication plugin for Django REST Framework";
    homepage = "https://github.com/davesque/django-rest-framework-simplejwt";
--- a/pkgs/development/python-modules/fixtures/default.nix
+++ b/pkgs/development/python-modules/fixtures/default.nix
@ -27,4 +27,4 @@ buildPythonPackage rec {
    homepage = "https://pypi.python.org/pypi/fixtures";
    license = lib.licenses.asl20;
  };
-}
+}
--- a/pkgs/development/python-modules/flask-marshmallow/default.nix
+++ b/pkgs/development/python-modules/flask-marshmallow/default.nix
@ -10,7 +10,7 @@ buildPythonPackage rec {
    homepage = "https://github.com/marshmallow-code/flask-marshmallow";
    description = "Flask + marshmallow for beautiful APIs";
    license = lib.licenses.mit;
-  }; 
+  };

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/fluent-logger/default.nix
+++ b/pkgs/development/python-modules/fluent-logger/default.nix
@ -10,7 +10,7 @@ buildPythonPackage rec {
  };

  propagatedBuildInputs = [ msgpack ];
-  
+
  # Tests fail because absent in package
  doCheck = false;

--- a/pkgs/development/python-modules/fuse-python/default.nix
+++ b/pkgs/development/python-modules/fuse-python/default.nix
@ -11,7 +11,7 @@ buildPythonPackage rec {

  buildInputs = [ fuse ];
  nativeBuildInputs = [ pkgconfig ];
-  
+
  # no tests in the Pypi archive
  doCheck = false;

@ -22,4 +22,3 @@ buildPythonPackage rec {
    maintainers = with maintainers; [ psyanticy ];
  };
 }
-
--- a/pkgs/development/python-modules/globus-sdk/default.nix
+++ b/pkgs/development/python-modules/globus-sdk/default.nix
@ -23,11 +23,11 @@ buildPythonPackage rec {

  # No tests in archive
  doCheck = false;
-  
+
  checkInputs = [ flake8 nose2 mock ];
-  
+
  propagatedBuildInputs = [ requests pyjwt  ];
- 
+
  meta = with lib; {
    description = "A convenient Pythonic interface to Globus REST APIs, including the Transfer API and the Globus Auth API.";
    homepage =  "https://github.com/globus/globus-sdk-python";
--- a/pkgs/development/python-modules/graphviz/default.nix
+++ b/pkgs/development/python-modules/graphviz/default.nix
@ -30,9 +30,9 @@ buildPythonPackage rec {
    })
  ];

-  # Fontconfig error: Cannot load default config file 
-  FONTCONFIG_FILE = makeFontsConf { 
-    fontDirectories = [ freefont_ttf ]; 
+  # Fontconfig error: Cannot load default config file
+  FONTCONFIG_FILE = makeFontsConf {
+    fontDirectories = [ freefont_ttf ];
  };

  checkInputs = [ mock pytest pytest-mock pytestcov ];
--- a/pkgs/development/python-modules/h5netcdf/default.nix
+++ b/pkgs/development/python-modules/h5netcdf/default.nix
@ -35,4 +35,4 @@ buildPythonPackage rec {
    license = lib.licenses.bsd3;
  };

-}
+}
--- a/pkgs/development/python-modules/helpdev/default.nix
+++ b/pkgs/development/python-modules/helpdev/default.nix
@ -27,4 +27,4 @@ buildPythonPackage rec {
    license = lib.licenses.mit;
  };

-}
+}
--- a/pkgs/development/python-modules/idna/default.nix
+++ b/pkgs/development/python-modules/idna/default.nix
@ -17,4 +17,4 @@ buildPythonPackage rec {
    description = "Internationalized Domain Names in Applications (IDNA)";
    license = lib.licenses.bsd3;
  };
-}
+}
--- a/pkgs/development/python-modules/imagecorruptions/default.nix
+++ b/pkgs/development/python-modules/imagecorruptions/default.nix
@ -19,7 +19,7 @@ buildPythonPackage rec {
    substituteInPlace setup.py \
      --replace "'opencv-python >= 3.4.5'," ""
  '';
-  
+
  propagatedBuildInputs = [
    numpy
    scikitimage
--- a/pkgs/development/python-modules/ipykernel/default.nix
+++ b/pkgs/development/python-modules/ipykernel/default.nix
@ -42,9 +42,9 @@ buildPythonPackage rec {
    "test_subprocess_print"
    "test_subprocess_error"
    "test_ipython_start_kernel_no_userns"
-    
+
    # https://github.com/ipython/ipykernel/issues/506
-    "test_unc_paths"    
+    "test_unc_paths"
  ] ++ lib.optionals (pythonOlder "3.8") [
    # flaky test https://github.com/ipython/ipykernel/issues/485
    "test_shutdown"
--- a/pkgs/development/python-modules/jdcal/default.nix
+++ b/pkgs/development/python-modules/jdcal/default.nix
@ -25,4 +25,4 @@ buildPythonPackage rec {
    license = lib.licenses.bsd2;
    maintainers = with lib.maintainers; [ lihop ];
  };
-}
+}
--- a/pkgs/development/python-modules/jupyter-sphinx/default.nix
+++ b/pkgs/development/python-modules/jupyter-sphinx/default.nix
@ -27,6 +27,6 @@ buildPythonPackage rec {
    description = "Jupyter Sphinx Extensions";
    homepage = "https://github.com/jupyter/jupyter-sphinx/";
    license = licenses.bsd3;
-  };    
+  };

-}
+}
--- a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix
+++ b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix
@ -16,7 +16,7 @@ buildPythonPackage rec {

  # No tests implemented
  doCheck = false;
-   
+
  propagatedBuildInputs = [ jupyterhub ldap3 ];

  meta = with lib; {
--- a/pkgs/development/python-modules/kiwisolver/default.nix
+++ b/pkgs/development/python-modules/kiwisolver/default.nix
@ -14,9 +14,9 @@ buildPythonPackage rec {
    inherit pname version;
    sha256 = "247800260cd38160c362d211dcaf4ed0f7816afb5efe56544748b21d6ad6d17f";
  };
-  
+
  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
-  
+
  nativeBuildInputs = [
    cppy
  ];
--- a/pkgs/development/python-modules/labelbox/default.nix
+++ b/pkgs/development/python-modules/labelbox/default.nix
@ -20,7 +20,7 @@ buildPythonPackage rec {
  propagatedBuildInputs = [ jinja2 requests pillow rasterio shapely ];

  # Test cases are not running on pypi or GitHub
-  doCheck = false;   
+  doCheck = false;

  meta = with lib; {
    homepage = "https://github.com/Labelbox/Labelbox";
--- a/pkgs/development/python-modules/lazy/default.nix
+++ b/pkgs/development/python-modules/lazy/default.nix
@ -18,4 +18,4 @@ buildPythonPackage rec {
    license = lib.licenses.bsd2;
    homepage = "https://github.com/stefanholek/lazy";
  };
-}
+}
--- a/pkgs/development/python-modules/logfury/default.nix
+++ b/pkgs/development/python-modules/logfury/default.nix
@ -28,4 +28,4 @@ buildPythonPackage rec {
    license = lib.licenses.bsd3;
    maintainers = with lib.maintainers; [ jwiegley ];
  };
-}
+}
--- a/pkgs/development/python-modules/loguru/default.nix
+++ b/pkgs/development/python-modules/loguru/default.nix
@ -3,7 +3,7 @@
 buildPythonPackage rec {
  pname = "loguru";
  version = "0.5.1";
-  
+
  disabled = isPy27;
  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/marionette-harness/default.nix
+++ b/pkgs/development/python-modules/marionette-harness/default.nix
@ -21,8 +21,8 @@ buildPythonPackage rec {
    sha256 = "041cd779ae383fb5c56f2bb44824f4e80ba895febd9a3f21570ac274221c82e0";
  };

-  propagatedBuildInputs = [ mozprofile mozversion browsermob-proxy moztest 
-    wptserve manifestparser marionette_driver ]; 
+  propagatedBuildInputs = [ mozprofile mozversion browsermob-proxy moztest
+    wptserve manifestparser marionette_driver ];

  meta = {
    description = "Mozilla Marionette protocol test automation harness";
--- a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix
+++ b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix
@ -16,7 +16,7 @@ buildPythonPackage rec {
    sha256 = "99ca2513d4e2ca29a08e550346f23947a50627a2b02f6ad36a4550e779fa0ce8";
  };

-  propagatedBuildInputs = [ mozversion mozrunner ]; 
+  propagatedBuildInputs = [ mozversion mozrunner ];

  meta = {
    description = "Mozilla Marionette driver";
--- a/pkgs/development/python-modules/marionette-harness/mozhttpd.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozhttpd.nix
@ -13,7 +13,7 @@ buildPythonPackage rec {
    sha256 = "10y1cr933ajx9ni701ayb7r361pak9wrzr7pdpyx81kkbjddq7qa";
  };

-  propagatedBuildInputs = [ moznetwork ]; 
+  propagatedBuildInputs = [ moznetwork ];

  meta = {
    description = "Webserver for Mozilla testing";
--- a/pkgs/development/python-modules/marionette-harness/moznetwork.nix
+++ b/pkgs/development/python-modules/marionette-harness/moznetwork.nix
@ -14,7 +14,7 @@ buildPythonPackage rec {
    sha256 = "0ws20l4ggb6mj7ycwrk5h7hj1jmj3mj0ca48k5jzsa4n042ahwrd";
  };

-  propagatedBuildInputs = [ mozlog mozinfo ]; 
+  propagatedBuildInputs = [ mozlog mozinfo ];

  meta = {
    description = "Network utilities for Mozilla testing";
--- a/pkgs/development/python-modules/markdown/3_1.nix
+++ b/pkgs/development/python-modules/markdown/3_1.nix
@ -18,8 +18,8 @@ buildPythonPackage rec {
    sha256 = "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a";
  };

-  propagatedBuildInputs = [ 
-    setuptools 
+  propagatedBuildInputs = [
+    setuptools
  ] ++ lib.optionals (pythonOlder "3.8") [
    importlib-metadata
  ];
--- a/pkgs/development/python-modules/markdown/default.nix
+++ b/pkgs/development/python-modules/markdown/default.nix
@ -18,8 +18,8 @@ buildPythonPackage rec {
    sha256 = "1fafe3f1ecabfb514a5285fca634a53c1b32a81cb0feb154264d55bf2ff22c17";
  };

-  propagatedBuildInputs = [ 
-    setuptools 
+  propagatedBuildInputs = [
+    setuptools
  ] ++ lib.optionals (pythonOlder "3.8") [
    importlib-metadata
  ];
--- a/pkgs/development/python-modules/marshmallow-polyfield/default.nix
+++ b/pkgs/development/python-modules/marshmallow-polyfield/default.nix
@ -31,4 +31,4 @@ buildPythonPackage rec {
    license = licenses.asl20;
    maintainers = with maintainers; [ drewrisinger ];
  };
-}
+}
--- a/pkgs/development/python-modules/mask-rcnn/default.nix
+++ b/pkgs/development/python-modules/mask-rcnn/default.nix
@ -18,7 +18,7 @@
 buildPythonPackage rec {
  pname = "mask-rcnn";
  version = "2.1";
-  
+
  src = fetchFromGitHub {
    owner = "matterport";
    repo = "Mask_RCNN";
@ -49,4 +49,3 @@ buildPythonPackage rec {
    maintainers = with maintainers; [ rakesh4g ];
  };
 }
-
--- a/pkgs/development/python-modules/mock/2.nix
+++ b/pkgs/development/python-modules/mock/2.nix
@ -41,4 +41,4 @@ buildPythonPackage rec {
    license = licenses.bsd2;
  };

-}
+}
--- a/pkgs/development/python-modules/morphys/default.nix
+++ b/pkgs/development/python-modules/morphys/default.nix
@ -21,4 +21,4 @@ buildPythonPackage rec {
    license = licenses.mit;
    maintainers = with maintainers; [ rakesh4g ];
  };
-}
+}
--- a/pkgs/development/python-modules/mwoauth/default.nix
+++ b/pkgs/development/python-modules/mwoauth/default.nix
@ -19,7 +19,7 @@ buildPythonPackage rec {

  # package has no tests
  doCheck = false;
-  
+
  propagatedBuildInputs = [ six pyjwt requests oauthlib requests_oauthlib ];

  meta = with lib; {
--- a/pkgs/development/python-modules/nassl/default.nix
+++ b/pkgs/development/python-modules/nassl/default.nix
@ -80,14 +80,14 @@ buildPythonPackage rec {
    cp ${opensslLegacyStatic.out}/lib/libssl.a \
      ${opensslLegacyStatic.out}/lib/libcrypto.a \
      deps/openssl-OpenSSL_1_0_2e/
-    ln -s ${opensslLegacyStatic.out.dev}/include deps/openssl-OpenSSL_1_0_2e/include 
+    ln -s ${opensslLegacyStatic.out.dev}/include deps/openssl-OpenSSL_1_0_2e/include
    ln -s ${opensslLegacyStatic.bin}/bin deps/openssl-OpenSSL_1_0_2e/apps

    mkdir -p deps/openssl-OpenSSL_1_1_1/
    cp ${opensslStatic.out}/lib/libssl.a \
      ${opensslStatic.out}/lib/libcrypto.a \
      deps/openssl-OpenSSL_1_1_1/
-    ln -s ${opensslStatic.out.dev}/include deps/openssl-OpenSSL_1_1_1/include 
+    ln -s ${opensslStatic.out.dev}/include deps/openssl-OpenSSL_1_1_1/include
    ln -s ${opensslStatic.bin}/bin deps/openssl-OpenSSL_1_1_1/apps

    mkdir -p deps/zlib-1.2.11/
--- a/pkgs/development/python-modules/nbconflux/default.nix
+++ b/pkgs/development/python-modules/nbconflux/default.nix
@ -3,22 +3,22 @@
 buildPythonPackage rec {
  pname = "nbconflux";
  version = "0.7.0";
-  
+
  src = fetchFromGitHub {
    owner = "Valassis-Digital-Media";
    repo = "nbconflux";
    rev = version;
    sha256 = "1708qkb275d6f7b4b5zmqx3i0jh56nrx2n9rwwp5nbaah5p2wwlh";
  };
-    
+
  propagatedBuildInputs = [ nbconvert requests ];
-  
+
  checkInputs = [ pytest responses ];
-  
+
  checkPhase = ''
    pytest tests
  '';
-  
+
  meta = with lib; {
    description = "Converts Jupyter Notebooks to Atlassian Confluence (R) pages using nbconvert";
    homepage = "https://github.com/Valassis-Digital-Media/nbconflux";
--- a/pkgs/development/python-modules/notify2/default.nix
+++ b/pkgs/development/python-modules/notify2/default.nix
@ -18,7 +18,7 @@ buildPythonPackage rec {
  # Tests require Xorg and Dbus instance
  doCheck = false;
  propagatedBuildInputs = [ pygobject3
-                            dbus-python ]; 
+                            dbus-python ];

  meta = {
    description = "Pure Python interface to DBus notifications";
--- a/pkgs/development/python-modules/oauthenticator/default.nix
+++ b/pkgs/development/python-modules/oauthenticator/default.nix
@ -29,10 +29,10 @@ buildPythonPackage rec {

  # No tests in archive
  doCheck = false;
-   
+
  checkInputs = [  globus-sdk mwoauth codecov flake8 pytest
    pytestcov pytest-tornado requests-mock pyjwt ];
-  
+
  propagatedBuildInputs = [ jupyterhub ];

  disabled = pythonOlder "3.4";
--- a/pkgs/development/python-modules/opentracing/default.nix
+++ b/pkgs/development/python-modules/opentracing/default.nix
@ -20,7 +20,7 @@ buildPythonPackage rec {
  propagatedBuildInputs = lib.optional isPy27 futures;

  checkInputs = [ gevent mock pytest tornado ];
-  
+
  checkPhase = ''
    pytest
  '';
--- a/pkgs/development/python-modules/palettable/default.nix
+++ b/pkgs/development/python-modules/palettable/default.nix
@ -10,9 +10,9 @@ buildPythonPackage rec {
  };

  checkInputs = [ pytest ];
- 
+
  checkPhase = ''
-    pytest 
+    pytest
  '';

  meta = with stdenv.lib; {
@ -22,4 +22,3 @@ buildPythonPackage rec {
    maintainers = with maintainers; [ psyanticy ];
  };
 }
-
--- a/pkgs/development/python-modules/pathspec/default.nix
+++ b/pkgs/development/python-modules/pathspec/default.nix
@ -18,4 +18,4 @@ buildPythonPackage rec {
    license = lib.licenses.mpl20;
    maintainers = with lib.maintainers; [ copumpkin ];
  };
-}
+}
--- a/pkgs/development/python-modules/pcpp/default.nix
+++ b/pkgs/development/python-modules/pcpp/default.nix
@ -14,7 +14,7 @@ buildPythonPackage rec {
    sha256 = "0k52qyxzdngdhyn4sya2qn1w1a4ll0mcla4h4gb1v91fk4lw25dm";
    fetchSubmodules = true;
  };
- 
+
  meta = with stdenv.lib; {
    homepage = "https://github.com/ned14/pcpp";
    description = "A C99 preprocessor written in pure Python";
--- a/pkgs/development/python-modules/pep517/default.nix
+++ b/pkgs/development/python-modules/pep517/default.nix
@ -49,4 +49,4 @@ buildPythonPackage rec {
    license = lib.licenses.mit;
    homepage = "https://github.com/pypa/pep517";
  };
-}
+}
--- a/pkgs/development/python-modules/picos/default.nix
+++ b/pkgs/development/python-modules/picos/default.nix
@ -22,7 +22,7 @@ buildPythonPackage rec {
  checkInputs = [
    networkx
  ];
-  
+
  propagatedBuildInputs = [
    numpy
    cvxopt
@ -31,7 +31,7 @@ buildPythonPackage rec {
  checkPhase = ''
    ${python.interpreter} test.py
  '';
-  
+
  meta = with lib; {
    description = "A Python interface to conic optimization solvers";
    homepage = "https://gitlab.com/picos-api/picos";
--- a/pkgs/development/python-modules/plumbum/default.nix
+++ b/pkgs/development/python-modules/plumbum/default.nix
@ -16,4 +16,4 @@ buildPythonPackage rec {
    inherit pname version;
    sha256 = "1ps37vamqav6p277dlp51jnacd5q4x4z1x8y0nfjw3y8jsfy3f8n";
  };
-}
+}
--- a/pkgs/development/python-modules/preshed/default.nix
+++ b/pkgs/development/python-modules/preshed/default.nix
@ -29,7 +29,7 @@ buildPythonPackage rec {
  checkPhase = ''
    ${python.interpreter} setup.py test
  '';
-  
+
  meta = with stdenv.lib; {
    description = "Cython hash tables that assume keys are pre-hashed";
    homepage = "https://github.com/explosion/preshed";
--- a/pkgs/development/python-modules/py-multibase/default.nix
+++ b/pkgs/development/python-modules/py-multibase/default.nix
@ -43,4 +43,4 @@ buildPythonPackage rec {
    license = licenses.mit;
    maintainers = with maintainers; [ rakesh4g ];
  };
-}
+}
--- a/pkgs/development/python-modules/py-multihash/default.nix
+++ b/pkgs/development/python-modules/py-multihash/default.nix
@ -46,4 +46,4 @@ buildPythonPackage rec {
    license = licenses.mit;
    maintainers = with maintainers; [ rakesh4g ];
  };
-}
+}
--- a/pkgs/development/python-modules/py_stringmatching/default.nix
+++ b/pkgs/development/python-modules/py_stringmatching/default.nix
@ -16,7 +16,7 @@ buildPythonPackage rec {
  };

  checkInputs = [ nose ];
-   
+
  propagatedBuildInputs = [ numpy six ];

  meta = with lib; {
--- a/pkgs/development/python-modules/pyphotonfile/default.nix
+++ b/pkgs/development/python-modules/pyphotonfile/default.nix
@ -11,7 +11,7 @@ buildPythonPackage {
  pname = "pyphotonfile";
  inherit version;
  propagatedBuildInputs = [ pillow numpy ];
-  
+
  src = fetchFromGitHub {
    owner = "fookatchu";
    repo = "pyphotonfile";
--- a/pkgs/development/python-modules/pysnow/default.nix
+++ b/pkgs/development/python-modules/pysnow/default.nix
@ -6,7 +6,7 @@
 , brotli
 , ijson
 , nose
-, requests_oauthlib 
+, requests_oauthlib
 , python_magic
 , pytz
 }:
@ -14,7 +14,7 @@
 buildPythonPackage rec {
  pname = "pysnow";
  version = "0.7.16";
-  
+
  src = fetchPypi {
    inherit pname version;
    sha256 = "5df61091470e48b5b3a6ea75637f69d3aacae20041487ea457a9a0e3093fba8c";
@ -22,9 +22,9 @@ buildPythonPackage rec {

  propagatedBuildInputs = [
    brotli
-    ijson 
-    python_magic 
-    pytz 
+    ijson
+    python_magic
+    pytz
    requests_oauthlib
  ];

@ -38,8 +38,7 @@ buildPythonPackage rec {
    description = "ServiceNow HTTP client library written in Python";
    homepage = "https://github.com/rbw/pysnow";
    license = licenses.mit;
-    maintainers = [ maintainers.almac ];  
+    maintainers = [ maintainers.almac ];
  };

 }
-
--- a/pkgs/development/python-modules/pytest-bdd/default.nix
+++ b/pkgs/development/python-modules/pytest-bdd/default.nix
@ -29,7 +29,7 @@ buildPythonPackage rec {
  checkPhase = ''
    pytest
  '';
-  
+
  meta = with stdenv.lib; {
    description = "BDD library for the py.test runner";
    homepage = "https://github.com/pytest-dev/pytest-bdd";
--- a/pkgs/development/python-modules/python-packer/default.nix
+++ b/pkgs/development/python-modules/python-packer/default.nix
@ -16,10 +16,10 @@ buildPythonPackage rec {
  };

  propagatedBuildInputs = [ sh ];
-  
+
  # Tests requires network connections
  doCheck = false;
-  
+
  meta = with stdenv.lib; {
    description = "An interface for packer.io";
    homepage = "https://github.com/nir0s/python-packer";
@ -27,4 +27,3 @@ buildPythonPackage rec {
    maintainers = with maintainers; [ psyanticy ];
  };
 }
-
--- a/pkgs/development/python-modules/pytorch-lightning/default.nix
+++ b/pkgs/development/python-modules/pytorch-lightning/default.nix
@ -22,7 +22,7 @@ buildPythonPackage rec {
    sha256 = "12zhq4pnfcwbgcx7cs99c751gp3w0ysaf5ykv2lv8f4i360w3r5a";
  };

-  propagatedBuildInputs = [ 
+  propagatedBuildInputs = [
    future
    pytorch
    pyyaml
--- a/pkgs/development/python-modules/pyuavcan/default.nix
+++ b/pkgs/development/python-modules/pyuavcan/default.nix
@ -25,7 +25,7 @@
  preBuild = ''
    export HOME=$TMPDIR
    export PYTHONASYNCIODEBUG=1
-  ''; 
+  '';

  # tests fail ATM.
  doCheck = false;
--- a/pkgs/development/python-modules/pyvcf/default.nix
+++ b/pkgs/development/python-modules/pyvcf/default.nix
@ -23,9 +23,9 @@ buildPythonPackage rec {
    license = licenses.bsd3;
    maintainers = with maintainers; [ scalavision ];
    longDescription = ''
-      The intent of this module is to mimic the csv module in the Python stdlib, 
-      as opposed to more flexible serialization formats like JSON or YAML. 
-      vcf will attempt to parse the content of each record based on the data 
+      The intent of this module is to mimic the csv module in the Python stdlib,
+      as opposed to more flexible serialization formats like JSON or YAML.
+      vcf will attempt to parse the content of each record based on the data
      types specified in the meta-information lines
    '';
  };
--- a/pkgs/development/python-modules/pywbem/default.nix
+++ b/pkgs/development/python-modules/pywbem/default.nix
@ -39,7 +39,7 @@ buildPythonPackage rec {

    # Wants `wbemcli` in PATH
    rm testsuite/test_wbemcli.py
-    
+
    # Disables tests that use testfixtures which is currently broken by nonbuilding zope_component
    rm testsuite/{test_logging,test_recorder,test_wbemconnection_mock}.*
  '';
--- a/pkgs/development/python-modules/pyxdg/default.nix
+++ b/pkgs/development/python-modules/pyxdg/default.nix
@ -16,8 +16,8 @@ buildPythonPackage rec {
  # error: invalid command 'test'
  doCheck = false;

-  patches = [ 
-    # see: https://gitlab.freedesktop.org/xdg/pyxdg/-/merge_requests/5 
+  patches = [
+    # see: https://gitlab.freedesktop.org/xdg/pyxdg/-/merge_requests/5
    (fetchpatch {
      url = "https://gitlab.freedesktop.org/xdg/pyxdg/-/commit/78405aaa34463db2c6f33ca28ae2293dd3bb1e91.patch";
      sha256 = "17cjax546rkqv5kvwczjqjdd6vmlvcxjanz0296dlfq23j2wbx63";
--- a/pkgs/development/python-modules/rhpl/builder.sh
+++ b/pkgs/development/python-modules/rhpl/builder.sh
@ -8,6 +8,6 @@ incl=$(echo $python/include/python2.*)
 sed -i -e "s@/usr/include/\$(PYTHON)@$incl@" \
       -e "s@PYTHONLIBDIR = /usr/\$(LIBDIR)/\$(PYTHON)/site-packages@PYTHONLIBDIR = $(toPythonPath $out)@" Makefile.inc
 sed -i -e "s@/usr/bin/install@install@g" \
-       -e "s@\$(DESTDIR)/usr/share/locale@$out/share/locale@" po/Makefile       
+       -e "s@\$(DESTDIR)/usr/share/locale@$out/share/locale@" po/Makefile
 make PREFIX=$out
 make PREFIX=$out install
--- a/pkgs/development/python-modules/sanic-auth/default.nix
+++ b/pkgs/development/python-modules/sanic-auth/default.nix
@ -3,20 +3,20 @@
 buildPythonPackage rec {
  pname = "Sanic-Auth";
  version = "0.2.0";
-  
+
  src = fetchPypi {
    inherit pname version;
    sha256 = "b7cb9e93296c035ada0aa1ebfb33f9f7b62f7774c519e374b7fe703ff73589cb";
  };
-  
+
  propagatedBuildInputs = [ sanic ];
-  
+
  checkInputs = [ pytest ];
-  
+
  checkPhase = ''
    pytest tests
  '';
-  
+
  meta = with lib; {
    description = "Simple Authentication for Sanic";
    homepage = "https://github.com/pyx/sanic-auth/";
--- a/pkgs/development/python-modules/sapi-python-client/default.nix
+++ b/pkgs/development/python-modules/sapi-python-client/default.nix
@ -1,8 +1,8 @@
-{ stdenv, git, setuptools, setuptools_scm, fetchFromGitHub, requests, boto3, buildPythonPackage, responses }: 
+{ stdenv, git, setuptools, setuptools_scm, fetchFromGitHub, requests, boto3, buildPythonPackage, responses }:

-buildPythonPackage rec { 
-    pname = "sapi-python-client"; 
-    version = "0.1.3"; 
+buildPythonPackage rec {
+    pname = "sapi-python-client";
+    version = "0.1.3";

    src = fetchFromGitHub {
        owner = "keboola";
@ -17,15 +17,14 @@ buildPythonPackage rec {

    doCheck = false; # requires API token and an active keboola bucket

-    nativeBuildInputs = [ git setuptools_scm ]; 
+    nativeBuildInputs = [ git setuptools_scm ];

-    propagatedBuildInputs = [ setuptools requests boto3 responses ]; 
+    propagatedBuildInputs = [ setuptools requests boto3 responses ];

-    meta = with stdenv.lib; { 
-        description = "Keboola Connection Storage API client"; 
-        homepage = "https://github.com/keboola/sapi-python-client"; 
+    meta = with stdenv.lib; {
+        description = "Keboola Connection Storage API client";
+        homepage = "https://github.com/keboola/sapi-python-client";
        maintainers = with maintainers; [ mrmebelman ];
-        license = licenses.mit; 
-    }; 
+        license = licenses.mit;
+    };
 }
-
--- a/pkgs/development/python-modules/spyder-kernels/0.x.nix
+++ b/pkgs/development/python-modules/spyder-kernels/0.x.nix
@ -1,4 +1,4 @@
-{ 
+{
  lib
  , buildPythonPackage
  , fetchFromGitHub
@ -6,7 +6,7 @@
  , ipykernel
  , wurlitzer
  , jupyter_client
-  , pyzmq 
+  , pyzmq
  , numpy
  , pandas
  , scipy
--- a/pkgs/development/python-modules/spyder/3.nix
+++ b/pkgs/development/python-modules/spyder/3.nix
@ -16,7 +16,7 @@ buildPythonPackage rec {
  };

  propagatedBuildInputs = [
-    jedi pycodestyle psutil pyflakes rope pylint keyring numpydoc 
+    jedi pycodestyle psutil pyflakes rope pylint keyring numpydoc
    qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels_0_5
    pygments qtpy pyzmq chardet pyqtwebengine
  ];
--- a/pkgs/development/python-modules/sqlitedict/default.nix
+++ b/pkgs/development/python-modules/sqlitedict/default.nix
@ -3,20 +3,20 @@
 buildPythonPackage rec {
  pname = "sqlitedict";
  version = "1.6.0";
-  
+
  src = fetchFromGitHub {
    owner = "RaRe-Technologies";
    repo = "sqlitedict";
    rev = version;
    sha256 = "1yq94lgpny9qcfbsl39npjvrsjfggi3lj2kpzcsxcfdfgxag6m2m";
  };
-  
+
  checkInputs = [ pytest ];
-  
+
  checkPhase = ''
    pytest tests
  '';
-  
+
  meta = with lib; {
    description = "Persistent, thread-safe dict";
    homepage = "https://github.com/RaRe-Technologies/sqlitedict";
--- a/pkgs/development/python-modules/suseapi/default.nix
+++ b/pkgs/development/python-modules/suseapi/default.nix
@ -36,4 +36,4 @@ buildPythonPackage rec {
    description = "Python module to work with various SUSE services";
    license = lib.licenses.gpl3Plus;
  };
-}
+}
--- a/pkgs/development/python-modules/tinydb/default.nix
+++ b/pkgs/development/python-modules/tinydb/default.nix
@ -33,7 +33,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "A lightweight document oriented database written in pure Python with no external dependencies";
    homepage = "https://github.com/msiemens/tinydb";
-    license = licenses.asl20;                                                                                                                                                                      
+    license = licenses.asl20;
    maintainers = with maintainers; [ marcus7070 ];
  };
 }
--- a/pkgs/development/python-modules/untangle/default.nix
+++ b/pkgs/development/python-modules/untangle/default.nix
@ -3,7 +3,7 @@
 buildPythonPackage rec {
  pname = "untangle";
  version = "1.1.1";
-  
+
  src = fetchFromGitHub {
    owner = "stchris";
    repo = "untangle";
@ -11,11 +11,11 @@ buildPythonPackage rec {
    rev = "61b57cd771a40df7d1621e9ec3c68d9acd733d31";
    sha256 = "0ffvlfyyl82xi4akz1lls32lrnlrn44ik41v8x8xh9ghy0n0ick7";
  };
-  
+
  checkPhase = ''
    ${python.interpreter} -m unittest discover -s tests
  '';
-  
+
  meta = with lib; {
    description = "Convert XML documents into Python objects";
    homepage = "https://github.com/stchris/untangle";
--- a/pkgs/development/python-modules/varint/default.nix
+++ b/pkgs/development/python-modules/varint/default.nix
@ -22,4 +22,4 @@ buildPythonPackage rec {
    license = licenses.mit;
    maintainers = with maintainers; [ rakesh4g ];
  };
-}
+}
--- a/pkgs/development/python-modules/vertica-python/default.nix
+++ b/pkgs/development/python-modules/vertica-python/default.nix
@ -3,21 +3,21 @@
 buildPythonPackage rec {
  pname = "vertica-python";
  version = "0.11.0";
-  
+
  src = fetchPypi {
    inherit pname version;
    sha256 = "cceb39d081b8d1628956205642e740a9fabcfd2c6ecd982c51134fba8215d0bd";
  };
-  
+
  propagatedBuildInputs = [ future dateutil six ];
-  
+
  checkInputs = [ pytest mock parameterized ];
-  
+
  # Integration tests require an accessible Vertica db
  checkPhase = ''
    pytest --ignore vertica_python/tests/integration_tests
  '';
-  
+
  meta = with lib; {
    description = "Native Python client for Vertica database";
    homepage = "https://github.com/vertica/vertica-python";
--- a/pkgs/development/python-modules/zipp/1.nix
+++ b/pkgs/development/python-modules/zipp/1.nix
@ -35,4 +35,4 @@ buildPythonPackage rec {
    homepage = "https://github.com/jaraco/zipp";
    license = licenses.mit;
  };
-}
+}
--- a/pkgs/development/python-modules/zstandard/default.nix
+++ b/pkgs/development/python-modules/zstandard/default.nix
@ -8,16 +8,16 @@
 buildPythonPackage rec {
  pname = "zstandard";
  version = "0.14.0";
-  
+
  src = fetchPypi {
    inherit pname version;
    sha256 = "0lkn7n3bfp7zip6hkqwkqwc8pxmhhs4rr699k77h51rfln6kjllh";
  };
-  
+
  propagatedBuildInputs = [ cffi ];
-  
+
  checkInputs = [ hypothesis ];
-    
+
  meta = with lib; {
    description = "zstandard bindings for Python";
    homepage = "https://github.com/indygreg/python-zstandard";